Store parsed patterns in global config

brandonchinn178 · brandonchinn178 · commit 4caaa456d3e7 · 2023-09-21T20:16:38.000-07:00
diff --git a/e2e/__tests__/__snapshots__/showConfig.test.ts.snap b/e2e/__tests__/__snapshots__/showConfig.test.ts.snap
@@ -139,6 +139,7 @@ exports[`--showConfig outputs config info and exits 1`] = `
     },
     "testFailureExitCode": 1,
     "testPathPattern": "",
+    "testPathPatterns": [],
     "testSequencer": "<<REPLACED_JEST_PACKAGES_DIR>>/jest-test-sequencer/build/index.js",
     "updateSnapshot": "none",
     "useStderr": false,
diff --git a/packages/jest-config/src/index.ts b/packages/jest-config/src/index.ts
@@ -132,6 +132,7 @@ const groupOptions = (
     testFailureExitCode: options.testFailureExitCode,
     testNamePattern: options.testNamePattern,
     testPathPattern: options.testPathPattern,
+    testPathPatterns: options.testPathPatterns,
     testResultsProcessor: options.testResultsProcessor,
     testSequencer: options.testSequencer,
     testTimeout: options.testTimeout,
diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts
@@ -998,6 +998,7 @@ export default async function normalize(
 
   newOptions.nonFlagArgs = argv._?.map(arg => `${arg}`);
   const testPathPatterns = buildTestPathPatterns(argv);
+  newOptions.testPathPatterns = testPathPatterns.patterns;
   newOptions.testPathPattern = testPathPatterns.regexString;
   newOptions.json = !!argv.json;
 
diff --git a/packages/jest-core/src/__tests__/SearchSource.test.ts b/packages/jest-core/src/__tests__/SearchSource.test.ts
@@ -110,6 +110,7 @@ describe('SearchSource', () => {
       const {tests: paths} = await searchSource.getTestPaths({
         ...config,
         testPathPattern: '',
+        testPathPatterns: [],
       });
       return paths.map(({path: p}) => path.relative(rootDir, p)).sort();
     };
diff --git a/packages/jest-core/src/__tests__/__snapshots__/watchFilenamePatternMode.test.js.snap b/packages/jest-core/src/__tests__/__snapshots__/watchFilenamePatternMode.test.js.snap
@@ -93,6 +93,9 @@ Object {
   "onlyChanged": false,
   "passWithNoTests": true,
   "testPathPattern": "p.*3",
+  "testPathPatterns": Array [
+    "p.*3",
+  ],
   "watch": true,
   "watchAll": false,
 }
diff --git a/packages/jest-core/src/__tests__/getNoTestsFoundMessage.test.ts b/packages/jest-core/src/__tests__/getNoTestsFoundMessage.test.ts
@@ -19,6 +19,7 @@ describe('getNoTestsFoundMessage', () => {
     return makeGlobalConfig({
       rootDir: '/root/dir',
       testPathPattern: '/path/pattern',
+      testPathPatterns: ['/path/pattern'],
       ...options,
     });
   }
diff --git a/packages/jest-core/src/__tests__/watch.test.js b/packages/jest-core/src/__tests__/watch.test.js
@@ -672,6 +672,7 @@ describe('Watch mode flows', () => {
     ${'✖︎'} | ${'testFailureExitCode'}
     ${'✔︎'} | ${'testNamePattern'}
     ${'✔︎'} | ${'testPathPattern'}
+    ${'✔︎'} | ${'testPathPatterns'}
     ${'✖︎'} | ${'testResultsProcessor'}
     ${'✔︎'} | ${'updateSnapshot'}
     ${'✖︎'} | ${'useStderr'}
@@ -899,6 +900,7 @@ describe('Watch mode flows', () => {
 
     expect(runJestMock.mock.calls[0][0].globalConfig).toMatchObject({
       testPathPattern: 'file',
+      testPathPatterns: ['file'],
       watch: true,
       watchAll: false,
     });
@@ -923,6 +925,7 @@ describe('Watch mode flows', () => {
     expect(runJestMock.mock.calls[1][0].globalConfig).toMatchObject({
       testNamePattern: 'test',
       testPathPattern: 'file',
+      testPathPatterns: ['file'],
       watch: true,
       watchAll: false,
     });
diff --git a/packages/jest-core/src/lib/__tests__/__snapshots__/logDebugMessages.test.ts.snap b/packages/jest-core/src/lib/__tests__/__snapshots__/logDebugMessages.test.ts.snap
@@ -110,6 +110,7 @@ exports[`prints the config object 1`] = `
     "testFailureExitCode": 1,
     "testNamePattern": "",
     "testPathPattern": "",
+    "testPathPatterns": [],
     "testSequencer": "@jest/test-sequencer",
     "testTimeout": 5000,
     "updateSnapshot": "none",
