From 1535af7659e0392b3f7c6124fa58d230907ee38d Mon Sep 17 00:00:00 2001
From: Alex <alex.oshchepkov@gmail.com>
Date: Fri, 23 Oct 2020 19:38:39 +0500
Subject: [PATCH] Allow to pass `findRelatedTests` and `nonFlagArgs` to
 `updateConfigAndRun` (#10659)

---
 CHANGELOG.md                                       | 2 ++
 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 ++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80263e7ce1ce..a3fdc55f111b 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))
+
 ### Fixes
 
 ### Chore & Maintenance
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..b6aa38b7f878 100644
--- a/packages/jest-core/src/lib/update_global_config.ts
+++ b/packages/jest-core/src/lib/update_global_config.ts
@@ -72,6 +72,14 @@ export default (
     newConfig.coverageReporters = options.coverageReporters;
   }
 
+  if (options.findRelatedTests !== undefined) {
+    newConfig.findRelatedTests = options.findRelatedTests;
+  }
+
+  if (options.nonFlagArgs !== undefined) {
+    newConfig.nonFlagArgs = options.nonFlagArgs;
+  }
+
   if (options.noSCM) {
     newConfig.noSCM = true;
   }
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'