Use root testDir fallback in projects in playwright plugin

webpro-nl · Sep 23, 2024 · d4c5af9 · d4c5af9
1 parent 1e64b6c
commit d4c5af9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/packages/knip/src/plugins/playwright/index.ts b/packages/knip/src/plugins/playwright/index.ts
@@ -20,10 +20,12 @@ const toEntryPatterns = (
   testMatch: string | RegExp | Array<string | RegExp> | undefined,
   cwd: string,
   configDir: string,
-  localConfig: PlaywrightTestConfig
+  localConfig: PlaywrightTestConfig,
+  rootConfig: PlaywrightTestConfig
 ) => {
   if (!testMatch) return [];
-  const dir = relative(cwd, localConfig.testDir ? join(configDir, localConfig.testDir) : configDir);
+  const testDir = localConfig.testDir ?? rootConfig.testDir;
+  const dir = relative(cwd, testDir ? join(configDir, testDir) : configDir);
   const patterns = [testMatch].flat().filter((p): p is string => typeof p === 'string');
   return patterns.map(pattern => toEntryPattern(join(dir, pattern)));
 };
@@ -33,7 +35,7 @@ const builtinReporters = ['dot', 'line', 'list', 'junit', 'html', 'blob', 'json'
 export const resolveEntryPaths: ResolveEntryPaths<PlaywrightTestConfig> = async (localConfig, options) => {
   const { cwd, configFileDir } = options;
   const projects = localConfig.projects ? [localConfig, ...localConfig.projects] : [localConfig];
-  return projects.flatMap(config => toEntryPatterns(config.testMatch, cwd, configFileDir, config));
+  return projects.flatMap(config => toEntryPatterns(config.testMatch, cwd, configFileDir, config, localConfig));
 };
 
 export const resolveConfig: ResolveConfig<PlaywrightTestConfig> = async config => {