diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 10637c86..0af3ec06 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -280,7 +280,7 @@ getJasmineRequireObj().Spec = function() { var timeout = Function.prototype.apply.apply(self.timer.setTimeout, [j$.getGlobal(), [function() { onException(new Error('timeout')); done(); - }, 10000]]); + }, j$.DEFAULT_TIMEOUT_INTERVAL]]); var callDone = function() { Function.prototype.apply.apply(self.timer.clearTimeout, [j$.getGlobal(), [timeout]]); diff --git a/spec/core/EnvSpec.js b/spec/core/EnvSpec.js index f71ad8c0..cdf0ce76 100644 --- a/spec/core/EnvSpec.js +++ b/spec/core/EnvSpec.js @@ -357,15 +357,19 @@ describe("Env integration", function() { }); describe("with a mock clock", function() { + var originalTimeout; + beforeEach(function() { + originalTimeout = j$.DEFAULT_TIMEOUT_INTERVAL; jasmine.getEnv().clock.install(); }); afterEach(function() { jasmine.getEnv().clock.uninstall(); + j$.DEFAULT_TIMEOUT_INTERVAL = originalTimeout; }); - it("should not hang on async specs that forget to call done()", function(done) { + it("should wait a specified interval before failing specs haven't called done yet", function(done) { var env = new j$.Env(), reporter = jasmine.createSpyObj('fakeReporter', [ "specDone" ]); @@ -375,10 +379,11 @@ describe("Env integration", function() { }); env.addReporter(reporter); + j$.DEFAULT_TIMEOUT_INTERVAL = 8414; - env.it("async spec that will hang", function(underTestCallback) { + env.it("async spec that doesn't call done", function(underTestCallback) { env.expect(true).toBeTruthy(); - jasmine.getEnv().clock.tick(10000); + jasmine.getEnv().clock.tick(8414); }); env.execute(); diff --git a/src/core/Spec.js b/src/core/Spec.js index 6828c87b..b1e8a472 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -58,7 +58,7 @@ getJasmineRequireObj().Spec = function() { var timeout = Function.prototype.apply.apply(self.timer.setTimeout, [j$.getGlobal(), [function() { onException(new Error('timeout')); done(); - }, 10000]]); + }, j$.DEFAULT_TIMEOUT_INTERVAL]]); var callDone = function() { Function.prototype.apply.apply(self.timer.clearTimeout, [j$.getGlobal(), [timeout]]);