chore: remove container registration name (#9137)
This commit is contained in:
@@ -2,7 +2,6 @@ import {
|
||||
ClaimReason,
|
||||
ClaimType,
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
RuleOperator,
|
||||
} from "@medusajs/utils"
|
||||
@@ -122,7 +121,7 @@ medusaIntegrationTestRunner({
|
||||
)
|
||||
).data.return_reason
|
||||
|
||||
const orderModule = container.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModule = container.resolve(Modules.ORDER)
|
||||
|
||||
order = await orderModule.createOrders({
|
||||
region_id: region.id,
|
||||
@@ -401,7 +400,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
item = order.items[0]
|
||||
|
||||
await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX))
|
||||
await setupTaxStructure(container.resolve(Modules.TAX))
|
||||
})
|
||||
|
||||
describe("Claims lifecycle", () => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { IAuthModuleService } from "@medusajs/types"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import jwt from "jsonwebtoken"
|
||||
import { medusaIntegrationTestRunner } from "medusa-test-utils"
|
||||
import {
|
||||
@@ -443,9 +443,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
const { auth_identity_id } = jwt.decode(registeredCustomerToken)
|
||||
|
||||
const authModule: IAuthModuleService = container.resolve(
|
||||
ModuleRegistrationName.AUTH
|
||||
)
|
||||
const authModule: IAuthModuleService = container.resolve(Modules.AUTH)
|
||||
|
||||
const authIdentity = await authModule.retrieveAuthIdentity(
|
||||
auth_identity_id
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
RuleOperator,
|
||||
} from "@medusajs/utils"
|
||||
@@ -118,7 +117,7 @@ medusaIntegrationTestRunner({
|
||||
)
|
||||
).data.return_reason
|
||||
|
||||
const orderModule = container.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModule = container.resolve(Modules.ORDER)
|
||||
|
||||
order = await orderModule.createOrders({
|
||||
region_id: region.id,
|
||||
@@ -420,7 +419,7 @@ medusaIntegrationTestRunner({
|
||||
adminHeaders
|
||||
)
|
||||
|
||||
await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX))
|
||||
await setupTaxStructure(container.resolve(Modules.TAX))
|
||||
})
|
||||
|
||||
describe("Exchanges lifecycle", () => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { IFulfillmentModuleService } from "@medusajs/types"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import {
|
||||
adminHeaders,
|
||||
createAdminUser,
|
||||
@@ -29,7 +29,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
// TODO: Add support for creating fulfillment sets through HTTP
|
||||
const fulfillmentModule: IFulfillmentModuleService =
|
||||
getContainer().resolve(ModuleRegistrationName.FULFILLMENT)
|
||||
getContainer().resolve(Modules.FULFILLMENT)
|
||||
|
||||
fulfillmentSet1 = await fulfillmentModule.createFulfillmentSets({
|
||||
name: "Test fulfillment set",
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
OrderChangeStatus,
|
||||
RuleOperator,
|
||||
@@ -130,7 +129,7 @@ medusaIntegrationTestRunner({
|
||||
)
|
||||
).data.product
|
||||
|
||||
const orderModule = container.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModule = container.resolve(Modules.ORDER)
|
||||
|
||||
order = await orderModule.createOrders({
|
||||
region_id: region.id,
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
import {
|
||||
ClaimType,
|
||||
ModuleRegistrationName,
|
||||
RuleOperator,
|
||||
} from "@medusajs/utils"
|
||||
import { ClaimType, Modules, RuleOperator } from "@medusajs/utils"
|
||||
import { medusaIntegrationTestRunner } from "medusa-test-utils"
|
||||
import {
|
||||
adminHeaders,
|
||||
@@ -26,7 +22,7 @@ medusaIntegrationTestRunner({
|
||||
beforeEach(async () => {
|
||||
const container = getContainer()
|
||||
|
||||
await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX))
|
||||
await setupTaxStructure(container.resolve(Modules.TAX))
|
||||
await createAdminUser(dbConnection, adminHeaders, container)
|
||||
order = await createOrderSeeder({ api, container })
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import { IEventBusModuleService } from "@medusajs/types"
|
||||
import { CommonEvents, Modules } from "@medusajs/utils"
|
||||
import fs from "fs/promises"
|
||||
import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils"
|
||||
import path from "path"
|
||||
import {
|
||||
adminHeaders,
|
||||
createAdminUser,
|
||||
} from "../../../../helpers/create-admin-user"
|
||||
import { getProductFixture } from "../../../../helpers/fixtures"
|
||||
import fs from "fs/promises"
|
||||
import path from "path"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
|
||||
jest.setTimeout(50000)
|
||||
|
||||
@@ -56,7 +56,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
let eventBus: IEventBusModuleService
|
||||
beforeAll(async () => {
|
||||
eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS)
|
||||
eventBus = getContainer().resolve(Modules.EVENT_BUS)
|
||||
})
|
||||
|
||||
beforeEach(async () => {
|
||||
@@ -201,7 +201,7 @@ medusaIntegrationTestRunner({
|
||||
describe("POST /admin/products/export", () => {
|
||||
it("should export a csv file containing the expected products", async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
@@ -243,7 +243,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
it("should export a csv file with categories", async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
@@ -269,7 +269,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
it("should export a csv file with region prices", async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
@@ -328,7 +328,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
it("should export a csv file filtered by specific products", async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import { IEventBusModuleService } from "@medusajs/types"
|
||||
import { CommonEvents, Modules } from "@medusajs/utils"
|
||||
import FormData from "form-data"
|
||||
import fs from "fs/promises"
|
||||
import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils"
|
||||
import path from "path"
|
||||
import {
|
||||
adminHeaders,
|
||||
createAdminUser,
|
||||
} from "../../../../helpers/create-admin-user"
|
||||
import FormData from "form-data"
|
||||
import fs from "fs/promises"
|
||||
import path from "path"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { getProductFixture } from "../../../../helpers/fixtures"
|
||||
|
||||
jest.setTimeout(50000)
|
||||
@@ -40,7 +40,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
let eventBus: IEventBusModuleService
|
||||
beforeAll(async () => {
|
||||
eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS)
|
||||
eventBus = getContainer().resolve(Modules.EVENT_BUS)
|
||||
})
|
||||
|
||||
beforeEach(async () => {
|
||||
@@ -127,7 +127,7 @@ medusaIntegrationTestRunner({
|
||||
].forEach((testcase) => {
|
||||
it(`should import a previously exported products CSV file ${testcase.name}`, async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
@@ -383,7 +383,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
it("should import product with categories", async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
@@ -452,7 +452,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
it("should ignore non-existent fields being present in the CSV that don't start with Product or Variant", async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
@@ -502,7 +502,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
it("should fail on non-existent product fields being present in the CSV", async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
@@ -552,7 +552,7 @@ medusaIntegrationTestRunner({
|
||||
|
||||
it("supports importing the v1 template", async () => {
|
||||
const subscriberExecution = TestEventUtils.waitSubscribersExecution(
|
||||
"notification.notification.created",
|
||||
`${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`,
|
||||
eventBus
|
||||
)
|
||||
|
||||
@@ -781,6 +781,7 @@ medusaIntegrationTestRunner({
|
||||
created_at: expect.any(String),
|
||||
updated_at: expect.any(String),
|
||||
}),
|
||||
|
||||
expect.objectContaining({
|
||||
id: expect.any(String),
|
||||
title: "Test product",
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
import { IStoreModuleService } from "@medusajs/types"
|
||||
import {
|
||||
ApiKeyType,
|
||||
ModuleRegistrationName,
|
||||
ProductStatus,
|
||||
} from "@medusajs/utils"
|
||||
import { ApiKeyType, Modules, ProductStatus } from "@medusajs/utils"
|
||||
import { medusaIntegrationTestRunner } from "medusa-test-utils"
|
||||
import {
|
||||
adminHeaders,
|
||||
@@ -91,7 +87,7 @@ medusaIntegrationTestRunner({
|
||||
await createAdminUser(dbConnection, adminHeaders, appContainer)
|
||||
|
||||
const storeModule: IStoreModuleService = appContainer.resolve(
|
||||
ModuleRegistrationName.STORE
|
||||
Modules.STORE
|
||||
)
|
||||
// A default store is created when the app is started, so we want to delete that one and create one specifically for our tests.
|
||||
const defaultId = (await api.get("/admin/stores", adminHeaders)).data
|
||||
@@ -540,7 +536,7 @@ medusaIntegrationTestRunner({
|
||||
adminHeaders
|
||||
)
|
||||
|
||||
const service = appContainer.resolve(ModuleRegistrationName.STORE)
|
||||
const service = appContainer.resolve(Modules.STORE)
|
||||
const [store] = await service.listStores()
|
||||
|
||||
if (store) {
|
||||
@@ -1158,7 +1154,7 @@ medusaIntegrationTestRunner({
|
||||
adminHeaders
|
||||
)
|
||||
|
||||
const service = appContainer.resolve(ModuleRegistrationName.STORE)
|
||||
const service = appContainer.resolve(Modules.STORE)
|
||||
const [store] = await service.listStores()
|
||||
|
||||
if (store) {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import {
|
||||
ContainerRegistrationKeys,
|
||||
ModuleRegistrationName,
|
||||
Modules,
|
||||
RuleOperator,
|
||||
} from "@medusajs/utils"
|
||||
@@ -60,7 +59,7 @@ medusaIntegrationTestRunner({
|
||||
)
|
||||
).data.return_reason
|
||||
|
||||
const orderModule = container.resolve(ModuleRegistrationName.ORDER)
|
||||
const orderModule = container.resolve(Modules.ORDER)
|
||||
|
||||
order = await orderModule.createOrders({
|
||||
region_id: "test_region_id",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import {
|
||||
adminHeaders,
|
||||
createAdminUser,
|
||||
@@ -298,9 +298,7 @@ medusaIntegrationTestRunner({
|
||||
await api.delete(`/admin/stock-locations/${location1.id}`, adminHeaders)
|
||||
|
||||
// TODO: Ideally we use HTTP here, maybe we should have a get endpoint for fulfillment sets?
|
||||
const fulfillmentModule = getContainer().resolve(
|
||||
ModuleRegistrationName.FULFILLMENT
|
||||
)
|
||||
const fulfillmentModule = getContainer().resolve(Modules.FULFILLMENT)
|
||||
const sets = await fulfillmentModule.listFulfillmentSets()
|
||||
expect(sets).toHaveLength(0)
|
||||
})
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import { IStoreModuleService } from "@medusajs/types"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import { medusaIntegrationTestRunner } from "medusa-test-utils"
|
||||
import {
|
||||
adminHeaders,
|
||||
createAdminUser,
|
||||
} from "../../../../helpers/create-admin-user"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { IStoreModuleService } from "@medusajs/types"
|
||||
|
||||
jest.setTimeout(90000)
|
||||
|
||||
@@ -17,7 +17,7 @@ medusaIntegrationTestRunner({
|
||||
beforeEach(async () => {
|
||||
container = getContainer()
|
||||
const storeModule: IStoreModuleService = container.resolve(
|
||||
ModuleRegistrationName.STORE
|
||||
Modules.STORE
|
||||
)
|
||||
await createAdminUser(dbConnection, adminHeaders, container)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { IAuthModuleService } from "@medusajs/types"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { Modules } from "@medusajs/utils"
|
||||
import { medusaIntegrationTestRunner } from "medusa-test-utils"
|
||||
import {
|
||||
adminHeaders,
|
||||
@@ -118,9 +118,7 @@ medusaIntegrationTestRunner({
|
||||
deleted: true,
|
||||
})
|
||||
|
||||
const authModule: IAuthModuleService = container.resolve(
|
||||
ModuleRegistrationName.AUTH
|
||||
)
|
||||
const authModule: IAuthModuleService = container.resolve(Modules.AUTH)
|
||||
|
||||
const updatedAuthIdentity = await authModule.retrieveAuthIdentity(
|
||||
authIdentity.id
|
||||
@@ -159,7 +157,7 @@ medusaIntegrationTestRunner({
|
||||
})
|
||||
|
||||
it("throws if you attempt to delete another user", async () => {
|
||||
const userModule = container.resolve(ModuleRegistrationName.USER)
|
||||
const userModule = container.resolve(Modules.USER)
|
||||
|
||||
const userTwo = await userModule.createUsers({
|
||||
email: "test@test.com",
|
||||
|
||||
Reference in New Issue
Block a user