e2e env cleanup

Author: phyllis-sy-wu

packages/e2e/.env.example

@@ -1,7 +1,3 @@
-# Required: Client ID of the primary test app (must be in the genghis account's org)
-# CI secret: E2E_CLIENT_ID
-SHOPIFY_FLAG_CLIENT_ID=
-
 # Required: Genghis account email for browser-based OAuth login
 # CI secret: E2E_ACCOUNT_EMAIL
 E2E_ACCOUNT_EMAIL=
@@ -14,6 +10,5 @@ E2E_ACCOUNT_PASSWORD=
 # CI secret: E2E_STORE_FQDN
 E2E_STORE_FQDN=
 
-# Optional: Client ID of a secondary app for config link tests
-# CI secret: E2E_SECONDARY_CLIENT_ID
-E2E_SECONDARY_CLIENT_ID=
+# Required: dedicated e2e org ID
+E2E_ORG_ID=

packages/e2e/setup/app.ts

@@ -40,8 +40,7 @@ export async function createApp(ctx: {
   if (ctx.flavor) args.push('--flavor', ctx.flavor)
 
   const result = await cli.execCreateApp(args, {
-    // Disable color output and strip CLIENT_ID to prevent leaking from parent process.env
-    env: {FORCE_COLOR: '0', SHOPIFY_FLAG_CLIENT_ID: undefined},
+    env: {FORCE_COLOR: '0'},
     timeout: 5 * 60 * 1000,
   })
 

packages/e2e/setup/env.ts

@@ -95,6 +95,7 @@ export const envFixture = base.extend<{}, {env: E2EEnv}>({
         NODE_OPTIONS: '',
         CI: '1',
         SHOPIFY_CLI_1P_DEV: undefined,
+        SHOPIFY_FLAG_CLIENT_ID: undefined,
       }
 
       if (storeFqdn) {

packages/e2e/tests/multi-config-dev.spec.ts

@@ -54,11 +54,11 @@ include_config_on_deploy = true
       fs.writeFileSync(path.join(appDir, 'shopify.app.staging.toml'), stagingToml)
       fs.mkdirSync(path.join(appDir, 'staging-ext'), {recursive: true})
 
-      // Start dev with -c staging. SHOPIFY_FLAG_CLIENT_ID must be unset
-      // because --config and --client-id are mutually exclusive.
+      // Start dev with -c staging.
+      // --config and --client-id are mutually exclusive. CLIENT_ID is stripped globally in env.ts.
       const proc = await cli.spawn(
         ['app', 'dev', '--path', appDir, '-c', 'staging', '--skip-dependencies-installation'],
-        {env: {CI: '', SHOPIFY_FLAG_CLIENT_ID: undefined} as NodeJS.ProcessEnv},
+        {env: {CI: ''}},
       )
 
       try {