Merge branch 'master' into jestjs#7101

Author: Przemysław Duszyński

CHANGELOG.md

@@ -12,6 +12,9 @@
 - `[jest-haste-map]` [**BREAKING**] Remove support for `@providesModule` ([#6104](https://github.com/facebook/jest/pull/6104))
 - `[pretty-format]` Support HTMLCollection and NodeList in DOMCollection plugin ([#7125](https://github.com/facebook/jest/pull/7125))
 - `[jest-runtime]` Pass the normalized configuration to script transformers ([#7148](https://github.com/facebook/jest/pull/7148))
+- `[jest-runtime]` If `require` fails without a file extension, print all files that match with one ([#7160](https://github.com/facebook/jest/pull/7160))
+- `[jest-haste-map]` Make `ignorePattern` optional ([#7166](https://github.com/facebook/jest/pull/7166))
+- `[jest-runtime]` Remove `cacheDirectory` from `ignorePattern` for `HasteMap` if not necessary ([#7166](https://github.com/facebook/jest/pull/7166))
 
 ### Fixes
 
@@ -36,10 +39,16 @@
 - `[jest-circus]` Better error message when a describe block is empty ([#6372](https://github.com/facebook/jest/pull/6372))
 - `[jest-cli]` Fix unhandled error when a bad revision is provided to `changedSince` ([#7115](https://github.com/facebook/jest/pull/7115))
 - `[jest-config]` Moved dynamically assigned `cwd` from `jest-cli` to default configuration in `jest-config` ([#7146](https://github.com/facebook/jest/pull/7146))
+- `[jest-config]` Fix `getMaxWorkers` on termux ([#7154](https://github.com/facebook/jest/pull/7154))
+- `[jest-runtime]` Throw an explicit error if `js` is missing from `moduleFileExtensions` ([#7160](https://github.com/facebook/jest/pull/7160))
+- `[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-cli]` Fix watch mode filename/test name filtering is not taken into account for coverage calculation with collectCoverageFrom set ([#7153](https://github.com/facebook/jest/pull/7153))
 
+
 ### Chore & Maintenance
 
+- `[docs]` Add synchronous test.each setup ([#7150](https://github.com/facebook/jest/pull/7150))
 - `[docs]` Add `this.extend` to the Custom Matchers API reference ([#7130](https://github.com/facebook/jest/pull/7130))
 - `[docs]` Fix default value for `coverageReporters` value in configuration docs ([#7126](https://github.com/facebook/jest/pull/7126))
 - `[docs]` Add link for jest-extended in expect docs ([#7078](https://github.com/facebook/jest/pull/7078))
@@ -53,8 +62,13 @@
 - `[*]` Bump dated dependencies ([#6978](https://github.com/facebook/jest/pull/6978))
 - `[scripts]` Don’t make empty subfolders for ignored files in build folder ([#7001](https://github.com/facebook/jest/pull/7001))
 - `[docs]` Add missing export statement in `puppeteer_environment.js` under `docs/Puppeteer.md` ([#7127](https://github.com/facebook/jest/pull/7127))
+- `[docs]` Removed useless expect.assertions in `TestingAsyncCode.md` ([#7131](https://github.com/facebook/jest/pull/7131))
 - `[docs]` Remove references to `@providesModule` which isn't supported anymore ([#7147](https://github.com/facebook/jest/pull/7147))
 
+### Performance
+
+- `[jest-mock]` Improve `getType` function performance. ([#7159](https://github.com/facebook/jest/pull/7159))
+
 ## 23.6.0
 
 ### Features

README.md

@@ -183,9 +183,9 @@ Facebook has adopted a Code of Conduct that we expect project participants to ad
 
 Read our [contributing guide](CONTRIBUTING.md) to learn about our development process, how to propose bugfixes and improvements, and how to build and test your changes to Jest.
 
-### [Good First Issues](https://github.com/facebook/jest/labels/Good%20First%20Issue%20%3Awave%3A)
+### [Good First Issues](https://github.com/facebook/jest/labels/%3Awave%3A%20Good%20First%20Issue)
 
-To help you get your feet wet and get you familiar with our contribution process, we have a list of [good first issues](https://github.com/facebook/jest/labels/Good%20First%20Issue%20%3Awave%3A) that contain bugs which have a relatively limited scope. This is a great place to get started.
+To help you get your feet wet and get you familiar with our contribution process, we have a list of [good first issues](https://github.com/facebook/jest/labels/%3Awave%3A%20Good%20First%20Issue) that contain bugs which have a relatively limited scope. This is a great place to get started.
 
 ## Credits
 

docs/CLI.md

@@ -131,7 +131,7 @@ Forces test results output highlighting even if stdout is not a TTY.
 
 ### `--config=<path>`
 
-Alias: `-c`. The path to a Jest config file specifying how to find and execute tests. If no `rootDir` is set in the config, the current directory is assumed to be the rootDir for the project. This can also be a JSON-encoded value which Jest will use as configuration.
+Alias: `-c`. The path to a Jest config file specifying how to find and execute tests. If no `rootDir` is set in the config, the directory containing the config file is assumed to be the rootDir for the project. This can also be a JSON-encoded value which Jest will use as configuration.
 
 ### `--coverage`
 

docs/Configuration.md

@@ -237,7 +237,7 @@ For example, with the following configuration:
         "statements": 40
       },
       "./src/reducers/**/*.js": {
-        "statements": 90,
+        "statements": 90
       },
       "./src/api/very-important-module.js": {
         "branches": 100,
@@ -777,6 +777,8 @@ class CustomEnvironment extends NodeEnvironment {
     return super.runScript(script);
   }
 }
+
+module.exports = CustomEnvironment;
 ```
 
 ```js

docs/TestingAsyncCode.md

@@ -49,7 +49,6 @@ For example, let's say that `fetchData`, instead of using a callback, returns a
 
 ```js
 test('the data is peanut butter', () => {
-  expect.assertions(1);
   return fetchData().then(data => {
     expect(data).toBe('peanut butter');
   });
@@ -73,7 +72,6 @@ You can also use the `.resolves` matcher in your expect statement, and Jest will
 
 ```js
 test('the data is peanut butter', () => {
-  expect.assertions(1);
   return expect(fetchData()).resolves.toBe('peanut butter');
 });
 ```
@@ -84,7 +82,6 @@ If you expect a promise to be rejected use the `.rejects` matcher. It works anal
 
 ```js
 test('the fetch fails with an error', () => {
-  expect.assertions(1);
   return expect(fetchData()).rejects.toMatch('error');
 });
 ```
@@ -114,12 +111,10 @@ Of course, you can combine `async` and `await` with `.resolves` or `.rejects`.
 
 ```js
 test('the data is peanut butter', async () => {
-  expect.assertions(1);
   await expect(fetchData()).resolves.toBe('peanut butter');
 });
 
 test('the fetch fails with an error', async () => {
-  expect.assertions(1);
   await expect(fetchData()).rejects.toThrow('error');
 });
 ```

docs/Troubleshooting.md

@@ -192,6 +192,23 @@ Jest takes advantage of new features added to Node 6. We recommend that you upgr
 
 Make sure you are not using the `babel-plugin-istanbul` plugin. Jest wraps Istanbul, and therefore also tells Istanbul what files to instrument with coverage collection. When using `babel-plugin-istanbul`, every file that is processed by Babel will have coverage collection code, hence it is not being ignored by `coveragePathIgnorePatterns`.
 
+## Defining Tests
+
+Tests must be defined synchronously for Jest to be able to collect your tests.
+
+As an example to show why this is the case, imagine we wrote a test like so:
+
+```js
+// Don't do this it will not work
+setTimeout(() => {
+  it('passes', () => expect(1).toBe(1));
+}, 0);
+```
+
+When Jest runs your test to collect the `test`s it will not find any because we have set the definition to happen asynchronously on the next tick of the event loop.
+
+_Note:_ This means when you are using `test.each` you cannot set the table asynchronously within a `beforeEach` / `beforeAll`.
+
 ## Still unresolved?
 
 See [Help](/help.html).

e2e/__tests__/__snapshots__/resolve_no_file_extensions.test.js.snap

@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`show error message when no js moduleFileExtensions 1`] = `
+"● Validation Error:
+
+  moduleFileExtensions must include 'js':
+  but instead received:
+    [\\"jsx\\"]
+  Please change your configuration to include 'js'.
+
+  Configuration Documentation:
+  https://jestjs.io/docs/configuration.html
+
+"
+`;
+
+exports[`show error message with matching files 1`] = `
+"FAIL __tests__/test.js
+  ● Test suite failed to run
+
+    Cannot find module './some-json-file' from 'index.js'
+
+    However, Jest was able to find:
+    	'./some-json-file.json'
+
+    You might want to include a file extension in your import, or update your 'moduleFileExtensions', which is currently ['js'].
+
+    See https://jestjs.io/docs/en/configuration#modulefileextensions-array-string
+
+    > 1 | module.exports = require('./some-json-file');
+        |                  ^
+      2 | 
+
+      at packages/jest-resolve/build/index.js:221:17
+      at index.js:1:18
+
+"
+`;

e2e/__tests__/resolve_no_file_extensions.test.js

@@ -0,0 +1,53 @@
+/**
+ * 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 runJest from '../runJest';
+import {cleanup, extractSummary, writeFiles} from '../Utils';
+
+const DIR = path.resolve(__dirname, '../resolve_no_extensions-no-js');
+
+beforeEach(() => cleanup(DIR));
+afterAll(() => cleanup(DIR));
+
+test('show error message with matching files', () => {
+  const {status, stderr} = runJest('resolve_no_extensions');
+  const {rest} = extractSummary(stderr);
+
+  expect(status).toBe(1);
+  expect(rest).toMatchSnapshot();
+});
+
+test('show error message when no js moduleFileExtensions', () => {
+  writeFiles(DIR, {
+    'index.jsx': `
+      module.exports ={found: true};
+    `,
+    'package.json': `
+      {
+        "jest": {
+          "moduleFileExtensions": ["jsx"]
+        }
+      }
+    `,
+    'test.jsx': `
+      const m = require('../');
+
+      test('some test', () => {
+        expect(m.found).toBe(true);
+      });
+    `,
+  });
+
+  const {status, stderr} = runJest('resolve_no_extensions-no-js');
+
+  expect(status).toBe(1);
+  expect(stderr).toMatchSnapshot();
+});

e2e/resolve_no_extensions/__tests__/test.js

@@ -0,0 +1,5 @@
+const m = require('../');
+
+test('some test', () => {
+  expect(m.found).toBe(true);
+});

e2e/resolve_no_extensions/index.js

@@ -0,0 +1 @@
+module.exports = require('./some-json-file');

e2e/resolve_no_extensions/package.json

@@ -0,0 +1,7 @@
+{
+  "jest": {
+    "moduleFileExtensions": [
+      "js"
+    ]
+  }
+}

e2e/resolve_no_extensions/some-json-file.json

@@ -0,0 +1,3 @@
+{
+  "found": true
+}

flow-typed/npm/glob_v7.1.x.js

@@ -0,0 +1,87 @@
+// flow-typed signature: 7c09aef8ac07163d6ef9e3f50c6bc35c
+// flow-typed version: a12a42a747/glob_v7.1.x/flow_>=v0.42.x
+
+declare module "glob" {
+  declare type MinimatchOptions = {|
+    debug?: boolean,
+    nobrace?: boolean,
+    noglobstar?: boolean,
+    dot?: boolean,
+    noext?: boolean,
+    nocase?: boolean,
+    nonull?: boolean,
+    matchBase?: boolean,
+    nocomment?: boolean,
+    nonegate?: boolean,
+    flipNegate?: boolean
+  |};
+
+  declare type Options = {|
+    ...MinimatchOptions,
+    cwd?: string,
+    root?: string,
+    nomount?: boolean,
+    mark?: boolean,
+    nosort?: boolean,
+    stat?: boolean,
+    silent?: boolean,
+    strict?: boolean,
+    cache?: {
+      [path: string]: boolean | "DIR" | "FILE" | $ReadOnlyArray<string>
+    },
+    statCache?: {
+      [path: string]: boolean | { isDirectory(): boolean } | void
+    },
+    symlinks?: { [path: string]: boolean | void },
+    realpathCache?: { [path: string]: string },
+    sync?: boolean,
+    nounique?: boolean,
+    nodir?: boolean,
+    ignore?: string | $ReadOnlyArray<string>,
+    follow?: boolean,
+    realpath?: boolean,
+    absolute?: boolean
+  |};
+
+  /**
+   * Called when an error occurs, or matches are found
+   *   err
+   *   matches: filenames found matching the pattern
+   */
+  declare type CallBack = (err: ?Error, matches: Array<string>) => void;
+
+  declare class Glob extends events$EventEmitter {
+    constructor(pattern: string): this;
+    constructor(pattern: string, callback: CallBack): this;
+    constructor(pattern: string, options: Options, callback: CallBack): this;
+
+    minimatch: {};
+    options: Options;
+    aborted: boolean;
+    cache: {
+      [path: string]: boolean | "DIR" | "FILE" | $ReadOnlyArray<string>
+    };
+    statCache: {
+      [path: string]: boolean | { isDirectory(): boolean } | void
+    };
+    symlinks: { [path: string]: boolean | void };
+    realpathCache: { [path: string]: string };
+    found: Array<string>;
+
+    pause(): void;
+    resume(): void;
+    abort(): void;
+  }
+
+  declare class GlobModule {
+    Glob: Class<Glob>;
+
+    (pattern: string, callback: CallBack): void;
+    (pattern: string, options: Options, callback: CallBack): void;
+
+    hasMagic(pattern: string, options?: Options): boolean;
+    sync(pattern: string, options?: Options): Array<string>;
+  }
+
+  declare module.exports: GlobModule;
+}

jest.config.ci.js

@@ -2,6 +2,7 @@
 
 // Object spread is just node 8
 module.exports = Object.assign({}, require('./jest.config'), {
+  coverageReporters: ['json'],
   reporters: [
     ['jest-junit', {output: 'reports/junit/js-test-results.xml'}],
     ['jest-silent-reporter', {useDots: true}],

jest.config.js

@@ -8,9 +8,10 @@ module.exports = {
     '!**/perf/**',
     '!**/__mocks__/**',
     '!**/__tests__/**',
+    '!**/build/**',
+    '!**/vendor/**',
     '!e2e/**',
   ],
-  coverageReporters: ['json'],
   modulePathIgnorePatterns: [
     'examples/.*',
     'packages/.*/build',