Merge pull request #7147 from Shopify/psyw-0331-E2E-infra-refactor

E2E: infra refactor + app tests update

Author: phyllis-sy-wu

.github/workflows/tests-pr.yml

@@ -246,6 +246,7 @@ jobs:
           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/package.json

@@ -31,6 +31,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.0",
     "@types/node": "18.19.70",
+    "dotenv": "16.4.7",
     "execa": "^7.2.0",
     "node-pty": "^1.0.0",
     "strip-ansi": "^7.1.0"

packages/e2e/playwright.config.ts

@@ -1,25 +1,8 @@
 /* eslint-disable line-comment-position */
-/* eslint-disable no-restricted-imports */
+import {config} from 'dotenv'
 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
-  }
-}
+config()
 
 const isCI = Boolean(process.env.CI)