From 6ee2ee845c7044240c521345eb0e296843a67291 Mon Sep 17 00:00:00 2001
From: Adrien de Peretti <adrien.deperetti@gmail.com>
Date: Thu, 28 Mar 2024 10:33:40 +0100
Subject: [PATCH] fix(): medusa test runner (#6857)

---
 .changeset/shy-squids-walk.md                 |  5 +++
 .../src/medusa-test-runner-utils/use-db.js    | 15 ++++++--
 .../src/medusa-test-runner.ts                 | 34 ++++---------------
 3 files changed, 24 insertions(+), 30 deletions(-)
 create mode 100644 .changeset/shy-squids-walk.md

diff --git a/.changeset/shy-squids-walk.md b/.changeset/shy-squids-walk.md
new file mode 100644
index 0000000000..23dfcd678b
--- /dev/null
+++ b/.changeset/shy-squids-walk.md
@@ -0,0 +1,5 @@
+---
+"medusa-test-utils": patch
+---
+
+fix(): medusa test runner
diff --git a/packages/medusa-test-utils/src/medusa-test-runner-utils/use-db.js b/packages/medusa-test-utils/src/medusa-test-runner-utils/use-db.js
index 0bf4a6bc3c..622f6ea729 100644
--- a/packages/medusa-test-utils/src/medusa-test-runner-utils/use-db.js
+++ b/packages/medusa-test-utils/src/medusa-test-runner-utils/use-db.js
@@ -19,7 +19,7 @@ module.exports = {
     database_extra,
     env,
     force_modules_migration,
-    dbUrl = DB_URL,
+    dbUrl = "",
     dbSchema = "public",
   }) {
     if (isObject(env)) {
@@ -67,7 +67,7 @@ module.exports = {
 
     const dbDataSource = new DataSource({
       type: "postgres",
-      url: dbUrl,
+      url: dbUrl || configModule.projectConfig.database_url,
       entities: enabledEntities.concat(moduleModels),
       migrations: enabledMigrations.concat(moduleMigrations),
       extra: database_extra ?? {},
@@ -93,7 +93,16 @@ module.exports = {
 
       const featureFlagRouter = await featureFlagLoader(configModule)
 
-      const pgConnection = await pgConnectionLoader({ configModule, container })
+      const pgConnection = await pgConnectionLoader({
+        configModule: {
+          ...configModule,
+          projectConfig: {
+            ...configModule.projectConfig,
+            database_url: dbUrl || configModule.projectConfig.database_url,
+          },
+        },
+        container,
+      })
 
       container.register({
         [ContainerRegistrationKeys.CONFIG_MODULE]: asValue(configModule),
diff --git a/packages/medusa-test-utils/src/medusa-test-runner.ts b/packages/medusa-test-utils/src/medusa-test-runner.ts
index e038e7affc..bdb4a6462a 100644
--- a/packages/medusa-test-utils/src/medusa-test-runner.ts
+++ b/packages/medusa-test-utils/src/medusa-test-runner.ts
@@ -104,34 +104,14 @@ export function medusaIntegrationTestRunner({
     debug,
   }
 
-  // Intercept call to this utils to apply the unique client url for the current suite
-  const originalCreatePgConnection =
-    require("@medusajs/utils/dist/modules-sdk/create-pg-connection").createPgConnection
-  require("@medusajs/utils/dist/modules-sdk/create-pg-connection").createPgConnection =
-    (options: any) => {
-      return originalCreatePgConnection({
-        ...options,
-        clientUrl: dbConfig.clientUrl,
-      })
-    }
-
-  const originalDatabaseLoader =
-    require("@medusajs/medusa/dist/loaders/database").default
-  require("@medusajs/medusa/dist/loaders/database").default = (
-    options: any
+  const originalConfigLoader =
+    require("@medusajs/medusa/dist/loaders/config").default
+  require("@medusajs/medusa/dist/loaders/config").default = (
+    rootDirectory: string
   ) => {
-    options.configModule.projectConfig.database_url
-    return originalDatabaseLoader({
-      ...options,
-      configModule: {
-        ...options.configModule,
-        projectConfig: {
-          database_logging: debug, // Will be used for the debug flag of the database options
-          ...options.configModule.projectConfig,
-          database_url: dbConfig.clientUrl,
-        },
-      },
-    })
+    const config = originalConfigLoader(rootDirectory)
+    config.projectConfig.database_url = dbConfig.clientUrl
+    return config
   }
 
   const cwd = process.cwd()