Replace remaining usages of globalConfig.testPathPattern

jestjs · Sep 22, 2023 · 6713c2c · 6713c2c
1 parent e347e72
commit 6713c2c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/e2e/__tests__/multiProjectRunner.test.ts b/e2e/__tests__/multiProjectRunner.test.ts
@@ -155,7 +155,7 @@ test('"No tests found" message for projects', () => {
     'project1',
     'project2',
   ]);
-  expect(verboseOutput).toContain('Pattern: xyz321 - 0 matches');
+  expect(verboseOutput).toContain('Pattern: /xyz321/i - 0 matches');
   const {stdout} = runJest(DIR, [
     '--no-watchman',
     'xyz321',

diff --git a/packages/jest-core/src/__tests__/__snapshots__/getNoTestsFoundMessage.test.ts.snap b/packages/jest-core/src/__tests__/__snapshots__/getNoTestsFoundMessage.test.ts.snap
@@ -23,7 +23,7 @@ Object {
 Run with \`--passWithNoTests\` to exit with code 0
 In <bold>/root/dir</intensity>
   0 files checked across 0 projects. Run with \`--verbose\` for more details.
-Pattern: <yellow>/path/pattern</color> - 0 matches",
+Pattern: <yellow>/\\/path\\/pattern/i</color> - 0 matches",
 }
 `;
 
@@ -47,7 +47,7 @@ Object {
   "message": "<bold>No tests found, exiting with code 1</intensity>
 Run with \`--passWithNoTests\` to exit with code 0
 
-Pattern: <yellow>/path/pattern</color> - 0 matches",
+Pattern: <yellow>/\\/path\\/pattern/i</color> - 0 matches",
 }
 `;
 
@@ -58,6 +58,6 @@ Object {
 Run with \`--passWithNoTests\` to exit with code 0
 In <bold>/root/dir</intensity>
   0 files checked across 0 projects. Run with \`--verbose\` for more details.
-Pattern: <yellow>/path/pattern</color> - 0 matches",
+Pattern: <yellow>/\\/path\\/pattern/i</color> - 0 matches",
 }
 `;
diff --git a/packages/jest-core/src/getNoTestFound.ts b/packages/jest-core/src/getNoTestFound.ts
@@ -7,7 +7,7 @@
 
 import chalk = require('chalk');
 import type {Config} from '@jest/types';
-import {pluralize} from 'jest-util';
+import {TestPathPatterns, pluralize} from 'jest-util';
 import type {TestRunData} from './types';
 
 export default function getNoTestFound(
@@ -26,8 +26,9 @@ export default function getNoTestFound(
       .map(p => `"${p}"`)
       .join(', ')}`;
   } else {
+    const testPathPatterns = new TestPathPatterns(globalConfig);
     dataMessage = `Pattern: ${chalk.yellow(
-      globalConfig.testPathPattern,
+      testPathPatterns.toPretty(),
     )} - 0 matches`;
   }
 

diff --git a/packages/jest-core/src/getNoTestFoundVerbose.ts b/packages/jest-core/src/getNoTestFoundVerbose.ts
@@ -7,7 +7,7 @@
 
 import chalk = require('chalk');
 import type {Config} from '@jest/types';
-import {pluralize} from 'jest-util';
+import {TestPathPatterns, pluralize} from 'jest-util';
 import type {Stats, TestRunData} from './types';
 
 export default function getNoTestFoundVerbose(
@@ -56,8 +56,9 @@ export default function getNoTestFoundVerbose(
       .map(p => `"${p}"`)
       .join(', ')}`;
   } else {
+    const testPathPatterns = new TestPathPatterns(globalConfig);
     dataMessage = `Pattern: ${chalk.yellow(
-      globalConfig.testPathPattern,
+      testPathPatterns.toPretty(),
     )} - 0 matches`;
   }
 

diff --git a/packages/jest-core/src/lib/activeFiltersMessage.ts b/packages/jest-core/src/lib/activeFiltersMessage.ts
@@ -7,14 +7,15 @@
 
 import chalk = require('chalk');
 import type {Config} from '@jest/types';
-import {isNonNullable} from 'jest-util';
+import {TestPathPatterns, isNonNullable} from 'jest-util';
 
 const activeFilters = (globalConfig: Config.GlobalConfig): string => {
-  const {testNamePattern, testPathPattern} = globalConfig;
-  if (testNamePattern || testPathPattern) {
+  const {testNamePattern} = globalConfig;
+  const testPathPatterns = new TestPathPatterns(globalConfig);
+  if (testNamePattern || testPathPatterns.isSet()) {
     const filters = [
-      testPathPattern
-        ? chalk.dim('filename ') + chalk.yellow(`/${testPathPattern}/`)
+      testPathPatterns.isSet()
+        ? chalk.dim('filename ') + chalk.yellow(testPathPatterns.toPretty())
         : null,
       testNamePattern
         ? chalk.dim('test name ') + chalk.yellow(`/${testNamePattern}/`)

diff --git a/packages/jest-core/src/watch.ts b/packages/jest-core/src/watch.ts
@@ -537,10 +537,11 @@ const usage = (
   watchPlugins: Array<WatchPlugin>,
   delimiter = '\n',
 ) => {
+  const testPathPatterns = new TestPathPatterns(globalConfig);
   const messages = [
     activeFilters(globalConfig),
 
-    globalConfig.testPathPattern || globalConfig.testNamePattern
+    testPathPatterns.isSet() || globalConfig.testNamePattern
       ? `${chalk.dim(' \u203A Press ')}c${chalk.dim(' to clear filters.')}`
       : null,
     `\n${chalk.bold('Watch Usage')}`,
@@ -558,7 +559,7 @@ const usage = (
         )}`,
 
     (globalConfig.watchAll ||
-      globalConfig.testPathPattern ||
+      testPathPatterns.isSet() ||
       globalConfig.testNamePattern) &&
     !globalConfig.noSCM
       ? `${chalk.dim(' \u203A Press ')}o${chalk.dim(