diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index eea53a21..ca636eca 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -6106,7 +6106,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { var timeoutInterval = queueableFn.timeout || j$.DEFAULT_TIMEOUT_INTERVAL; timeoutId = self.setTimeout(function() { var error = new Error( - 'Timeout - Async callback was not invoked within ' + + 'Timeout - Async function did not complete within ' + timeoutInterval + 'ms ' + (queueableFn.timeout diff --git a/spec/core/integration/EnvSpec.js b/spec/core/integration/EnvSpec.js index 3a10e30b..9c827b24 100644 --- a/spec/core/integration/EnvSpec.js +++ b/spec/core/integration/EnvSpec.js @@ -1106,17 +1106,17 @@ describe("Env integration", function() { env.execute(); }); - it('should wait a custom interval before reporting async functions that fail to call done', function(done) { + it('should wait a custom interval before reporting async functions that fail to complete', function(done) { var env = createMockedEnv(), reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone', 'suiteDone', 'specDone']); reporter.jasmineDone.and.callFake(function(r) { expect(r.failedExpectations).toEqual([]); - expect(reporter.suiteDone).toHaveFailedExpectationsForRunnable('suite beforeAll', [ /^Error: Timeout - Async callback was not invoked within 5000ms \(custom timeout\)/ ]); - expect(reporter.suiteDone).toHaveFailedExpectationsForRunnable('suite afterAll', [ /^Error: Timeout - Async callback was not invoked within 2000ms \(custom timeout\)/ ]); - expect(reporter.specDone).toHaveFailedExpectationsForRunnable('suite beforeEach times out', [/^Error: Timeout - Async callback was not invoked within 1000ms \(custom timeout\)/]); - expect(reporter.specDone).toHaveFailedExpectationsForRunnable('suite afterEach times out', [ /^Error: Timeout - Async callback was not invoked within 4000ms \(custom timeout\)/ ]); - expect(reporter.specDone).toHaveFailedExpectationsForRunnable('suite it times out', [ /^Error: Timeout - Async callback was not invoked within 6000ms \(custom timeout\)/ ]); + expect(reporter.suiteDone).toHaveFailedExpectationsForRunnable('suite beforeAll', [ /^Error: Timeout - Async function did not complete within 5000ms \(custom timeout\)/ ]); + expect(reporter.suiteDone).toHaveFailedExpectationsForRunnable('suite afterAll', [ /^Error: Timeout - Async function did not complete within 2000ms \(custom timeout\)/ ]); + expect(reporter.specDone).toHaveFailedExpectationsForRunnable('suite beforeEach times out', [/^Error: Timeout - Async function did not complete within 1000ms \(custom timeout\)/]); + expect(reporter.specDone).toHaveFailedExpectationsForRunnable('suite afterEach times out', [ /^Error: Timeout - Async function did not complete within 4000ms \(custom timeout\)/ ]); + expect(reporter.specDone).toHaveFailedExpectationsForRunnable('suite it times out', [ /^Error: Timeout - Async function did not complete within 6000ms \(custom timeout\)/ ]); jasmine.clock().tick(1); realSetTimeout(done); diff --git a/src/core/QueueRunner.js b/src/core/QueueRunner.js index 27b57695..63bc60ba 100644 --- a/src/core/QueueRunner.js +++ b/src/core/QueueRunner.js @@ -131,7 +131,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { var timeoutInterval = queueableFn.timeout || j$.DEFAULT_TIMEOUT_INTERVAL; timeoutId = self.setTimeout(function() { var error = new Error( - 'Timeout - Async callback was not invoked within ' + + 'Timeout - Async function did not complete within ' + timeoutInterval + 'ms ' + (queueableFn.timeout