[jest-circus] fix stack frame for test timeout (#6303)

* [jest-circus] fix stack frame for test timeout * increase test timeout * normalize jasmine and circus
jestjs · May 27, 2018 · f527647 · f527647
1 parent f976da6
commit f527647
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/integration-tests/__tests__/__snapshots__/failures.test.js.snap b/integration-tests/__tests__/__snapshots__/failures.test.js.snap
@@ -390,23 +390,22 @@ exports[`works with async failures 1`] = `
          |          ^
       25 | });
       26 | 
-      27 | test('timeout', done => {
+      27 | test(
 
       at __tests__/async_failures.test.js:24:10
 
   ● timeout
 
-    Timeout - Async callback was not invoked within the 5ms timeout specified by jest.setTimeout.
+<REPLACED>
 
       25 | });
       26 | 
-    > 27 | test('timeout', done => {
+    > 27 | test(
          | ^
-      28 |   jest.setTimeout(5);
-      29 | 
-      30 |   setTimeout(done, 10);
+      28 |   'timeout',
+      29 |   done => {
+      30 |     setTimeout(done, 50);
 
-      at packages/jest-jasmine2/build/jasmine/Spec.js:85:20
       at __tests__/async_failures.test.js:27:1
 
 "

diff --git a/integration-tests/__tests__/failures.test.js b/integration-tests/__tests__/failures.test.js
@@ -7,9 +7,6 @@
  * @flow
  */
 
-import skipOnJestCircus from '../../scripts/SkipOnJestCircus';
-skipOnJestCircus.suite();
-
 const path = require('path');
 const SkipOnWindows = require('../../scripts/SkipOnWindows');
 const {extractSummary} = require('../Utils');
@@ -156,12 +153,18 @@ test('works with assertions in separate files', () => {
 test('works with async failures', () => {
   const {stderr} = runJest(dir, ['async_failures.test.js']);
 
-  const rest = extractSummary(stderr)
-    .rest.split('\n')
+  const rest = cleanStderr(stderr)
+    .split('\n')
     .filter(line => line.indexOf('packages/expect/build/index.js') === -1)
     .join('\n');
 
-  expect(normalizeDots(rest)).toMatchSnapshot();
+  // Remove replacements when jasmine is gone
+  const result = normalizeDots(rest)
+    .replace(/.*thrown:.*\n/, '')
+    .replace(/.*Use jest\.setTimeout\(newTimeout\).*/, '<REPLACED>')
+    .replace(/.*Timeout - Async callback was not.*/, '<REPLACED>');
+
+  expect(result).toMatchSnapshot();
 });
 
 test('works with snapshot failures', () => {

diff --git a/integration-tests/failures/__tests__/async_failures.test.js b/integration-tests/failures/__tests__/async_failures.test.js
@@ -24,8 +24,10 @@ test('expect resolve', () => {
   return expect(Promise.reject({foo: 'bar'})).resolves.toEqual({foo: 'bar'});
 });
 
-test('timeout', done => {
-  jest.setTimeout(5);
-
-  setTimeout(done, 10);
-});
+test(
+  'timeout',
+  done => {
+    setTimeout(done, 50);
+  },
+  5
+);
diff --git a/packages/jest-circus/src/utils.js b/packages/jest-circus/src/utils.js
@@ -132,11 +132,9 @@ export const getEachHooksForTest = (
 };
 
 const _makeTimeoutMessage = (timeout, isHook) =>
-  new Error(
-    `Exceeded timeout of ${timeout}ms for a ${
-      isHook ? 'hook' : 'test'
-    }.\nUse jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test.`,
-  );
+  `Exceeded timeout of ${timeout}ms for a ${
+    isHook ? 'hook' : 'test'
+  }.\nUse jest.setTimeout(newTimeout) to increase the timeout value, if this is a long-running test.`;
 
 // Global values can be overwritten by mocks or tests. We'll capture
 // the original values in the variables before we require any files.