Finalize the split between configs.

integration_tests/__tests__/__snapshots__/failures-test.js.snap

@@ -70,7 +70,7 @@ Object {
     
     Expected two assertions to be called but only received one assertion call.
       
-      at addAssertionErrors (../../packages/jest-jasmine2/build/setup-jest-globals.js:56:21)
+      at addAssertionErrors (../../packages/jest-jasmine2/build/setup-jest-globals.js:62:21)
 
   ● .assertions() › throws on redeclare of assertion count
 
@@ -87,7 +87,7 @@ Object {
     
     Expected zero assertions to be called but only received one assertion call.
       
-      at addAssertionErrors (../../packages/jest-jasmine2/build/setup-jest-globals.js:56:21)
+      at addAssertionErrors (../../packages/jest-jasmine2/build/setup-jest-globals.js:62:21)
 
   .assertions()
     ✕ throws

integration_tests/__tests__/__snapshots__/showConfig-test.js.snap

@@ -4,25 +4,17 @@ exports[`jest --showConfig outputs config info and exits 1`] = `
 {
   "config": {
     "automock": false,
-    "bail": false,
     "browser": false,
+    "cache": false,
     "cacheDirectory": "/tmp/jest",
     "clearMocks": false,
     "coveragePathIgnorePatterns": [
       "/node_modules/"
     ],
-    "coverageReporters": [
-      "json",
-      "text",
-      "lcov",
-      "clover"
-    ],
-    "expand": false,
     "globals": {},
     "haste": {
       "providesModuleNodeModules": []
     },
-    "mapCoverage": false,
     "moduleDirectories": [
       "node_modules"
     ],
@@ -34,14 +26,17 @@ exports[`jest --showConfig outputs config info and exits 1`] = `
     ],
     "moduleNameMapper": {},
     "modulePathIgnorePatterns": [],
-    "noStackTrace": false,
-    "notify": false,
+    "name": "[md5 hash]",
     "preset": null,
     "resetMocks": false,
     "resetModules": false,
+    "rootDir": "/mocked/root/path/jest/integration_tests/verbose_reporter",
     "roots": [
       "/mocked/root/path/jest/integration_tests/verbose_reporter"
     ],
+    "setupFiles": [
+      "/mocked/root/path/jest/node_modules/regenerator-runtime/runtime.js"
+    ],
     "snapshotSerializers": [],
     "testEnvironment": "/mocked/root/path/jest/packages/jest-environment-node/build/index.js",
     "testMatch": [
@@ -52,36 +47,22 @@ exports[`jest --showConfig outputs config info and exits 1`] = `
       "/node_modules/"
     ],
     "testRegex": "",
-    "testResultsProcessor": null,
+    "testRunner": "/mocked/root/path/jest/packages/jest-jasmine2/build/index.js",
     "testURL": "about:blank",
     "timers": "real",
-    "transformIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "useStderr": false,
-    "verbose": null,
-    "watch": false,
-    "rootDir": "/mocked/root/path/jest/integration_tests/verbose_reporter",
-    "name": "[md5 hash]",
-    "setupFiles": [
-      "/mocked/root/path/jest/node_modules/regenerator-runtime/runtime.js"
-    ],
-    "testRunner": "/mocked/root/path/jest/packages/jest-jasmine2/build/index.js",
     "transform": [
       [
         "^.+\\\\.jsx?$",
         "/mocked/root/path/jest/integration_tests/verbose_reporter/node_modules/babel-jest/build/index.js"
       ]
     ],
-    "cache": false,
-    "watchman": true
+    "transformIgnorePatterns": [
+      "/node_modules/"
+    ]
   },
   "framework": "jasmine2",
   "globalConfig": {
     "bail": false,
-    "coveragePathIgnorePatterns": [
-      "/node_modules/"
-    ],
     "coverageReporters": [
       "json",
       "text",

integration_tests/__tests__/config-test.js

@@ -48,5 +48,5 @@ test('watchman config option is respected over default argv', () => {
     '--debug',
   ]);
 
-  expect(stdout).toMatch('"watchman": false,');
+  expect(stdout).toMatch('"watchman": false');
 });

packages/jest-cli/src/__tests__/generateEmptyCoverage-test.js

@@ -36,8 +36,7 @@ module.exports = {
 
 it('generates an empty coverage object for a file without running it', () => {
   expect(
-    generateEmptyCoverage(src, '/sum.js', {
-      baseCacheDir: os.tmpdir(),
+    generateEmptyCoverage(src, '/sum.js', {}, {
       cacheDirectory: os.tmpdir(),
       rootDir: os.tmpdir(),
     }).coverage,

packages/jest-cli/src/cli/runCLI.js

@@ -55,6 +55,7 @@ module.exports = async (
           maxWorkers: getMaxWorkers(argv),
           resetCache: !config.cache,
           watch: globalConfig.watch,
+          watchman: globalConfig.watchman,
         });
         hasteMapInstances[index] = hasteMapInstance;
         return createContext(config, await hasteMapInstance.build());

packages/jest-cli/src/generateEmptyCoverage.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {ProjectConfig, Path} from 'types/Config';
+import type {GlobalConfig, ProjectConfig, Path} from 'types/Config';
 
 const IstanbulInstrument = require('istanbul-lib-instrument');
 
@@ -19,9 +19,15 @@ const {ScriptTransformer, shouldInstrument} = require('jest-runtime');
 module.exports = function(
   source: string,
   filename: Path,
+  globalConfig: GlobalConfig,
   config: ProjectConfig,
 ) {
-  if (shouldInstrument(filename, config)) {
+  const coverageOptions = {
+    collectCoverage: globalConfig.collectCoverage,
+    collectCoverageFrom: globalConfig.collectCoverageFrom,
+    collectCoverageOnlyFrom: globalConfig.collectCoverageOnlyFrom,
+  };
+  if (shouldInstrument(filename, coverageOptions, config)) {
     // Transform file without instrumentation first, to make sure produced
     // source code is ES6 (no flowtypes etc.) and can be instrumented
     const transformResult = new ScriptTransformer(config).transformSource(

packages/jest-cli/src/reporters/CoverageReporter.js

@@ -61,25 +61,25 @@ class CoverageReporter extends BaseReporter {
 
   onRunComplete(
     contexts: Set<Context>,
-    config: GlobalConfig,
+    globalConfig: GlobalConfig,
     aggregatedResults: AggregatedResult,
   ) {
-    this._addUntestedFiles(contexts);
+    this._addUntestedFiles(globalConfig, contexts);
     let map = this._coverageMap;
     let sourceFinder: Object;
-    if (config.mapCoverage) {
+    if (globalConfig.mapCoverage) {
       ({map, sourceFinder} = this._sourceMapStore.transformCoverage(map));
     }
 
     const reporter = createReporter();
     try {
-      if (config.coverageDirectory) {
-        reporter.dir = config.coverageDirectory;
+      if (globalConfig.coverageDirectory) {
+        reporter.dir = globalConfig.coverageDirectory;
       }
 
-      let coverageReporters = config.coverageReporters || [];
+      let coverageReporters = globalConfig.coverageReporters || [];
       if (
-        !config.useStderr &&
+        !globalConfig.useStderr &&
         coverageReporters.length &&
         coverageReporters.indexOf('text') === -1
       ) {
@@ -101,16 +101,19 @@ class CoverageReporter extends BaseReporter {
       );
     }
 
-    this._checkThreshold(map, config);
+    this._checkThreshold(globalConfig, map);
   }
 
-  _addUntestedFiles(contexts: Set<Context>) {
+  _addUntestedFiles(globalConfig: GlobalConfig, contexts: Set<Context>) {
     const files = [];
     contexts.forEach(context => {
       const config = context.config;
-      if (config.collectCoverageFrom && config.collectCoverageFrom.length) {
+      if (
+        globalConfig.collectCoverageFrom &&
+        globalConfig.collectCoverageFrom.length
+      ) {
         context.hasteFS
-          .matchFilesWithGlob(config.collectCoverageFrom, config.rootDir)
+          .matchFilesWithGlob(globalConfig.collectCoverageFrom, config.rootDir)
           .forEach(filePath =>
             files.push({
               config,
@@ -129,7 +132,12 @@ class CoverageReporter extends BaseReporter {
         if (!this._coverageMap.data[path]) {
           try {
             const source = fs.readFileSync(path).toString();
-            const result = generateEmptyCoverage(source, path, config);
+            const result = generateEmptyCoverage(
+              source,
+              path,
+              globalConfig,
+              config,
+            );
             if (result) {
               this._coverageMap.addFileCoverage(result.coverage);
               if (result.sourceMapPath) {
@@ -155,8 +163,8 @@ class CoverageReporter extends BaseReporter {
     }
   }
 
-  _checkThreshold(map: CoverageMap, config: GlobalConfig) {
-    if (config.coverageThreshold) {
+  _checkThreshold(globalConfig: GlobalConfig, map: CoverageMap) {
+    if (globalConfig.coverageThreshold) {
       const results = map.getCoverageSummary().toJSON();
 
       function check(name, thresholds, actuals) {
@@ -188,7 +196,11 @@ class CoverageReporter extends BaseReporter {
           return errors;
         }, []);
       }
-      const errors = check('global', config.coverageThreshold.global, results);
+      const errors = check(
+        'global',
+        globalConfig.coverageThreshold.global,
+        results,
+      );
 
       if (errors.length > 0) {
         this.log(`${FAIL_COLOR(errors.join('\n'))}`);

packages/jest-cli/src/runJest.js

@@ -26,7 +26,10 @@ const TestSequencer = require('./TestSequencer');
 
 const setConfig = (contexts, newConfig) =>
   contexts.forEach(
-    context => (context.config = Object.assign({}, context.config, newConfig)),
+    context =>
+      (context.config = Object.freeze(
+        Object.assign({}, context.config, newConfig),
+      )),
   );
 
 const formatTestPathPattern = pattern => {

packages/jest-cli/src/runTest.js

@@ -52,14 +52,14 @@ function runTest(
   /* $FlowFixMe */
   const TestRunner = require(config.testRunner);
   /* $FlowFixMe */
-  const ModuleLoader = require(config.moduleLoader || 'jest-runtime');
+  const Runtime = require(config.moduleLoader || 'jest-runtime');
 
   const env = new TestEnvironment(config);
   const TestConsole = globalConfig.verbose
     ? Console
-    : config.silent ? NullConsole : BufferedConsole;
+    : globalConfig.silent ? NullConsole : BufferedConsole;
   const testConsole = new TestConsole(
-    config.useStderr ? process.stderr : process.stdout,
+    globalConfig.useStderr ? process.stderr : process.stdout,
     process.stderr,
     (type, message) =>
       getConsoleOutput(
@@ -71,7 +71,11 @@ function runTest(
   );
   const cacheFS = {[path]: testSource};
   setGlobal(env.global, 'console', testConsole);
-  const runtime = new ModuleLoader(config, env, resolver, cacheFS);
+  const runtime = new Runtime(config, env, resolver, cacheFS, {
+    collectCoverage: globalConfig.collectCoverage,
+    collectCoverageFrom: globalConfig.collectCoverageFrom,
+    collectCoverageOnlyFrom: globalConfig.collectCoverageOnlyFrom,
+  });
   const start = Date.now();
   return TestRunner(globalConfig, config, env, runtime, path)
     .then((result: TestResult) => {

packages/jest-config/src/defaults.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {DefaultConfig} from 'types/Config';
+import type {DefaultOptions} from 'types/Config';
 
 const constants = require('./constants');
 const os = require('os');
@@ -66,4 +66,4 @@ module.exports = ({
   useStderr: false,
   verbose: null,
   watch: false,
-}: DefaultConfig);
+}: DefaultOptions);

packages/jest-config/src/index.js

@@ -73,13 +73,11 @@ const getConfigs = (
       collectCoverageFrom: options.collectCoverageFrom,
       collectCoverageOnlyFrom: options.collectCoverageOnlyFrom,
       coverageDirectory: options.coverageDirectory,
-      coveragePathIgnorePatterns: options.coveragePathIgnorePatterns,
       coverageReporters: options.coverageReporters,
       coverageThreshold: options.coverageThreshold,
       expand: options.expand,
       forceExit: options.forceExit,
       logHeapUsage: options.logHeapUsage,
-      logTransformErrors: options.logTransformErrors,
       mapCoverage: options.mapCoverage,
       noStackTrace: options.noStackTrace,
       notify: options.notify,
@@ -95,7 +93,42 @@ const getConfigs = (
       watch: options.watch,
       watchman: options.watchman,
     }),
-    projectConfig: options,
+    projectConfig: Object.freeze({
+      automock: options.automock,
+      browser: options.browser,
+      cache: options.cache,
+      cacheDirectory: options.cacheDirectory,
+      clearMocks: options.clearMocks,
+      coveragePathIgnorePatterns: options.coveragePathIgnorePatterns,
+      globals: options.globals,
+      haste: options.haste,
+      moduleDirectories: options.moduleDirectories,
+      moduleFileExtensions: options.moduleFileExtensions,
+      moduleLoader: options.moduleLoader,
+      moduleNameMapper: options.moduleNameMapper,
+      modulePathIgnorePatterns: options.modulePathIgnorePatterns,
+      modulePaths: options.modulePaths,
+      name: options.name,
+      preset: options.preset,
+      resetMocks: options.resetMocks,
+      resetModules: options.resetModules,
+      resolver: options.resolver,
+      rootDir: options.rootDir,
+      roots: options.roots,
+      setupFiles: options.setupFiles,
+      setupTestFrameworkScriptFile: options.setupTestFrameworkScriptFile,
+      snapshotSerializers: options.snapshotSerializers,
+      testEnvironment: options.testEnvironment,
+      testMatch: options.testMatch,
+      testPathIgnorePatterns: options.testPathIgnorePatterns,
+      testRegex: options.testRegex,
+      testRunner: options.testRunner,
+      testURL: options.testURL,
+      timers: options.timers,
+      transform: options.transform,
+      transformIgnorePatterns: options.transformIgnorePatterns,
+      unmockedModulePathPatterns: options.unmockedModulePathPatterns,
+    }),
   };
 };