Merge branch 'master' into changedFilesToContributeTo

Author: alsuren

CHANGELOG.md

@@ -5,10 +5,26 @@
   changed since arbitrary revisions.
   ([#5312](https://github.com/facebook/jest/pull/5312))
 
+## jest 22.1.3
+
+### Fixes
+
+* `[jest-cli]` Check if the file belongs to the checked project before adding it
+  to the list, also checking that the file name is not explicitly blacklisted
+  ([#5341](https://github.com/facebook/jest/pull/5341))
+* `[jest-editor-support]` Add option to spawn command in shell
+  ([#5340](https://github.com/facebook/jest/pull/5340))
+
+## jest 22.1.2
+
 ### Fixes
 
+* `[jest-cli]` Check if the file belongs to the checked project before adding it
+  to the list ([#5335](https://github.com/facebook/jest/pull/5335))
 * `[jest-cli]` Fix `EISDIR` when a directory is passed as an argument to `jest`.
   ([#5317](https://github.com/facebook/jest/pull/5317))
+* `[jest-config]` Added restoreMocks config option.
+  ([#5327](https://github.com/facebook/jest/pull/5327))
 
 ## jest 22.1.0
 

docs/Configuration.md

@@ -605,6 +605,15 @@ argument:
 The function should either return a path to the module that should be resolved
 or throw an error if the module can't be found.
 
+### `restoreMocks` [boolean]
+
+Default: `false`
+
+Automatically restore mock state between every test. Equivalent to calling
+`jest.restoreAllMocks()` between each test. This will lead to any mocks having
+their fake implementations removed and restores their initial
+implementation.
+
 ### `rootDir` [string]
 
 Default: The root of the directory containing your jest's [config file](#) _or_

docs/GettingStarted.md

@@ -97,12 +97,12 @@ _Note: Explicitly installing `regenerator-runtime` is not needed if you use
 Don't forget to add a [`.babelrc`](https://babeljs.io/docs/usage/babelrc/) file
 in your project's root folder. For example, if you are using ES6 and
 [React.js](https://facebook.github.io/react/) with the
-[`babel-preset-es2015`](https://babeljs.io/docs/plugins/preset-es2015/) and
+[`babel-preset-env`](https://babeljs.io/docs/plugins/preset-env/) and
 [`babel-preset-react`](https://babeljs.io/docs/plugins/preset-react/) presets:
 
 ```json
 {
-  "presets": ["es2015", "react"]
+  "presets": ["env", "react"]
 }
 ```
 
@@ -113,16 +113,16 @@ You are now set up to use all ES6 features and React specific syntax.
 > `test`. It will not use `development` section like Babel does by default when
 > no `NODE_ENV` is set.
 
-> Note: If you've turned off transpilation of ES2015 modules with the option
+> Note: If you've turned off transpilation of ES6 modules with the option
 > `{ "modules": false }`, you have to make sure to turn this on in your test
 > environment.
 
 ```json
 {
-  "presets": [["es2015", {"modules": false}], "react"],
+  "presets": [["env", {"modules": false}], "react"],
   "env": {
     "test": {
-      "presets": [["es2015"], "react"]
+      "presets": [["env"], "react"]
     }
   }
 }

docs/MockFunctionAPI.md

@@ -96,6 +96,9 @@ Beware that `mockFn.mockRestore` only works when mock was created with
 `jest.spyOn`. Thus you have to take care of restoration yourself when manually
 assigning `jest.fn()`.
 
+The [`restoreMocks`](configuration.html#restoremocks-boolean) configuration
+option is available to restore mocks automatically between tests.
+
 ### `mockFn.mockImplementation(fn)`
 
 Accepts a function that should be used as the implementation of the mock. The

integration-tests/__tests__/__snapshots__/execute-tests-once-in-mpr.js.snap

@@ -0,0 +1,8 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Tests are executed only once even in an MPR 1`] = `
+"PASS foo/folder/my-test-bar.js
+  ✓ bar
+
+"
+`;

integration-tests/__tests__/__snapshots__/show_config.test.js.snap

@@ -32,6 +32,7 @@ exports[`--showConfig outputs config info and exits 1`] = `
       \\"name\\": \\"[md5 hash]\\",
       \\"resetMocks\\": false,
       \\"resetModules\\": false,
+      \\"restoreMocks\\": false,
       \\"rootDir\\": \\"<<REPLACED_ROOT_DIR>>\\",
       \\"roots\\": [
         \\"<<REPLACED_ROOT_DIR>>\\"

integration-tests/__tests__/auto_restore_mocks.test.js

@@ -0,0 +1,21 @@
+/**
+ * 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 runJest = require('../runJest');
+
+test('suite with auto-restore', () => {
+  const result = runJest('auto-restore-mocks/with-auto-restore');
+  expect(result.status).toBe(0);
+});
+
+test('suite without auto-restore', () => {
+  const result = runJest('auto-restore-mocks/without-auto-restore');
+  expect(result.status).toBe(0);
+});

integration-tests/__tests__/cli-accepts-exact-filenames.test.js

@@ -40,8 +40,11 @@ test('CLI accepts exact filenames', () => {
     './foo/baz.js',
     './foo',
   ]);
-  const {rest, summary} = extractSummary(stderr);
+
   expect(status).toBe(0);
+
+  const {rest, summary} = extractSummary(stderr);
+
   expect(rest).toMatchSnapshot();
   expect(summary).toMatchSnapshot();
   expect(stdout).toMatchSnapshot();

integration-tests/__tests__/execute-tests-once-in-mpr.js

@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2017-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 path = require('path');
+const skipOnWindows = require('../../scripts/skip_on_windows');
+const {extractSummary, cleanup, writeFiles} = require('../utils');
+const runJest = require('../runJest');
+
+const DIR = path.resolve(__dirname, '../execute-tests-once-in-mpr');
+
+skipOnWindows.suite();
+
+beforeEach(() => cleanup(DIR));
+afterAll(() => cleanup(DIR));
+
+test('Tests are executed only once even in an MPR', () => {
+  // Make a global config that ignores all sub-projects.
+  const config = {
+    jest: {
+      projects: ['<rootDir>', '<rootDir>/foo/*/'],
+      testPathIgnorePatterns: ['/foo/'],
+      testRegex: /my-test-.*\.js/.source,
+    },
+  };
+
+  // Make a child config with a special regexp to ensure we execute the tests.
+  const childConfig = {
+    jest: {
+      testRegex: /my-test-.*\.js/.source,
+    },
+  };
+
+  /* eslint-disable sort-keys */
+  writeFiles(DIR, {
+    'foo/folder/my-test-bar.js': `test('bar', () => console.log('Bar!'));`,
+    'foo/folder/package.json': JSON.stringify(childConfig, null, 2),
+
+    'foo/directory/my-test-baz.js': `test('baz', () => console.log('Baz!'));`,
+    'foo/directory/package.json': JSON.stringify(childConfig, null, 2),
+
+    'foo/whatever/my-test-qux.js': `test('qux', () => console.log('Qux!'));`,
+    'foo/whatever/package.json': JSON.stringify(childConfig, null, 2),
+
+    'package.json': JSON.stringify(config, null, 2),
+  });
+  /* eslint-enable sort-keys */
+
+  const {stderr, status} = runJest(DIR, ['foo/folder/my-test-bar.js']);
+
+  expect(status).toBe(0);
+
+  const {rest, summary} = extractSummary(stderr);
+
+  // We have only one test passed, so total should equal to one, despite we have
+  // three projects.
+  expect(rest).toMatchSnapshot();
+  expect(summary).toMatch(/1 total/);
+});

integration-tests/auto-restore-mocks/with-auto-restore/__tests__/index.js

@@ -0,0 +1,22 @@
+/**
+ * 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';
+
+const TestClass = require('../');
+const localClass = new TestClass();
+
+test('first test', () => {
+  jest.spyOn(localClass, 'test').mockImplementation(() => 'ABCD');
+  expect(localClass.test()).toEqual('ABCD');
+  expect(localClass.test).toHaveBeenCalledTimes(1);
+});
+
+test('second test', () => {
+  expect(localClass.test()).toEqual('12345');
+  expect(localClass.test.mock).toBe(undefined);
+});