fix: cleanup integration folder after moving specs to e2e

packages/data-context/src/actions/MigrationActions.ts

@@ -1,6 +1,7 @@
 import path from 'path'
 import type { DataContext } from '..'
 import {
+  cleanUpIntegrationFolder,
   formatConfig,
   moveSpecFiles,
   NonStandardMigrationError,
@@ -47,7 +48,12 @@ export class MigrationActions {
 
     const projectRoot = this.ctx.path.join(this.ctx.currentProject)
 
-    moveSpecFiles(projectRoot, specsToMove)
+    try {
+      await moveSpecFiles(projectRoot, specsToMove)
+      await cleanUpIntegrationFolder(this.ctx.currentProject)
+    } catch (err: any) {
+      this.ctx.coreData.baseError = err
+    }
   }
 
   async renameSupportFile () {

packages/data-context/src/sources/migration/utils.ts

@@ -280,13 +280,26 @@ export interface SpecToMove {
   to: string
 }
 
-export function moveSpecFiles (projectRoot: string, specs: SpecToMove[]) {
-  specs.forEach((spec) => {
+export async function moveSpecFiles (projectRoot: string, specs: SpecToMove[]) {
+  await Promise.all(specs.map(async (spec) => {
     const from = path.join(projectRoot, spec.from)
     const to = path.join(projectRoot, spec.to)
 
-    fs.moveSync(from, to)
-  })
+    await fs.move(from, to)
+  }))
+}
+
+export async function cleanUpIntegrationFolder (projectRoot: string) {
+  const integrationPath = path.join(projectRoot, 'cypress', 'integration')
+
+  try {
+    await fs.rmdir(integrationPath)
+  } catch (e: any) {
+    // only throw if the folder exists
+    if (e.code !== 'ENOENT') {
+      throw Error(`Failed to remove ${integrationPath}`)
+    }
+  }
 }
 
 export function renameSupportFilePath (relative: string) {

packages/launchpad/cypress/e2e/migration.cy.ts

@@ -171,6 +171,13 @@ describe('Full migration flow for each project', { retries: { openMode: 2, runMo
     renameSupport()
     migrateAndVerifyConfig()
     finishMigrationAndContinue()
+
+    cy.withCtx(async (ctx) => {
+      const integrationFolderStats = await ctx.actions.file.checkIfFileExists(ctx.path.join('cypress', 'integration'))
+
+      expect(integrationFolderStats).to.be.null
+    })
+
     checkOutcome()
   })