fix: integration-tests/modules (#6595)

.changeset/fluffy-dancers-rest.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/medusa": patch
+"medusa-test-utils": patch
+---
+
+fix: integration-tests/modules

integration-tests/helpers/admin-seeder.js

@@ -1,5 +1,5 @@
 const Scrypt = require("scrypt-kdf")
-const { User } = require("@medusajs/medusa")
+const { User } = require("@medusajs/medusa/dist/models/user")
 
 module.exports = async (dataSource, data = {}) => {
   const manager = dataSource.manager

integration-tests/modules/__tests__/tax/workflow/tax.spec.ts

@@ -28,7 +28,7 @@ medusaIntegrationTestRunner({
       })
 
       beforeEach(async () => {
-        await createAdminUser(dbConnection, adminHeaders)
+        await createAdminUser(dbConnection, adminHeaders, appContainer)
       })
 
       it("compensates rules correctly", async () => {

integration-tests/modules/__tests__/users/get-me.spec.ts

@@ -12,8 +12,14 @@ medusaIntegrationTestRunner({
   env,
   testSuite: ({ dbConnection, getContainer, api }) => {
     describe("POST /admin/users/me", () => {
+      let container
+
+      beforeAll(() => {
+        container = getContainer()
+      })
+
       beforeEach(async () => {
-        await createAdminUser(dbConnection, adminHeaders)
+        await createAdminUser(dbConnection, adminHeaders, container)
       })
 
       it("gets the current user", async () => {

integration-tests/modules/__tests__/workflow-engine/api.ts

@@ -4,7 +4,6 @@ jest.setTimeout(5000000)
 
 const env = {
   MEDUSA_FF_MEDUSA_V2: false,
-  MEDUSA_FF_SALES_CHANNELS: true,
 }
 
 workflowEngineTestSuite(env, { force_modules_migration: true })

integration-tests/modules/package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "test:integration": "node --expose-gc ./../../node_modules/.bin/jest --ci --silent=false -i --detectOpenHandles --logHeapUsage --forceExit",
+    "test:integration": "node --expose-gc ./../../node_modules/.bin/jest --ci --silent=true --concurrency=50% --detectOpenHandles --logHeapUsage --forceExit",
     "build": "babel src -d dist --extensions \".ts,.js\""
   },
   "dependencies": {

packages/medusa-test-utils/src/medusa-test-runner.ts

@@ -182,35 +182,31 @@ export function medusaIntegrationTestRunner({
   } as MedusaSuiteOptions
 
   const beforeAll_ = async () => {
-    try {
+    await dbUtils.create(dbName)
-      await dbUtils.create(dbName)
+    const { dbDataSource, pgConnection } = await initDb({
-      const { dbDataSource, pgConnection } = await initDb({
+      cwd,
-        cwd,
+      env,
-        env,
+      force_modules_migration,
-        force_modules_migration,
+      database_extra: {},
-        database_extra: {},
+      dbUrl: dbConfig.clientUrl,
-        dbUrl: dbConfig.clientUrl,
+      dbSchema: dbConfig.schema,
-        dbSchema: dbConfig.schema,
+    })
-      })
+    dbUtils.db_ = dbDataSource
-      dbUtils.db_ = dbDataSource
+    dbUtils.pgConnection_ = pgConnection
-      dbUtils.pgConnection_ = pgConnection
 
-      const {
+    const {
-        shutdown: shutdown_,
+      shutdown: shutdown_,
-        container: container_,
+      container: container_,
-        port,
+      port,
-      } = await startBootstrapApp({
+    } = await startBootstrapApp({
-        cwd,
+      cwd,
-        env,
+      env,
-      })
+    })
 
-      apiUtils = axios.create({ baseURL: `http://localhost:${port}` })
+    apiUtils = axios.create({ baseURL: `http://localhost:${port}` })
 
-      container = container_
+    container = container_
-      shutdown = shutdown_
+    shutdown = shutdown_
-    } catch (error) {
-      console.error("Error setting up integration environment:", error)
-    }
   }
 
   const afterEach_ = async () => {
@@ -225,12 +221,8 @@ export function medusaIntegrationTestRunner({
     beforeAll(beforeAll_)
     afterEach(afterEach_)
     afterAll(async () => {
-      try {
+      await dbUtils.shutdown(dbName)
-        await dbUtils.shutdown(dbName)
+      await shutdown()
-        await shutdown()
-      } catch (error) {
-        console.error("Error shutting down integration environment:", error)
-      }
     })
 
     testSuite(options!)

packages/medusa-test-utils/src/module-test-runner.ts

@@ -113,26 +113,18 @@ export function moduleIntegrationTestRunner({
   } as SuiteOptions
 
   const beforeEach_ = async () => {
-    try {
+    await MikroOrmWrapper.setupDatabase()
-      await MikroOrmWrapper.setupDatabase()
+    const output = await initModules(moduleOptions_)
-      const output = await initModules(moduleOptions_)
+    shutdown = output.shutdown
-      shutdown = output.shutdown
+    medusaApp = output.medusaApp
-      medusaApp = output.medusaApp
+    moduleService = output.medusaApp.modules[moduleName]
-      moduleService = output.medusaApp.modules[moduleName]
-    } catch (error) {
-      console.error("Error setting up database:", error)
-    }
   }
 
   const afterEach_ = async () => {
-    try {
+    await MikroOrmWrapper.clearDatabase()
-      await MikroOrmWrapper.clearDatabase()
+    await shutdown()
-      await shutdown()
+    moduleService = {}
-      moduleService = {}
+    medusaApp = {} as MedusaAppOutput
-      medusaApp = {} as MedusaAppOutput
-    } catch (error) {
-      console.error("Error tearing down database:", error)
-    }
   }
 
   return describe("", () => {

packages/medusa/src/loaders/medusa-app.ts

@@ -21,7 +21,7 @@ import {
   MedusaV2Flag,
 } from "@medusajs/utils"
 import { asValue } from "awilix"
-import { remoteQueryFetchData } from ".."
+import { remoteQueryFetchData } from "../utils/remote-query-fetch-data"
 import { joinerConfig } from "../joiner-config"
 
 export function mergeDefaultModules(