Add changedSince to allowed watchmode configs (#6955)

jestjs · Sep 9, 2018 · 19ceeb5 · 19ceeb5
1 parent 38f445a
commit 19ceeb5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Features
 
+- `[jest-ci]` Add `changedSince` to allowed watch mode configs ([#6955](https://github.com/facebook/jest/pull/6955))
 - `[babel-jest]` Add support for `babel.config.js` added in Babel 7.0.0 ([#6911](https://github.com/facebook/jest/pull/6911))
 
 ### Fixes

diff --git a/packages/jest-cli/src/__tests__/watch.test.js b/packages/jest-cli/src/__tests__/watch.test.js
@@ -576,7 +576,7 @@ describe('Watch mode flows', () => {
     ok      | option
     ${'✔︎'} | ${'bail'}
     ${'✖︎'} | ${'changedFilesWithAncestor'}
-    ${'✖︎'} | ${'changedSince'}
+    ${'✔︎'} | ${'changedSince'}
     ${'✔︎'} | ${'collectCoverage'}
     ${'✔︎'} | ${'collectCoverageFrom'}
     ${'✔︎'} | ${'collectCoverageOnlyFrom'}

diff --git a/packages/jest-cli/src/lib/update_global_config.js b/packages/jest-cli/src/lib/update_global_config.js
@@ -13,6 +13,7 @@ import type {GlobalConfig} from 'types/Config';
 
 export type Options = {
   bail?: $PropertyType<GlobalConfig, 'bail'>,
+  changedSince?: $PropertyType<GlobalConfig, 'changedSince'>,
   collectCoverage?: $PropertyType<GlobalConfig, 'collectCoverage'>,
   collectCoverageFrom?: $PropertyType<GlobalConfig, 'collectCoverageFrom'>,
   collectCoverageOnlyFrom?: $PropertyType<
@@ -69,6 +70,10 @@ export default (globalConfig: GlobalConfig, options: Options): GlobalConfig => {
     newConfig.bail = options.bail || false;
   }
 
+  if (options.changedSince !== undefined) {
+    newConfig.changedSince = options.changedSince;
+  }
+
   if (options.collectCoverage !== undefined) {
     newConfig.collectCoverage = options.collectCoverage || false;
   }

diff --git a/packages/jest-cli/src/watch.js b/packages/jest-cli/src/watch.js
@@ -82,6 +82,7 @@ export default function watch(
 
   const updateConfigAndRun = ({
     bail,
+    changedSince,
     collectCoverage,
     collectCoverageFrom,
     collectCoverageOnlyFrom,
@@ -100,6 +101,7 @@ export default function watch(
     const previousUpdateSnapshot = globalConfig.updateSnapshot;
     globalConfig = updateGlobalConfig(globalConfig, {
       bail,
+      changedSince,
       collectCoverage,
       collectCoverageFrom,
       collectCoverageOnlyFrom,