Add fixtures for config step

Author: codenem

packages/cli-v3/e2e/fixtures/no-config/.yarnrc.yml renamed to packages/cli-v3/e2e/fixtures/config-invalid/.yarnrc.yml

@@ -1,5 +1,5 @@
 {
-  "name": "no-config",
+  "name": "config-invalid",
   "private": true,
   "packageManager": "[email protected]+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589",
   "engines": {

packages/cli-v3/e2e/fixtures/no-config/package-lock.json renamed to packages/cli-v3/e2e/fixtures/config-invalid/package-lock.json

@@ -0,0 +1,4 @@
+export const config = {
+  // 'project' field is mandatory
+  triggerDirectories: [],
+};

packages/cli-v3/e2e/fixtures/no-config/package.json renamed to packages/cli-v3/e2e/fixtures/config-invalid/package.json

@@ -5,8 +5,8 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"no-config@workspace:.":
+"config-invalid@workspace:.":
   version: 0.0.0-use.local
-  resolution: "no-config@workspace:."
+  resolution: "config-invalid@workspace:."
   languageName: unknown
   linkType: soft

packages/cli-v3/e2e/fixtures/no-config/pnpm-lock.yaml renamed to packages/cli-v3/e2e/fixtures/config-invalid/pnpm-lock.yaml

@@ -0,0 +1 @@
+nodeLinker: node-modules

packages/cli-v3/e2e/fixtures/no-config/pnpm-workspace.yaml renamed to packages/cli-v3/e2e/fixtures/config-invalid/pnpm-workspace.yaml

@@ -0,0 +1,9 @@
+{
+  "name": "config-not-found",
+  "private": true,
+  "packageManager": "[email protected]+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589",
+  "engines": {
+    "pnpm": "8.15.5",
+    "yarn": "4.2.2"
+  }
+}

packages/cli-v3/e2e/fixtures/config-invalid/trigger.config.js

@@ -0,0 +1 @@
+# https://github.com/pnpm/pnpm/issues/2412

packages/cli-v3/e2e/fixtures/no-config/yarn.lock renamed to packages/cli-v3/e2e/fixtures/config-invalid/yarn.lock

@@ -0,0 +1,12 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"config-not-found@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "config-not-found@workspace:."
+  languageName: unknown
+  linkType: soft

packages/cli-v3/e2e/fixtures/config-not-found/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

packages/cli-v3/e2e/fixtures/config-not-found/package-lock.json

@@ -0,0 +1,9 @@
+{
+  "name": "trigger-dir-missing",
+  "private": true,
+  "packageManager": "[email protected]+sha256.1aa43a5304405be7a7cb9cb5de7b97de9c4e8ddd3273e4dad00d6ae3eb39f0ef",
+  "engines": {
+    "pnpm": "8.15.5",
+    "yarn": "4.2.2"
+  }
+}

packages/cli-v3/e2e/fixtures/config-not-found/package.json

@@ -0,0 +1 @@
+# https://github.com/pnpm/pnpm/issues/2412

packages/cli-v3/e2e/fixtures/config-not-found/pnpm-lock.yaml

@@ -0,0 +1,3 @@
+export const config = {
+  project: "bad-config",
+};

packages/cli-v3/e2e/fixtures/config-not-found/pnpm-workspace.yaml

@@ -0,0 +1,12 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"trigger-dir-missing@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "trigger-dir-missing@workspace:."
+  languageName: unknown
+  linkType: soft

packages/cli-v3/e2e/fixtures/config-not-found/yarn.lock

@@ -0,0 +1 @@
+nodeLinker: node-modules

packages/cli-v3/e2e/fixtures/trigger-dir-missing/.yarnrc.yml

@@ -0,0 +1,9 @@
+{
+  "name": "trigger-dir-not-found",
+  "private": true,
+  "packageManager": "[email protected]+sha256.1aa43a5304405be7a7cb9cb5de7b97de9c4e8ddd3273e4dad00d6ae3eb39f0ef",
+  "engines": {
+    "pnpm": "8.15.5",
+    "yarn": "4.2.2"
+  }
+}

packages/cli-v3/e2e/fixtures/trigger-dir-missing/package-lock.json

@@ -0,0 +1 @@
+# https://github.com/pnpm/pnpm/issues/2412

packages/cli-v3/e2e/fixtures/trigger-dir-missing/package.json

@@ -0,0 +1,4 @@
+export const config = {
+  project: "bad-config",
+  triggerDirectories: ["./unknown-folder"],
+};

packages/cli-v3/e2e/fixtures/trigger-dir-missing/pnpm-lock.yaml

@@ -0,0 +1,12 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"trigger-dir-not-found@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "trigger-dir-not-found@workspace:."
+  languageName: unknown
+  linkType: soft

packages/cli-v3/e2e/fixtures/trigger-dir-missing/pnpm-workspace.yaml

@@ -18,7 +18,7 @@ type TestCase = {
   name: string;
   skipTypecheck?: boolean;
   wantConfigNotFoundError?: boolean;
-  wantBadConfigError?: boolean;
+  wantConfigInvalidError?: boolean;
   wantCompilationError?: boolean;
   wantWorkerError?: boolean;
   wantDependenciesError?: boolean;
@@ -109,7 +109,7 @@ if (testCases.length > 0) {
         name,
         skipTypecheck,
         wantConfigNotFoundError,
-        wantBadConfigError,
+        wantConfigInvalidError,
         wantCompilationError,
         wantWorkerError,
         wantDependenciesError,
@@ -157,7 +157,7 @@ if (testCases.length > 0) {
             (async () => {
               global.resolvedConfig = await readConfig(fixtureDir, { cwd: fixtureDir });
             })(),
-            wantConfigNotFoundError || wantBadConfigError
+            wantConfigNotFoundError || wantConfigInvalidError
               ? "does not resolve config"
               : "resolves config"
           );
@@ -167,9 +167,9 @@ if (testCases.length > 0) {
             await configExpect.resolves.not.toThrowError();
           }
 
-          if (wantConfigNotFoundError || wantBadConfigError) {
-            if (wantBadConfigError) {
-              expect(global.resolvedConfig).toBe("error");
+          if (wantConfigNotFoundError || wantConfigInvalidError) {
+            if (wantConfigInvalidError) {
+              expect(global.resolvedConfig!.status).toBe("error");
             }
             return;
           }

packages/cli-v3/e2e/fixtures/trigger-dir-missing/trigger.config.js

@@ -1,6 +1,10 @@
 [
   {
-    "name": "no-config",
+    "name": "config-invalid",
+    "wantConfigInvalidError": true
+  },
+  {
+    "name": "config-not-found",
     "wantConfigNotFoundError": true
   },
   {

packages/cli-v3/e2e/fixtures/trigger-dir-missing/yarn.lock

@@ -227,9 +227,11 @@ export async function readConfig(
 export async function resolveConfig(path: string, config: Config): Promise<ResolvedConfig> {
   if (!config.triggerDirectories) {
     config.triggerDirectories = await findTriggerDirectories(path);
+    // TODO trigger-dir-missing: throw error if no trigger directory is found
   }
 
   config.triggerDirectories = resolveTriggerDirectories(path, config.triggerDirectories);
+  // TODO trigger-dir-not-found: throw error if trigger directories do not exist
 
   logger.debug("Resolved trigger directories", { triggerDirectories: config.triggerDirectories });