fix: integration-tests/modules (#6595)

This commit is contained in:
Adrien de Peretti
2024-03-06 11:45:34 +00:00
committed by GitHub
parent 51bb6f1e89
commit f0ef0a8784
9 changed files with 50 additions and 55 deletions
@@ -182,35 +182,31 @@ export function medusaIntegrationTestRunner({
} as MedusaSuiteOptions
const beforeAll_ = async () => {
try {
await dbUtils.create(dbName)
const { dbDataSource, pgConnection } = await initDb({
cwd,
env,
force_modules_migration,
database_extra: {},
dbUrl: dbConfig.clientUrl,
dbSchema: dbConfig.schema,
})
dbUtils.db_ = dbDataSource
dbUtils.pgConnection_ = pgConnection
await dbUtils.create(dbName)
const { dbDataSource, pgConnection } = await initDb({
cwd,
env,
force_modules_migration,
database_extra: {},
dbUrl: dbConfig.clientUrl,
dbSchema: dbConfig.schema,
})
dbUtils.db_ = dbDataSource
dbUtils.pgConnection_ = pgConnection
const {
shutdown: shutdown_,
container: container_,
port,
} = await startBootstrapApp({
cwd,
env,
})
const {
shutdown: shutdown_,
container: container_,
port,
} = await startBootstrapApp({
cwd,
env,
})
apiUtils = axios.create({ baseURL: `http://localhost:${port}` })
apiUtils = axios.create({ baseURL: `http://localhost:${port}` })
container = container_
shutdown = shutdown_
} catch (error) {
console.error("Error setting up integration environment:", error)
}
container = container_
shutdown = shutdown_
}
const afterEach_ = async () => {
@@ -225,12 +221,8 @@ export function medusaIntegrationTestRunner({
beforeAll(beforeAll_)
afterEach(afterEach_)
afterAll(async () => {
try {
await dbUtils.shutdown(dbName)
await shutdown()
} catch (error) {
console.error("Error shutting down integration environment:", error)
}
await dbUtils.shutdown(dbName)
await shutdown()
})
testSuite(options!)
@@ -113,26 +113,18 @@ export function moduleIntegrationTestRunner({
} as SuiteOptions
const beforeEach_ = async () => {
try {
await MikroOrmWrapper.setupDatabase()
const output = await initModules(moduleOptions_)
shutdown = output.shutdown
medusaApp = output.medusaApp
moduleService = output.medusaApp.modules[moduleName]
} catch (error) {
console.error("Error setting up database:", error)
}
await MikroOrmWrapper.setupDatabase()
const output = await initModules(moduleOptions_)
shutdown = output.shutdown
medusaApp = output.medusaApp
moduleService = output.medusaApp.modules[moduleName]
}
const afterEach_ = async () => {
try {
await MikroOrmWrapper.clearDatabase()
await shutdown()
moduleService = {}
medusaApp = {} as MedusaAppOutput
} catch (error) {
console.error("Error tearing down database:", error)
}
await MikroOrmWrapper.clearDatabase()
await shutdown()
moduleService = {}
medusaApp = {} as MedusaAppOutput
}
return describe("", () => {
+1 -1
View File
@@ -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(