fix: attempt to fix flaky migration tests (#8034)

packages/core/utils/src/migrations/integration-tests/__tests__/migrations-generate.spec.ts

@@ -14,7 +14,7 @@ const DB_PASSWORD = process.env.DB_PASSWORD ?? " "
 
 const dbName = "my-test-service-generate"
 const moduleName = "myTestServiceGenerate"
-const fs = new FileSystem(join(__dirname, "./migrations/generate"))
+const fs = new FileSystem(join(__dirname, "./migrations-generate"))
 
 const pgGodCredentials = {
   user: DB_USERNAME,
@@ -24,6 +24,11 @@ const pgGodCredentials = {
 
 describe("Generate migrations", () => {
   beforeEach(async () => {
+    await dropDatabase(
+      { databaseName: dbName, errorIfNonExist: false },
+      pgGodCredentials
+    )
+    await fs.cleanup()
     await createDatabase({ databaseName: dbName }, pgGodCredentials)
   })
 

packages/core/utils/src/migrations/integration-tests/__tests__/migrations-revert.spec.ts

@@ -15,7 +15,7 @@ const DB_PASSWORD = process.env.DB_PASSWORD ?? " "
 
 const dbName = "my-test-service-revert"
 const moduleName = "myTestServiceRevert"
-const fs = new FileSystem(join(__dirname, "./migrations/revert"))
+const fs = new FileSystem(join(__dirname, "./migrations-revert"))
 
 const migrationFileNameGenerator = (_: string, name?: string) => {
   return `Migration${new Date().getTime()}${name ? `_${name}` : ""}`
@@ -29,15 +29,20 @@ const pgGodCredentials = {
 
 describe("Revert migrations", () => {
   beforeEach(async () => {
-    await createDatabase({ databaseName: dbName }, pgGodCredentials)
-  })
-
-  afterEach(async () => {
-    await fs.cleanup()
     await dropDatabase(
       { databaseName: dbName, errorIfNonExist: false },
       pgGodCredentials
     )
+    await fs.cleanup()
+    await createDatabase({ databaseName: dbName }, pgGodCredentials)
+  })
+
+  afterEach(async () => {
+    await dropDatabase(
+      { databaseName: dbName, errorIfNonExist: false },
+      pgGodCredentials
+    )
+    await fs.cleanup()
     MetadataStorage.clear()
   }, 300 * 1000)
 

packages/core/utils/src/migrations/integration-tests/__tests__/migrations-run.spec.ts

@@ -20,7 +20,7 @@ process.env.DB_PASSWORD = DB_PASSWORD
 
 const dbName = "my-test-service-run"
 const moduleName = "myTestServiceRun"
-const fs = new FileSystem(join(__dirname, "./migrations/run"))
+const fs = new FileSystem(join(__dirname, "./migrations-run"))
 
 const pgGodCredentials = {
   user: DB_USERNAME,
@@ -30,6 +30,11 @@ const pgGodCredentials = {
 
 describe("Run migrations", () => {
   beforeEach(async () => {
+    await dropDatabase(
+      { databaseName: dbName, errorIfNonExist: false },
+      pgGodCredentials
+    )
+    await fs.cleanup()
     await createDatabase({ databaseName: dbName }, pgGodCredentials)
   })