From 9493bde9fd72ce2be371e769245d0b2ec703f9df Mon Sep 17 00:00:00 2001 From: A O Date: Tue, 20 Oct 2020 15:25:13 +0500 Subject: [PATCH 1/3] feat(jest-core): allow to pass findRelatedTests and nonFlagArgs to updateConfig --- packages/jest-core/src/__tests__/watch.test.js | 4 ++-- packages/jest-core/src/lib/update_global_config.ts | 8 ++++++-- packages/jest-core/src/watch.ts | 4 ++++ packages/jest-watcher/src/types.ts | 2 ++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/jest-core/src/__tests__/watch.test.js b/packages/jest-core/src/__tests__/watch.test.js index 0ad258ad2c77..e8d6eb079109 100644 --- a/packages/jest-core/src/__tests__/watch.test.js +++ b/packages/jest-core/src/__tests__/watch.test.js @@ -617,7 +617,7 @@ describe('Watch mode flows', () => { ${'✖︎'} | ${'errorOnDeprecated'} ${'✖︎'} | ${'expand'} ${'✖︎'} | ${'filter'} - ${'✖︎'} | ${'findRelatedTests'} + ${'✔︎'} | ${'findRelatedTests'} ${'✖︎'} | ${'forceExit'} ${'✖︎'} | ${'globalSetup'} ${'✖︎'} | ${'globalTeardown'} @@ -626,7 +626,7 @@ describe('Watch mode flows', () => { ${'✖︎'} | ${'listTests'} ${'✖︎'} | ${'logHeapUsage'} ${'✖︎'} | ${'maxWorkers'} - ${'✖︎'} | ${'nonFlagArgs'} + ${'✔︎'} | ${'nonFlagArgs'} ${'✖︎'} | ${'noSCM'} ${'✖︎'} | ${'noStackTrace'} ${'✔︎'} | ${'notify'} diff --git a/packages/jest-core/src/lib/update_global_config.ts b/packages/jest-core/src/lib/update_global_config.ts index 992a03631bdd..083629500a75 100644 --- a/packages/jest-core/src/lib/update_global_config.ts +++ b/packages/jest-core/src/lib/update_global_config.ts @@ -68,8 +68,12 @@ export default ( newConfig.coverageDirectory = options.coverageDirectory; } - if (options.coverageReporters !== undefined) { - newConfig.coverageReporters = options.coverageReporters; + if (options.findRelatedTests !== undefined) { + newConfig.findRelatedTests = options.findRelatedTests; + } + + if (options.nonFlagArgs !== undefined) { + newConfig.nonFlagArgs = options.nonFlagArgs; } if (options.noSCM) { diff --git a/packages/jest-core/src/watch.ts b/packages/jest-core/src/watch.ts index 77fb88417783..64d9407fefe6 100644 --- a/packages/jest-core/src/watch.ts +++ b/packages/jest-core/src/watch.ts @@ -107,7 +107,9 @@ export default function watch( collectCoverageOnlyFrom, coverageDirectory, coverageReporters, + findRelatedTests, mode, + nonFlagArgs, notify, notifyMode, onlyFailures, @@ -126,7 +128,9 @@ export default function watch( collectCoverageOnlyFrom, coverageDirectory, coverageReporters, + findRelatedTests, mode, + nonFlagArgs, notify, notifyMode, onlyFailures, diff --git a/packages/jest-watcher/src/types.ts b/packages/jest-watcher/src/types.ts index cea9875965e7..90335fc163de 100644 --- a/packages/jest-watcher/src/types.ts +++ b/packages/jest-watcher/src/types.ts @@ -56,6 +56,8 @@ export type AllowedConfigOptions = Partial< | 'collectCoverageOnlyFrom' | 'coverageDirectory' | 'coverageReporters' + | 'findRelatedTests' + | 'nonFlagArgs' | 'notify' | 'notifyMode' | 'onlyFailures' From 5a982733563f277dcbf1052180864c848772d94b Mon Sep 17 00:00:00 2001 From: A O Date: Wed, 21 Oct 2020 00:39:13 +0500 Subject: [PATCH 2/3] add back coverageReporters --- packages/jest-core/src/lib/update_global_config.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/jest-core/src/lib/update_global_config.ts b/packages/jest-core/src/lib/update_global_config.ts index 083629500a75..b6aa38b7f878 100644 --- a/packages/jest-core/src/lib/update_global_config.ts +++ b/packages/jest-core/src/lib/update_global_config.ts @@ -68,6 +68,10 @@ export default ( newConfig.coverageDirectory = options.coverageDirectory; } + if (options.coverageReporters !== undefined) { + newConfig.coverageReporters = options.coverageReporters; + } + if (options.findRelatedTests !== undefined) { newConfig.findRelatedTests = options.findRelatedTests; } From b1896c89be0de0e71a82ea3340069b7ea7a1ade0 Mon Sep 17 00:00:00 2001 From: A O Date: Wed, 21 Oct 2020 01:42:44 +0500 Subject: [PATCH 3/3] add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7877f54c223..779cbbc39c88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### Features +- `[jest-core]` Add `findRelatedTests` and `nonFlagArgs` in allowed config options for `updateConfigAndRun` in watch plugins ([#10659](https://github.com/facebook/jest/pull/10659)) + - `[jest-validate]` Add support for `recursiveDenylist` option as an alternative to `recursiveBlacklist` ([#10236](https://github.com/facebook/jest/pull/10236)) ### Fixes