From 9a98d29ef85e09fc00e48efb5cc5c1fe1ee69239 Mon Sep 17 00:00:00 2001 From: rickhanlonii Date: Sat, 8 Sep 2018 15:06:54 -0400 Subject: [PATCH 1/2] Add changedSince to allowed watchmode configs --- packages/jest-cli/src/__tests__/watch.test.js | 2 +- packages/jest-cli/src/lib/update_global_config.js | 5 +++++ packages/jest-cli/src/watch.js | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/jest-cli/src/__tests__/watch.test.js b/packages/jest-cli/src/__tests__/watch.test.js index f37c0172df7c..3607381f684d 100644 --- 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 index 94ea02f139c6..e919e906cf06 100644 --- 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, + changedSince?: $PropertyType, collectCoverage?: $PropertyType, collectCoverageFrom?: $PropertyType, 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 || false; + } + 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 index 90e9f1212f83..67e78ffa66e1 100644 --- 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, From d6e902e905753494c254e6ce52a5ae6450153ae3 Mon Sep 17 00:00:00 2001 From: rickhanlonii Date: Sat, 8 Sep 2018 16:17:40 -0400 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + packages/jest-cli/src/lib/update_global_config.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 848b63965041..2f3432db05ac 100644 --- 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/lib/update_global_config.js b/packages/jest-cli/src/lib/update_global_config.js index e919e906cf06..3762eeaf6308 100644 --- a/packages/jest-cli/src/lib/update_global_config.js +++ b/packages/jest-cli/src/lib/update_global_config.js @@ -71,7 +71,7 @@ export default (globalConfig: GlobalConfig, options: Options): GlobalConfig => { } if (options.changedSince !== undefined) { - newConfig.changedSince = options.changedSince || false; + newConfig.changedSince = options.changedSince; } if (options.collectCoverage !== undefined) {