diff --git a/test/jasmine-test/spec/coreTests.js b/test/jasmine-test/spec/coreTests.js index da7ef143..e668b386 100755 --- a/test/jasmine-test/spec/coreTests.js +++ b/test/jasmine-test/spec/coreTests.js @@ -942,6 +942,7 @@ var coreTests = [ message: "should reserve an async chunk for a stream reference and abort if the stream errors" }, { + disabled_in_rhino: "Rhino can't handle this nested asynchronisity.", name: "promise a stream and stream a promise", source: ["Little Bobby drank and drank, ", "and then he drank some more. ", diff --git a/test/jasmine-test/spec/renderTestSpec.js b/test/jasmine-test/spec/renderTestSpec.js index 170607cf..21708c75 100644 --- a/test/jasmine-test/spec/renderTestSpec.js +++ b/test/jasmine-test/spec/renderTestSpec.js @@ -1,9 +1,12 @@ /*global dust*/ +var isRhino = typeof isRhino !== 'undefined'; describe ('Render', function() { for (var index = 0; index < coreTests.length; index++) { for (var i = 0; i < coreTests[index].tests.length; i++) { var test = coreTests[index].tests[i]; - it (test.message, render(test)); + if (!isRhino || !test.disabled_in_rhino) { + it (test.message, render(test)); + } } } }); @@ -11,7 +14,9 @@ describe ('Stream', function() { for (var index = 0; index < coreTests.length; index++) { for (var i = 0; i < coreTests[index].tests.length; i++) { var test = coreTests[index].tests[i]; - it (test.message, stream(test)); + if (!isRhino || !test.disabled_in_rhino) { + it (test.message, stream(test)); + } } } }); @@ -19,7 +24,9 @@ describe ('Pipe', function() { for (var index = 0; index < coreTests.length; index++) { for (var i = 0; i < coreTests[index].tests.length; i++) { var test = coreTests[index].tests[i]; - it (test.message, pipe(test)); + if (!isRhino || !test.disabled_in_rhino) { + it (test.message, pipe(test)); + } } } }); diff --git a/test/rhino/rhinoTest.js b/test/rhino/rhinoTest.js index 6a8d50a1..27d64afe 100644 --- a/test/rhino/rhinoTest.js +++ b/test/rhino/rhinoTest.js @@ -1,5 +1,7 @@ var window = this; +var isRhino = true; + print('Running unit tests with ' + environment['java.class.path']); var requiredFiles = [