polish

Author: phyllis-sy-wu

packages/e2e/package.json

@@ -30,8 +30,7 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.50.0",
-    "@shopify/cli-kit": "3.92.0",
-    "@types/node": "18.19.70",
+"@types/node": "18.19.70",
     "execa": "^7.2.0",
     "node-pty": "^1.0.0",
     "strip-ansi": "^7.1.0",

packages/e2e/setup/app.ts

@@ -78,10 +78,6 @@ export const appScaffoldFixture = authFixture.extend<{appScaffold: AppScaffold}>
           timeout: 5 * 60 * 1000,
         })
 
-        if (result.exitCode !== 0) {
-          return result
-        }
-
         const allOutput = `${result.stdout}\n${result.stderr}`
         const match = allOutput.match(/([\w-]+) is ready for you to build!/)
 

packages/e2e/setup/cli.ts

@@ -49,9 +49,15 @@ export const cliFixture = envFixture.extend<{cli: CLIProcess}>({
       async exec(args, opts = {}) {
         // 3 min default
         const timeout = opts.timeout ?? 3 * 60 * 1000
+        const execEnv: {[key: string]: string} = {}
+        for (const [key, value] of Object.entries({...env.processEnv, ...opts.env})) {
+          if (value !== undefined) {
+            execEnv[key] = value
+          }
+        }
         const execaOpts: ExecaOptions = {
           cwd: opts.cwd,
-          env: {...env.processEnv, ...opts.env},
+          env: execEnv,
           extendEnv: false,
           timeout,
           reject: false,
@@ -73,9 +79,15 @@ export const cliFixture = envFixture.extend<{cli: CLIProcess}>({
       async execCreateApp(args, opts = {}) {
         // 5 min default for scaffolding
         const timeout = opts.timeout ?? 5 * 60 * 1000
+        const execEnv: {[key: string]: string} = {}
+        for (const [key, value] of Object.entries({...env.processEnv, ...opts.env})) {
+          if (value !== undefined) {
+            execEnv[key] = value
+          }
+        }
         const execaOpts: ExecaOptions = {
           cwd: opts.cwd,
-          env: {...env.processEnv, ...opts.env},
+          env: execEnv,
           extendEnv: false,
           timeout,
           reject: false,

packages/e2e/tests/app-basic.spec.ts

@@ -1,8 +1,9 @@
+/* eslint-disable no-restricted-imports */
 import {appScaffoldFixture as test} from '../setup/app.js'
 import {requireEnv} from '../setup/env.js'
 import {expect} from '@playwright/test'
-import {joinPath} from '@shopify/cli-kit/node/path'
 import * as fs from 'fs'
+import * as path from 'path'
 
 test.describe('App basic flow (no extensions)', () => {
   test('init, dev, execute, quit, clean, deploy, versions, config link, deploy to secondary', async ({
@@ -38,7 +39,7 @@ test.describe('App basic flow (no extensions)', () => {
       )
       const executeOutput = executeResult.stdout + executeResult.stderr
       expect(executeResult.exitCode, '‼️ Step 3 - app execute failed').toBe(0)
-      expect(executeOutput, '‼️ Step 3 - app execute: response missing "shop" field').toContain('shop')
+      expect(executeOutput, '‼️ Step 3 - app execute: response missing "shop" field').toContain('"shop"')
 
       // Step 4: Press q to quit the dev server
       dev.sendKey('q')
@@ -58,7 +59,7 @@ test.describe('App basic flow (no extensions)', () => {
     }
 
     // Step 6: Deploy the primary app
-    const versionTag = `e2e-v-${Date.now()}`
+    const versionTag = `QA-E2E-1st-${Date.now()}`
     const deployResult = await cli.exec(
       [
         'app',
@@ -91,7 +92,7 @@ test.describe('App basic flow (no extensions)', () => {
     // that file already exists → overwrite confirmation prompt hangs.
     // (--config and --client-id are mutually exclusive flags, so we can't pass both directly.)
     fs.writeFileSync(
-      joinPath(appScaffold.appDir, 'shopify.app.secondary.toml'),
+      path.join(appScaffold.appDir, 'shopify.app.secondary.toml'),
       `client_id = "${env.secondaryClientId}"\n`,
     )
 
@@ -106,7 +107,7 @@ test.describe('App basic flow (no extensions)', () => {
     expect(configLinkExitCode, '‼️ Step 8 - app config link failed').toBe(0)
 
     // Step 9: Deploy to the secondary app using the linked config file
-    const secondaryVersionTag = `e2e-secondary-v-${Date.now()}`
+    const secondaryVersionTag = `QA-E2E-2nd-${Date.now()}`
     const secondaryDeployResult = await cli.exec(
       [
         'app',