diff --git a/CHANGELOG.md b/CHANGELOG.md index 57ba8837e010..409a0117f35b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - `[jest-runner]` Force parallel runs for watch mode, to avoid TTY freeze ([#6647](https://github.com/facebook/jest/pull/6647)) - `[jest-cli]` properly reprint resolver errors in watch mode ([#6407](https://github.com/facebook/jest/pull/6407)) - `[jest-cli]` Write configuration to stdout when the option was explicitly passed to Jest ([#6447](https://github.com/facebook/jest/pull/6447)) +- `[jest-cli]` Fix regression on non-matching suites ([6657](https://github.com/facebook/jest/pull/6657)) ## 23.3.0 diff --git a/e2e/__tests__/__snapshots__/test_name_pattern_skipped.test.js.snap b/e2e/__tests__/__snapshots__/test_name_pattern_skipped.test.js.snap new file mode 100644 index 000000000000..27d85d22ccb6 --- /dev/null +++ b/e2e/__tests__/__snapshots__/test_name_pattern_skipped.test.js.snap @@ -0,0 +1,9 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`testNamePattern skipped 1`] = ` +"Test Suites: 1 passed, 1 total +Tests: 1 skipped, 1 passed, 2 total +Snapshots: 0 total +Time: <> +Ran all test suites with tests matching \\"false\\"." +`; diff --git a/e2e/__tests__/test_name_pattern_skipped.test.js b/e2e/__tests__/test_name_pattern_skipped.test.js new file mode 100644 index 000000000000..2a513283e619 --- /dev/null +++ b/e2e/__tests__/test_name_pattern_skipped.test.js @@ -0,0 +1,23 @@ +/** + * 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'; + +const {extractSummary} = require('../Utils'); +const runJest = require('../runJest'); + +test('testNamePattern skipped', () => { + const {stderr, status} = runJest.json('testNamePattern_skipped', [ + '--testNamePattern', + 'false', + ]); + const {summary} = extractSummary(stderr); + + expect(status).toBe(0); + expect(summary).toMatchSnapshot(); +}); diff --git a/e2e/testNamePattern_skipped/__tests__/test_name_pattern_skipped.test.js b/e2e/testNamePattern_skipped/__tests__/test_name_pattern_skipped.test.js new file mode 100644 index 000000000000..c055fbb1d179 --- /dev/null +++ b/e2e/testNamePattern_skipped/__tests__/test_name_pattern_skipped.test.js @@ -0,0 +1,19 @@ +/** + * 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. + */ +'use strict'; + +describe('First suite', () => { + it('true equals true', () => { + expect(true).toBe(true); + }); +}); + +describe('Second suite', () => { + it('false equals false', () => { + expect(false).toBe(false); + }); +}); diff --git a/e2e/testNamePattern_skipped/package.json b/e2e/testNamePattern_skipped/package.json new file mode 100644 index 000000000000..148788b25446 --- /dev/null +++ b/e2e/testNamePattern_skipped/package.json @@ -0,0 +1,5 @@ +{ + "jest": { + "testEnvironment": "node" + } +} diff --git a/packages/jest-jasmine2/src/tree_processor.js b/packages/jest-jasmine2/src/tree_processor.js index eed3eaa41a34..bf45259c3bd1 100644 --- a/packages/jest-jasmine2/src/tree_processor.js +++ b/packages/jest-jasmine2/src/tree_processor.js @@ -89,7 +89,7 @@ export default function treeProcessor(options: Options) { fn: getNodeHandler(child, enabled), })); if (!hasEnabledTest(node)) { - return []; + return children; } return node.beforeAllFns.concat(children).concat(node.afterAllFns); }