[Circus] Add timeout event, and don't print both timeout and expect.assertions error

CHANGELOG.md

@@ -45,6 +45,7 @@
 - `[jest-runtime]` Fix missing coverage when using negative glob pattern in `testMatch` ([#7170](https://github.com/facebook/jest/pull/7170))
 - `[*]` Ensure `maxWorkers` is at least 1 (was 0 in some cases where there was only 1 CPU) ([#7182](https://github.com/facebook/jest/pull/7182))
 - `[jest-runtime]` Fix transform cache invalidation when requiring a test file from multiple projects ([#7186](https://github.com/facebook/jest/pull/7186))
+- `[jest-circus]` Don't print both timeout and expect.assertions error ([#7201](https://github.com/facebook/jest/pull/7201))
 
 ### Chore & Maintenance
 

e2e/__tests__/__snapshots__/timeouts.assertions.test.js.snap

@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`exceeds the timeout synchronously 1`] = `
+"Test Suites: 1 failed, 1 total
+Tests:       1 failed, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites.
+"
+`;
+
+exports[`exceeds the timeout, without reporting expect.assertions 1`] = `
+"Test Suites: 1 failed, 1 total
+Tests:       1 failed, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites.
+"
+`;

e2e/__tests__/timeouts.assertions.test.js

@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * @flow
+ */
+
+'use strict';
+
+import path from 'path';
+import {cleanup, extractSummary, writeFiles} from '../Utils';
+import {skipSuiteOnJasmine} from '../../scripts/ConditionalTest';
+
+import runJest from '../runJest';
+
+const DIR = path.resolve(__dirname, '../timeouts');
+
+skipSuiteOnJasmine();
+beforeEach(() => cleanup(DIR));
+afterAll(() => cleanup(DIR));
+
+test('exceeds the timeout, without reporting expect.assertions', () => {
+  writeFiles(DIR, {
+    '__tests__/a-banana.js': `
+      jest.setTimeout(20);
+
+      test('banana', () => {
+        expect.assertions(2);
+        return new Promise(resolve => {
+          setTimeout(resolve, 100);
+        });
+      });
+    `,
+    'package.json': '{}',
+  });
+
+  const {stderr, status} = runJest(DIR, ['-w=1', '--ci=false']);
+  const {rest, summary} = extractSummary(stderr);
+  expect(rest).toMatch(
+    /(jest\.setTimeout|jasmine\.DEFAULT_TIMEOUT_INTERVAL|Exceeded timeout)/,
+  );
+  expect(rest).not.toMatch(/Expected two assertions/);
+  expect(summary).toMatchSnapshot();
+  expect(status).toBe(1);
+});
+
+test('exceeds the timeout synchronously', () => {
+  writeFiles(DIR, {
+    '__tests__/a-banana.js': `
+      jest.setTimeout(20);
+
+      test('banana', () => {
+        expect.assertions(2);
+        const startTime = Date.now();
+        while (Date.now() - startTime < 100) {
+        }
+      });
+    `,
+    'package.json': '{}',
+  });
+
+  const {stderr, status} = runJest(DIR, ['-w=1', '--ci=false']);
+  const {rest, summary} = extractSummary(stderr);
+  expect(rest).toMatch(
+    /(jest\.setTimeout|jasmine\.DEFAULT_TIMEOUT_INTERVAL|Exceeded timeout)/,
+  );
+  expect(rest).not.toMatch(/Expected two assertions/);
+  expect(summary).toMatchSnapshot();
+  expect(status).toBe(1);
+});

packages/jest-circus/src/event_handler.js

@@ -130,6 +130,10 @@ const handler: EventHandler = (event, state): void => {
       event.test.errors.push([error, asyncError]);
       break;
     }
+    case 'test_fn_timeout': {
+      event.test.expired = true;
+      break;
+    }
     case 'test_retry': {
       event.test.errors = [];
       break;

packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js

@@ -233,6 +233,8 @@ const eventHandler = (event: Event) => {
 };
 
 const _addExpectedAssertionErrors = (test: TestEntry) => {
+  if (test.expired) return;
+
   const failures = extractExpectedAssertionsErrors();
   const errors = failures.map(failure => failure.error);
   test.errors = test.errors.concat(errors);

packages/jest-circus/src/run.js

@@ -121,7 +121,7 @@ const _runTest = async (test: TestEntry): Promise<void> => {
 
   // `afterAll` hooks should not affect test status (pass or fail), because if
   // we had a global `afterAll` hook it would block all existing tests until
-  // this hook is executed. So we dispatche `test_done` right away.
+  // this hook is executed. So we dispatch `test_done` right away.
   dispatch({name: 'test_done', test});
 };
 
@@ -160,7 +160,12 @@ const _callCircusTest = (
 
   return callAsyncCircusFn(test.fn, testContext, {isHook: false, timeout})
     .then(() => dispatch({name: 'test_fn_success', test}))
-    .catch(error => dispatch({error, name: 'test_fn_failure', test}));
+    .catch(message => {
+      if (/^(Error: )?Exceeded timeout/.test(message)) {
+        dispatch({name: 'test_fn_timeout', test});
+      }
+      dispatch({error: message, name: 'test_fn_failure', test});
+    });
 };
 
 export default run;

packages/jest-circus/src/utils.js

@@ -79,6 +79,7 @@ export const makeTest = (
     asyncError,
     duration: null,
     errors: [],
+    expired: false,
     fn,
     invocations: 0,
     mode: _mode,

types/Circus.js

@@ -91,6 +91,10 @@ export type Event =
       error: Exception,
       test: TestEntry,
     |}
+  | {|
+      name: 'test_fn_timeout',
+      test: TestEntry,
+    |}
   | {|
       name: 'test_retry',
       test: TestEntry,
@@ -113,7 +117,7 @@ export type Event =
       // test failure is defined by presence of errors in `test.errors`,
       // `test_done` indicates that the test and all its hooks were run,
       // and nothing else will change it's state in the future. (except third
-      // party extentions/plugins)
+      // party extensions/plugins)
       name: 'test_done',
       test: TestEntry,
     |}
@@ -201,6 +205,7 @@ type TestError = Exception | Array<[?Exception, Exception]>; // the error from t
 export type TestEntry = {|
   asyncError: Exception, // Used if the test failure contains no usable stack trace
   errors: TestError,
+  expired: ?boolean,
   fn: ?TestFn,
   invocations: number,
   mode: TestMode,