diff --git a/packages/jest-core/src/plugins/FailedTestsInteractive.ts b/packages/jest-core/src/plugins/FailedTestsInteractive.ts
@@ -59,6 +59,7 @@ export default class FailedTestsInteractivePlugin extends BaseWatchPlugin {
           mode: 'watch',
           testNamePattern: failure ? `^${failure.fullName}$` : '',
           testPathPattern: failure?.path || '',
+          testPathPatterns: failure ? [failure.path] : [],
         });
 
         if (!this._manager.isActive()) {
diff --git a/packages/jest-core/src/plugins/TestPathPattern.ts b/packages/jest-core/src/plugins/TestPathPattern.ts
@@ -48,7 +48,7 @@ class TestPathPatternPlugin extends BaseWatchPlugin {
 
       testPathPatternPrompt.run(
         (value: string) => {
-          updateConfigAndRun({mode: 'watch', testPathPattern: value});
+          updateConfigAndRun({mode: 'watch', testPathPattern: value, testPathPatterns: [value]});
           res();
         },
         rej,
diff --git a/packages/jest-core/src/plugins/UpdateSnapshotsInteractive.ts b/packages/jest-core/src/plugins/UpdateSnapshotsInteractive.ts
@@ -71,6 +71,7 @@ class UpdateSnapshotInteractivePlugin extends BaseWatchPlugin {
               mode: 'watch',
               testNamePattern: assertion ? `^${assertion.fullName}$` : '',
               testPathPattern: assertion ? assertion.path : '',
+              testPathPatterns: assertion ? [assertion.path] : [],
 
               updateSnapshot: shouldUpdateSnapshot ? 'all' : 'none',
             });
diff --git a/packages/jest-core/src/plugins/__tests__/FailedTestsInteractive.test.js b/packages/jest-core/src/plugins/__tests__/FailedTestsInteractive.test.js
@@ -41,6 +41,7 @@ describe('FailedTestsInteractive', () => {
       mode: 'watch',
       testNamePattern: `^${testAggregate.testResults[0].testResults[0].fullName}$`,
       testPathPattern: testAggregate.testResults[0].testFilePath,
+      testPathPatterns: [testAggregate.testResults[0].testFilePath],
     });
   });
 });
diff --git a/packages/jest-core/src/watch.ts b/packages/jest-core/src/watch.ts
@@ -121,6 +121,7 @@ export default async function watch(
     reporters,
     testNamePattern,
     testPathPattern,
+    testPathPatterns,
     updateSnapshot,
     verbose,
   }: AllowedConfigOptions = {}) => {
@@ -141,6 +142,7 @@ export default async function watch(
       reporters,
       testNamePattern,
       testPathPattern,
+      testPathPatterns,
       updateSnapshot,
       verbose,
     });
@@ -405,6 +407,7 @@ export default async function watch(
           mode: 'watchAll',
           testNamePattern: '',
           testPathPattern: '',
+          testPathPatterns: [],
         });
         startRun(globalConfig);
         break;
@@ -413,6 +416,7 @@ export default async function watch(
           mode: 'watch',
           testNamePattern: '',
           testPathPattern: '',
+          testPathPatterns: [],
         });
         break;
       case 'f':
@@ -426,6 +430,7 @@ export default async function watch(
           mode: 'watch',
           testNamePattern: '',
           testPathPattern: '',
+          testPathPatterns: [],
         });
         startRun(globalConfig);
         break;
diff --git a/packages/jest-types/src/Config.ts b/packages/jest-types/src/Config.ts
@@ -413,6 +413,7 @@ export type GlobalConfig = {
   testFailureExitCode: number;
   testNamePattern?: string;
   testPathPattern: string;
+  testPathPatterns: Array<string>;
   testResultsProcessor?: string;
   testSequencer: string;
   testTimeout?: number;
diff --git a/packages/jest-watcher/src/types.ts b/packages/jest-watcher/src/types.ts
@@ -63,6 +63,7 @@ export type AllowedConfigOptions = Partial<
     | 'reporters'
     | 'testNamePattern'
     | 'testPathPattern'
+    | 'testPathPatterns'
     | 'updateSnapshot'
     | 'verbose'
   > & {mode: 'watch' | 'watchAll'}
diff --git a/packages/test-utils/src/config.ts b/packages/test-utils/src/config.ts
@@ -56,6 +56,7 @@ const DEFAULT_GLOBAL_CONFIG: Config.GlobalConfig = {
   testFailureExitCode: 1,
   testNamePattern: '',
   testPathPattern: '',
+  testPathPatterns: [],
   testResultsProcessor: undefined,
   testSequencer: '@jest/test-sequencer',
   testTimeout: 5000,

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ describe('getNoTestsFoundMessage', () => {`
`19`	`19`	`return makeGlobalConfig({`
`20`	`20`	`rootDir: '/root/dir',`
`21`	`21`	`testPathPattern: '/path/pattern',`
	`22`	`+ testPathPatterns: ['/path/pattern'],`
`22`	`23`	`...options,`
`23`	`24`	`});`
`24`	`25`	`}`