Support different coverage options in projects

.gitignore

@@ -44,3 +44,5 @@ junit.xml
 .yarn/unplugged/
 .yarn/build-state.yml
 e2e/async-regenerator/.yarn/
+
+/.history

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Features
 
+- `[jest-config]` [**BREAKING**] Move coverage options to project config ([#9633](https://github.com/facebook/jest/pull/9633))
 - `[jest-console]` Add code frame to `console.error` and `console.warn` ([#9741](https://github.com/facebook/jest/pull/9741))
 - `[@jest/globals]` New package so Jest's globals can be explicitly imported ([#9801](https://github.com/facebook/jest/pull/9801))
 

TestUtils.ts

@@ -12,12 +12,9 @@ const DEFAULT_GLOBAL_CONFIG: Config.GlobalConfig = {
   changedFilesWithAncestor: false,
   changedSince: '',
   collectCoverage: false,
-  collectCoverageFrom: [],
-  collectCoverageOnlyFrom: null,
   coverageDirectory: 'coverage',
   coverageProvider: 'babel',
   coverageReporters: [],
-  coverageThreshold: {global: {}},
   detectLeaks: false,
   detectOpenHandles: false,
   enabledTestsMap: null,
@@ -71,7 +68,10 @@ const DEFAULT_PROJECT_CONFIG: Config.ProjectConfig = {
   cache: false,
   cacheDirectory: '/test_cache_dir/',
   clearMocks: false,
+  collectCoverageFrom: [],
+  collectCoverageOnlyFrom: null,
   coveragePathIgnorePatterns: [],
+  coverageThreshold: {global: {}},
   cwd: '/test_root_dir/',
   detectLeaks: false,
   detectOpenHandles: false,

docs/WatchPlugins.md

@@ -157,8 +157,6 @@ For stability and safety reasons, only part of the global configuration keys can
 - [`bail`](configuration.html#bail-number--boolean)
 - [`changedSince`](cli.html#--changedsince)
 - [`collectCoverage`](configuration.html#collectcoverage-boolean)
-- [`collectCoverageFrom`](configuration.html#collectcoveragefrom-array)
-- [`collectCoverageOnlyFrom`](configuration.html#collectcoverageonlyfrom-array)
 - [`coverageDirectory`](configuration.html#coveragedirectory-string)
 - [`coverageReporters`](configuration.html#coveragereporters-arraystring)
 - [`notify`](configuration.html#notify-boolean)

e2e/__tests__/__snapshots__/coverageProjects.test.ts.snap

@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`outputs coverage report 1`] = `
+----------------|---------|----------|---------|---------|-------------------
+File            | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s 
+----------------|---------|----------|---------|---------|-------------------
+All files       |     100 |      100 |     100 |     100 |                   
+ add            |     100 |      100 |     100 |     100 |                   
+  index.js      |     100 |      100 |     100 |     100 |                   
+ mul            |     100 |      100 |     100 |     100 |                   
+  other_file.js |     100 |      100 |     100 |     100 |                   
+----------------|---------|----------|---------|---------|-------------------
+`;

e2e/__tests__/__snapshots__/showConfig.test.ts.snap

@@ -9,6 +9,7 @@ exports[`--showConfig outputs config info and exits 1`] = `
       "cache": false,
       "cacheDirectory": "/tmp/jest",
       "clearMocks": false,
+      "collectCoverageFrom": [],
       "coveragePathIgnorePatterns": [
         "/node_modules/"
       ],
@@ -82,7 +83,6 @@ exports[`--showConfig outputs config info and exits 1`] = `
     "bail": 0,
     "changedFilesWithAncestor": false,
     "collectCoverage": false,
-    "collectCoverageFrom": [],
     "coverageDirectory": "<<REPLACED_ROOT_DIR>>/coverage",
     "coverageProvider": "babel",
     "coverageReporters": [

e2e/__tests__/coverageProjects.test.ts

@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. 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.
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+import {wrap} from 'jest-snapshot-serializer-raw';
+import {run} from '../Utils';
+import runJest from '../runJest';
+
+const DIR = path.resolve(__dirname, '../coverage-projects');
+
+beforeAll(() => {
+  run('yarn', DIR);
+});
+
+test('outputs coverage report', () => {
+  const {stdout, exitCode} = runJest(DIR, ['--no-cache', '--coverage'], {
+    stripAnsi: true,
+  });
+  const coverageDir = path.join(DIR, 'coverage');
+
+  // - the `index.js` file in package `mul` is ignored and should not be in the
+  //  coverage report.
+  expect(wrap(stdout)).toMatchSnapshot();
+
+  // `index.js` should only appear once (in package `add`)
+  expect(stdout.match(/index\.js/g)).toHaveLength(1);
+
+  expect(() => fs.accessSync(coverageDir, fs.F_OK)).not.toThrow();
+  expect(exitCode).toBe(0);
+});

e2e/coverage-projects/.gitignore

@@ -0,0 +1,2 @@
+coverage
+yarn-error.log

e2e/coverage-projects/package.json

@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "workspaces": {
+    "packages": [
+      "packages/*"
+    ]
+  },
+  "jest": {
+    "collectCoverage": true,
+    "projects": ["packages/*"]
+  }
+}

e2e/coverage-projects/packages/add/index.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. 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.
+ */
+
+module.exports = (x, y) => x + y;

e2e/coverage-projects/packages/add/index.test.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. 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.
+ */
+
+const add = require('.');
+
+describe('add', () => {
+  it('should add correctly', () => {
+    expect(add(2, 3)).toBe(5);
+  });
+});

e2e/coverage-projects/packages/add/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "add",
+  "private": true,
+  "jest": {
+    "collectCoverage": true,
+    "collectCoverageFrom": [
+      "!**.json",
+      "!<rootDir>/coverage/**"
+    ]
+  }
+}

e2e/coverage-projects/packages/mul/index.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. 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.
+ */
+
+module.exports = (x, y) => x * y;

e2e/coverage-projects/packages/mul/index.test.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. 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.
+ */
+
+const mul = require('.');
+
+describe('mul', () => {
+  it('should multiply correctly', () => {
+    expect(mul(2, 3)).toBe(6);
+  });
+});

e2e/coverage-projects/packages/mul/other_file.js

@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. 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.
+ */
+
+module.exports = () => 'hello';

e2e/coverage-projects/packages/mul/other_file.test.js

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. 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.
+ */
+
+const hello = require('./other_file');
+
+describe('other_file', () => {
+  it('should output hello', () => {
+    expect(hello()).toBe('hello');
+  });
+});

e2e/coverage-projects/packages/mul/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "mul",
+  "private": true,
+  "jest": {
+    "collectCoverage": true,
+    "collectCoverageFrom": [
+      "!**.json",
+      "!<rootDir>/coverage/**",
+      "!<rootDir>/index.js"
+    ]
+  }
+}

e2e/coverage-projects/yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

jest.config.js

@@ -61,6 +61,7 @@ module.exports = {
     '/packages/jest-worker/src/__performance_tests__',
     '/packages/pretty-format/perf/test.js',
     '/e2e/__tests__/iterator-to-null-test.ts',
+    '/.history',
   ],
   transform: {
     '^.+\\.[jt]sx?$': '<rootDir>/packages/babel-jest',

packages/jest-config/src/index.ts

@@ -109,12 +109,9 @@ const groupOptions = (
     changedFilesWithAncestor: options.changedFilesWithAncestor,
     changedSince: options.changedSince,
     collectCoverage: options.collectCoverage,
-    collectCoverageFrom: options.collectCoverageFrom,
-    collectCoverageOnlyFrom: options.collectCoverageOnlyFrom,
     coverageDirectory: options.coverageDirectory,
     coverageProvider: options.coverageProvider,
     coverageReporters: options.coverageReporters,
-    coverageThreshold: options.coverageThreshold,
     detectLeaks: options.detectLeaks,
     detectOpenHandles: options.detectOpenHandles,
     enabledTestsMap: options.enabledTestsMap,
@@ -167,7 +164,10 @@ const groupOptions = (
     cache: options.cache,
     cacheDirectory: options.cacheDirectory,
     clearMocks: options.clearMocks,
+    collectCoverageFrom: options.collectCoverageFrom,
+    collectCoverageOnlyFrom: options.collectCoverageOnlyFrom,
     coveragePathIgnorePatterns: options.coveragePathIgnorePatterns,
+    coverageThreshold: options.coverageThreshold,
     cwd: options.cwd,
     dependencyExtractor: options.dependencyExtractor,
     detectLeaks: options.detectLeaks,

packages/jest-core/src/__tests__/watch.test.js

@@ -606,11 +606,8 @@ describe('Watch mode flows', () => {
     ${'✖︎'} | ${'changedFilesWithAncestor'}
     ${'✔︎'} | ${'changedSince'}
     ${'✔︎'} | ${'collectCoverage'}
-    ${'✔︎'} | ${'collectCoverageFrom'}
-    ${'✔︎'} | ${'collectCoverageOnlyFrom'}
     ${'✔︎'} | ${'coverageDirectory'}
     ${'✔︎'} | ${'coverageReporters'}
-    ${'✖︎'} | ${'coverageThreshold'}
     ${'✖︎'} | ${'detectLeaks'}
     ${'✖︎'} | ${'detectOpenHandles'}
     ${'✖︎'} | ${'enabledTestsMap'}

packages/jest-core/src/lib/__tests__/__snapshots__/log_debug_messages.test.ts.snap

@@ -8,7 +8,12 @@ exports[`prints the config object 1`] = `
     "cache": false,
     "cacheDirectory": "/test_cache_dir/",
     "clearMocks": false,
+    "collectCoverageFrom": [],
+    "collectCoverageOnlyFrom": null,
     "coveragePathIgnorePatterns": [],
+    "coverageThreshold": {
+      "global": {}
+    },
     "cwd": "/test_root_dir/",
     "detectLeaks": false,
     "detectOpenHandles": false,
@@ -68,14 +73,9 @@ exports[`prints the config object 1`] = `
     "changedFilesWithAncestor": false,
     "changedSince": "",
     "collectCoverage": false,
-    "collectCoverageFrom": [],
-    "collectCoverageOnlyFrom": null,
     "coverageDirectory": "coverage",
     "coverageProvider": "babel",
     "coverageReporters": [],
-    "coverageThreshold": {
-      "global": {}
-    },
     "detectLeaks": false,
     "detectOpenHandles": false,
     "enabledTestsMap": null,

packages/jest-core/src/lib/update_global_config.ts

@@ -56,14 +56,6 @@ export default (
     newConfig.collectCoverage = options.collectCoverage || false;
   }
 
-  if (options.collectCoverageFrom !== undefined) {
-    newConfig.collectCoverageFrom = options.collectCoverageFrom;
-  }
-
-  if (options.collectCoverageOnlyFrom !== undefined) {
-    newConfig.collectCoverageOnlyFrom = options.collectCoverageOnlyFrom;
-  }
-
   if (options.coverageDirectory !== undefined) {
     newConfig.coverageDirectory = options.coverageDirectory;
   }

packages/jest-core/src/watch.ts

@@ -103,8 +103,6 @@ export default function watch(
     bail,
     changedSince,
     collectCoverage,
-    collectCoverageFrom,
-    collectCoverageOnlyFrom,
     coverageDirectory,
     coverageReporters,
     mode,
@@ -122,8 +120,6 @@ export default function watch(
       bail,
       changedSince,
       collectCoverage,
-      collectCoverageFrom,
-      collectCoverageOnlyFrom,
       coverageDirectory,
       coverageReporters,
       mode,