Go against the grain in the cypress plugin

webpro-nl · Jun 15, 2024 · ef2464d · ef2464d
1 parent 6a17ad2
commit ef2464d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/packages/knip/fixtures/plugins/cypress/cypress.config.ts b/packages/knip/fixtures/plugins/cypress/cypress.config.ts
@@ -5,7 +5,7 @@ const cypressJsonConfig = {};
 
 export default defineConfig({
   e2e: {
-    ...nxE2EPreset(__dirname),
+    ...nxE2EPreset(__dirname, {}),
     ...cypressJsonConfig,
   },
 });
diff --git a/packages/knip/fixtures/plugins/cypress/node_modules/@nrwl/cypress/plugins/cypress-preset.js b/packages/knip/fixtures/plugins/cypress/node_modules/@nrwl/cypress/plugins/cypress-preset.js
diff --git a/packages/knip/fixtures/plugins/cypress2/cypress/support/commands.ts b/packages/knip/fixtures/plugins/cypress2/cypress/support/commands.ts
diff --git a/packages/knip/fixtures/plugins/cypress2/cypress/support/e2e.ts b/packages/knip/fixtures/plugins/cypress2/cypress/support/e2e.ts
diff --git a/packages/knip/src/plugins/cypress/index.ts b/packages/knip/src/plugins/cypress/index.ts
@@ -23,7 +23,12 @@ const SUPPORT_FILE_PATTERNS = [
 const entry = [...TEST_FILE_PATTERNS, ...SUPPORT_FILE_PATTERNS];
 
 const resolveEntryPaths: ResolveEntryPaths = async localConfig => {
-  return [localConfig.e2e?.specPattern ?? [], localConfig.component?.specPattern ?? []].flat().map(toEntryPattern);
+  const specPatterns = [localConfig.e2e?.specPattern ?? [], localConfig.component?.specPattern ?? []].flat();
+  const supportFiles = [localConfig.e2e?.supportFile ?? [], localConfig.component?.supportFile ?? []].flat();
+  return [
+    ...(specPatterns.length > 0 ? specPatterns : TEST_FILE_PATTERNS),
+    ...(supportFiles.length > 0 ? supportFiles : SUPPORT_FILE_PATTERNS),
+  ].map(toEntryPattern);
 };
 
 export default {

diff --git a/packages/knip/test/plugins/cypress2.test.ts b/packages/knip/test/plugins/cypress2.test.ts
@@ -15,7 +15,7 @@ test('Find dependencies with the Cypress plugin (2)', async () => {
 
   assert.deepEqual(counters, {
     ...baseCounters,
-    processed: 3,
-    total: 3,
+    processed: 5,
+    total: 5,
   });
 });