From 74e7148dc0ab8e79ae333922b5b81371f09d9045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isaac=20Rold=C3=A1n?= <isaac.roldan@shopify.com>
Date: Fri, 22 May 2026 11:58:02 +0200
Subject: [PATCH] Fix stale E2E CLI assumptions

---
 packages/e2e/setup/app.ts            | 6 ++++--
 packages/e2e/setup/env.ts            | 6 ++++++
 packages/e2e/tests/smoke-pty.spec.ts | 1 -
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/e2e/setup/app.ts b/packages/e2e/setup/app.ts
index 30499a2c3aa..7073b38a395 100644
--- a/packages/e2e/setup/app.ts
+++ b/packages/e2e/setup/app.ts
@@ -147,7 +147,8 @@ export async function deployApp(
     version?: string
     message?: string
     config?: string
-    force?: boolean
+    allowUpdates?: boolean
+    allowDeletes?: boolean
     noBuild?: boolean
   },
 ): Promise<ExecResult> {
@@ -155,7 +156,8 @@ export async function deployApp(
   if (ctx.version) args.push('--version', ctx.version)
   if (ctx.message) args.push('--message', ctx.message)
   if (ctx.config) args.push('--config', ctx.config)
-  if (ctx.force ?? true) args.push('--force')
+  if (ctx.allowUpdates ?? true) args.push('--allow-updates')
+  if (ctx.allowDeletes) args.push('--allow-deletes')
   if (ctx.noBuild) args.push('--no-build')
   args.push('--path', ctx.appDir)
   return ctx.cli.exec(args, {timeout: CLI_TIMEOUT.long})
diff --git a/packages/e2e/setup/env.ts b/packages/e2e/setup/env.ts
index 34c4e288ce6..b0e7b023e65 100644
--- a/packages/e2e/setup/env.ts
+++ b/packages/e2e/setup/env.ts
@@ -139,10 +139,16 @@ export const envFixture = base.extend<{testSection: void}, {env: E2EEnv}>({
       fs.mkdirSync(tmpBase, {recursive: true})
 
       const {tempDir, xdgEnv} = createIsolatedEnv(tmpBase)
+      const cloudflaredPath = path.join(
+        tempDir,
+        'cloudflared',
+        process.platform === 'win32' ? 'cloudflared.exe' : 'cloudflared',
+      )
 
       const processEnv: NodeJS.ProcessEnv = {
         ...process.env,
         ...xdgEnv,
+        SHOPIFY_CLI_CLOUDFLARED_PATH: cloudflaredPath,
         SHOPIFY_RUN_AS_USER: '0',
         NODE_OPTIONS: '',
         CI: '1',
diff --git a/packages/e2e/tests/smoke-pty.spec.ts b/packages/e2e/tests/smoke-pty.spec.ts
index a1053295ede..1c6f2dc5c02 100644
--- a/packages/e2e/tests/smoke-pty.spec.ts
+++ b/packages/e2e/tests/smoke-pty.spec.ts
@@ -4,7 +4,6 @@ import {expect} from '@playwright/test'
 test.describe('PTY smoke test', () => {
   test('shopify version runs via PTY', async ({cli}) => {
     const proc = await cli.spawn(['version'])
-    await proc.waitForOutput('3.')
     const code = await proc.waitForExit()
     expect(code, `shopify version (PTY) failed. Output:\n${proc.getOutput()}`).toBe(0)
     expect(proc.getOutput()).toMatch(/\d+\.\d+\.\d+/)