rename cleanupApp → teardownApp

Author: phyllis-sy-wu

packages/e2e/setup/app.ts

@@ -335,8 +335,8 @@ export async function deleteApp(
   await browserPage.waitForTimeout(3000)
 }
 
-/** Best-effort cleanup: find app on dashboard by name, uninstall from all stores, delete. */
-export async function cleanupApp(
+/** Best-effort teardown: find app on dashboard by name, uninstall from all stores, delete. */
+export async function teardownApp(
   ctx: BrowserContext & {
     appName: string
     email?: string
@@ -352,19 +352,19 @@ export async function cleanupApp(
         await deleteApp({browserPage: ctx.browserPage, appUrl: app.url})
         // eslint-disable-next-line no-catch-all/no-catch-all
       } catch (err) {
-        // Best-effort per app — continue cleaning up remaining apps
+        // Best-effort per app — continue teardown of remaining apps
         if (process.env.DEBUG === '1') {
           const msg = err instanceof Error ? err.message : String(err)
-          process.stderr.write(`[e2e] Cleanup failed for app ${app.name}: ${msg}\n`)
+          process.stderr.write(`[e2e] Teardown failed for app ${app.name}: ${msg}\n`)
         }
       }
     }
     // eslint-disable-next-line no-catch-all/no-catch-all
   } catch (err) {
-    // Best-effort — don't fail the test if cleanup fails
+    // Best-effort — don't fail the test if teardown fails
     if (process.env.DEBUG === '1') {
       const msg = err instanceof Error ? err.message : String(err)
-      process.stderr.write(`[e2e] Cleanup failed for ${ctx.appName}: ${msg}\n`)
+      process.stderr.write(`[e2e] Teardown failed for ${ctx.appName}: ${msg}\n`)
     }
   }
 }

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

@@ -1,4 +1,4 @@
-import {appTestFixture as test, createApp, deployApp, versionsList, cleanupApp} from '../setup/app.js'
+import {appTestFixture as test, createApp, deployApp, versionsList, teardownApp} from '../setup/app.js'
 import {requireEnv} from '../setup/env.js'
 import {expect} from '@playwright/test'
 import * as fs from 'fs'
@@ -40,7 +40,7 @@ test.describe('App deploy', () => {
       expect(listOutput).toContain(versionTag)
     } finally {
       fs.rmSync(parentDir, {recursive: true, force: true})
-      await cleanupApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
+      await teardownApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
     }
   })
 })

packages/e2e/tests/app-dev-server.spec.ts

@@ -1,4 +1,4 @@
-import {appTestFixture as test, createApp, cleanupApp} from '../setup/app.js'
+import {appTestFixture as test, createApp, teardownApp} from '../setup/app.js'
 import {requireEnv} from '../setup/env.js'
 import {expect} from '@playwright/test'
 import * as fs from 'fs'
@@ -44,7 +44,7 @@ test.describe('App dev server', () => {
       expect(exitCode).toBe(0)
     } finally {
       fs.rmSync(parentDir, {recursive: true, force: true})
-      await cleanupApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
+      await teardownApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
     }
   })
 })

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

@@ -1,5 +1,5 @@
 /* eslint-disable no-restricted-imports */
-import {appTestFixture as test, createApp, buildApp, generateExtension, cleanupApp} from '../setup/app.js'
+import {appTestFixture as test, createApp, buildApp, generateExtension, teardownApp} from '../setup/app.js'
 import {requireEnv} from '../setup/env.js'
 import {expect} from '@playwright/test'
 import * as fs from 'fs'
@@ -39,7 +39,7 @@ test.describe('App scaffold', () => {
       expect(buildResult.exitCode, `build failed:\nstderr: ${buildResult.stderr}`).toBe(0)
     } finally {
       fs.rmSync(parentDir, {recursive: true, force: true})
-      await cleanupApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
+      await teardownApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
     }
   })
 
@@ -64,7 +64,7 @@ test.describe('App scaffold', () => {
       expect(fs.existsSync(path.join(initResult.appDir, 'shopify.app.toml'))).toBe(true)
     } finally {
       fs.rmSync(parentDir, {recursive: true, force: true})
-      await cleanupApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
+      await teardownApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
     }
   })
 
@@ -106,7 +106,7 @@ test.describe('App scaffold', () => {
       expect(buildResult.exitCode, `build failed:\nstderr: ${buildResult.stderr}`).toBe(0)
     } finally {
       fs.rmSync(parentDir, {recursive: true, force: true})
-      await cleanupApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
+      await teardownApp({browserPage, appName, email: process.env.E2E_ACCOUNT_EMAIL, orgId: env.orgId})
     }
   })
 })