E2E: infra refactor + app tests update

Author: phyllis-sy-wu

.github/workflows/tests-pr.yml

@@ -242,10 +242,12 @@ jobs:
         working-directory: packages/e2e
         env:
           SHOPIFY_FLAG_CLIENT_ID: ${{ secrets.E2E_CLIENT_ID }}
+          SHOPIFY_CLI_PARTNERS_TOKEN: ${{ secrets.SHOPIFY_CLI_PARTNERS_TOKEN }}
           E2E_ACCOUNT_EMAIL: ${{ secrets.E2E_ACCOUNT_EMAIL }}
           E2E_ACCOUNT_PASSWORD: ${{ secrets.E2E_ACCOUNT_PASSWORD }}
           E2E_STORE_FQDN: ${{ secrets.E2E_STORE_FQDN }}
           E2E_SECONDARY_CLIENT_ID: ${{ secrets.E2E_SECONDARY_CLIENT_ID }}
+          E2E_ORG_ID: ${{ secrets.E2E_ORG_ID }}
         run: npx playwright test
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4

packages/e2e/helpers/load-env.ts

@@ -0,0 +1,30 @@
+/* eslint-disable no-restricted-imports */
+import * as fs from 'fs'
+import * as path from 'path'
+import {fileURLToPath} from 'url'
+
+/**
+ * Load a .env file into process.env (without overwriting existing values).
+ * Handles quotes and inline comments (e.g. "VALUE # comment" → "VALUE").
+ */
+export function loadEnv(dirOrUrl: string): void {
+  const dir = dirOrUrl.startsWith('file://') ? path.dirname(fileURLToPath(dirOrUrl)) : dirOrUrl
+  const envPath = path.join(dir, '.env')
+  if (!fs.existsSync(envPath)) return
+
+  for (const line of fs.readFileSync(envPath, 'utf-8').split('\n')) {
+    const trimmed = line.trim()
+    if (!trimmed || trimmed.startsWith('#')) continue
+    const eqIdx = trimmed.indexOf('=')
+    if (eqIdx === -1) continue
+    const key = trimmed.slice(0, eqIdx).trim()
+    let value = trimmed.slice(eqIdx + 1).trim()
+    if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+      value = value.slice(1, -1)
+    } else {
+      const commentIdx = value.indexOf(' #')
+      if (commentIdx !== -1) value = value.slice(0, commentIdx).trim()
+    }
+    process.env[key] ??= value
+  }
+}

packages/e2e/playwright.config.ts

@@ -1,25 +1,8 @@
 /* eslint-disable line-comment-position */
-/* eslint-disable no-restricted-imports */
+import {loadEnv} from './helpers/load-env.js'
 import {defineConfig} from '@playwright/test'
-import * as fs from 'fs'
-import * as path from 'path'
-import {fileURLToPath} from 'url'
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-// Load .env file if present (CI provides env vars directly)
-const envPath = path.join(__dirname, '.env')
-if (fs.existsSync(envPath)) {
-  for (const line of fs.readFileSync(envPath, 'utf-8').split('\n')) {
-    const trimmed = line.trim()
-    if (!trimmed || trimmed.startsWith('#')) continue
-    const eqIdx = trimmed.indexOf('=')
-    if (eqIdx === -1) continue
-    const key = trimmed.slice(0, eqIdx).trim()
-    const value = trimmed.slice(eqIdx + 1).trim()
-    process.env[key] ??= value
-  }
-}
+loadEnv(import.meta.url)
 
 const isCI = Boolean(process.env.CI)