asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: remove container registration name (#9137)

Browse Source
This commit is contained in:
Carlos R. L. Rodrigues
2024-09-16 06:22:24 -03:00
committed by GitHub
parent ab4a422fc8
commit 950cf9af79
421 changed files with 1528 additions and 2496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/modules/__tests__/auth/admin/email-password-provider.spec.ts
+3 -3
View File
@@ -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 Scrypt from "scrypt-kdf"
import {
@@ -32,7 +32,7 @@ medusaIntegrationTestRunner({
await Scrypt.kdf(password, { logN: 15, r: 8, p: 1 })
).toString("base64")
const authService: IAuthModuleService = appContainer.resolve(
ModuleRegistrationName.AUTH
Modules.AUTH
)
await authService.createAuthIdentities({
@@ -67,7 +67,7 @@ medusaIntegrationTestRunner({
await Scrypt.kdf(password, { logN: 15, r: 8, p: 1 })
).toString("base64")
const authService: IAuthModuleService = appContainer.resolve(
ModuleRegistrationName.AUTH
Modules.AUTH
)
await authService.createAuthIdentities({
integration-tests/modules/__tests__/cart/store/add-promotions-to-cart.spec.ts
+2 -5
View File
@@ -2,7 +2,6 @@ import { RemoteLink } from "@medusajs/modules-sdk"
import { ICartModuleService, IPromotionModuleService } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
PromotionType,
} from "@medusajs/utils"
@@ -30,10 +29,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART)
promotionModuleService = appContainer.resolve(
ModuleRegistrationName.PROMOTION
)
cartModuleService = appContainer.resolve(Modules.CART)
promotionModuleService = appContainer.resolve(Modules.PROMOTION)
remoteLinkService = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_LINK
)
integration-tests/modules/__tests__/cart/store/cart.workflows.spec.ts
+10 -19
View File
@@ -26,7 +26,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
} from "@medusajs/utils"
@@ -62,24 +61,16 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART)
regionModuleService = appContainer.resolve(
ModuleRegistrationName.REGION
)
scModuleService = appContainer.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
paymentModule = appContainer.resolve(ModuleRegistrationName.PAYMENT)
inventoryModule = appContainer.resolve(ModuleRegistrationName.INVENTORY)
stockLocationModule = appContainer.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
cartModuleService = appContainer.resolve(Modules.CART)
regionModuleService = appContainer.resolve(Modules.REGION)
scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
customerModule = appContainer.resolve(Modules.CUSTOMER)
productModule = appContainer.resolve(Modules.PRODUCT)
pricingModule = appContainer.resolve(Modules.PRICING)
paymentModule = appContainer.resolve(Modules.PAYMENT)
inventoryModule = appContainer.resolve(Modules.INVENTORY)
stockLocationModule = appContainer.resolve(Modules.STOCK_LOCATION)
fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK)
remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY
integration-tests/modules/__tests__/cart/store/carts.spec.ts
+23 -26
View File
@@ -17,7 +17,6 @@ import {
import {
ContainerRegistrationKeys,
MedusaError,
ModuleRegistrationName,
Modules,
ProductStatus,
PromotionRuleOperator,
@@ -66,22 +65,20 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
cartModule = appContainer.resolve(ModuleRegistrationName.CART)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
scModule = appContainer.resolve(ModuleRegistrationName.SALES_CHANNEL)
customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
apiKeyModule = appContainer.resolve(ModuleRegistrationName.API_KEY)
cartModule = appContainer.resolve(Modules.CART)
regionModule = appContainer.resolve(Modules.REGION)
scModule = appContainer.resolve(Modules.SALES_CHANNEL)
customerModule = appContainer.resolve(Modules.CUSTOMER)
productModule = appContainer.resolve(Modules.PRODUCT)
pricingModule = appContainer.resolve(Modules.PRICING)
apiKeyModule = appContainer.resolve(Modules.API_KEY)
remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK)
promotionModule = appContainer.resolve(ModuleRegistrationName.PROMOTION)
taxModule = appContainer.resolve(ModuleRegistrationName.TAX)
regionService = appContainer.resolve(ModuleRegistrationName.REGION)
paymentService = appContainer.resolve(ModuleRegistrationName.PAYMENT)
storeService = appContainer.resolve(ModuleRegistrationName.STORE)
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
promotionModule = appContainer.resolve(Modules.PROMOTION)
taxModule = appContainer.resolve(Modules.TAX)
regionService = appContainer.resolve(Modules.REGION)
paymentService = appContainer.resolve(Modules.PAYMENT)
storeService = appContainer.resolve(Modules.STORE)
fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
remoteLinkService = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_LINK
)
@@ -148,18 +145,18 @@ medusaIntegrationTestRunner({
await remoteLink.create([
{
productService: {
Product: {
variant_id: product.variants[0].id,
},
pricingService: {
Pricing: {
price_set_id: priceSet.id,
},
},
{
productService: {
Product: {
variant_id: product.variants[1].id,
},
pricingService: {
Pricing: {
price_set_id: priceSetTwo.id,
},
},
@@ -236,8 +233,8 @@ medusaIntegrationTestRunner({
await remoteLink.create([
{
productService: { variant_id: product.variants[0].id },
pricingService: { price_set_id: priceSet.id },
Product: { variant_id: product.variants[0].id },
Pricing: { price_set_id: priceSet.id },
},
])
@@ -1414,16 +1411,16 @@ medusaIntegrationTestRunner({
await remoteLink.create([
{
productService: {
Product: {
variant_id: productWithSpecialTax.variants[0].id,
},
pricingService: { price_set_id: priceSet.id },
Pricing: { price_set_id: priceSet.id },
},
{
productService: {
Product: {
variant_id: productWithDefaultTax.variants[0].id,
},
pricingService: { price_set_id: priceSetDefaultTax.id },
Pricing: { price_set_id: priceSetDefaultTax.id },
},
{
[Modules.CART]: { cart_id: cart.id },
integration-tests/modules/__tests__/cart/store/remove-promotions-from-cart.spec.ts
+2 -5
View File
@@ -2,7 +2,6 @@ import { RemoteLink } from "@medusajs/modules-sdk"
import { ICartModuleService, IPromotionModuleService } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
PromotionType,
} from "@medusajs/utils"
@@ -30,13 +29,11 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART)
cartModuleService = appContainer.resolve(Modules.CART)
remoteLinkService = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_LINK
)
promotionModuleService = appContainer.resolve(
ModuleRegistrationName.PROMOTION
)
promotionModuleService = appContainer.resolve(Modules.PROMOTION)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer-group/admin/batch-add-customers.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer-group/admin/batch-remove-customers.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer-group/admin/delete-customer-group.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer-group/admin/list-customer-group-customers.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer-group/admin/list-customer-groups.spec.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer-group/admin/retrieve-customer-group.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer-group/admin/update-customer-group.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/admin/create-customer-addresses.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/admin/delete-customer-address.spec.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/admin/delete-customer.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/admin/list-customer-addresses.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/admin/list-customers.spec.ts
+2 -4
View File
@@ -1,10 +1,10 @@
import { Modules } from "@medusajs/utils"
import {
adminHeaders,
createAdminUser,
} from "../../../../helpers/create-admin-user"
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
const { medusaIntegrationTestRunner } = require("medusa-test-utils")
@@ -22,9 +22,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/admin/update-customer-address.spec.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/admin/update-customer.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,9 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/store/create-customer-addresses.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
generatePublishableKey,
@@ -21,9 +21,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/store/create-customer.spec.ts
+2 -5
View File
@@ -1,9 +1,6 @@
import { IAuthModuleService } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
} from "@medusajs/utils"
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
import jwt from "jsonwebtoken"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
@@ -37,7 +34,7 @@ medusaIntegrationTestRunner({
// TODO: Reenable once the customer authentication is fixed, and use the HTTP endpoints instead.
it.skip("should create a customer", async () => {
const authService: IAuthModuleService = appContainer.resolve(
ModuleRegistrationName.AUTH
Modules.AUTH
)
const { http } = appContainer.resolve(
ContainerRegistrationKeys.CONFIG_MODULE
integration-tests/modules/__tests__/customer/store/delete-customer-address.spec.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
generatePublishableKey,
@@ -21,9 +21,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/store/list-customer-addresses.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
generatePublishableKey,
@@ -21,9 +21,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/customer/store/update-customer-address.spec.ts
+2 -4
View File
@@ -1,5 +1,5 @@
import { ICustomerModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
generatePublishableKey,
@@ -21,9 +21,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
customerModuleService = appContainer.resolve(Modules.CUSTOMER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/event-bus/index.spec.ts
+3 -3
View File
@@ -1,6 +1,6 @@
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { MedusaContainer } from "@medusajs/types"
import { composeMessage, ModuleRegistrationName } from "@medusajs/utils"
import { Modules, composeMessage } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import testEventPayloadHandlerMock from "../../dist/subscribers/test-event-payload"
jest.setTimeout(30000)
@@ -15,7 +15,7 @@ medusaIntegrationTestRunner({
})
it(`should emit event with the expected shape to be received by the subscribers`, async () => {
const eventBus = container.resolve(ModuleRegistrationName.EVENT_BUS)
const eventBus = container.resolve(Modules.EVENT_BUS)
const eventName = "test-event-payload"
await eventBus.emit(
integration-tests/modules/__tests__/fulfillment-providers/index.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IFulfillmentModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -18,7 +18,7 @@ medusaIntegrationTestRunner({
beforeAll(() => {
container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT)
service = container.resolve(Modules.FULFILLMENT)
})
beforeEach(async () => {
integration-tests/modules/__tests__/fulfillment/fulfillment.workflows.spec.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import {
updateFulfillmentWorkflowId,
} from "@medusajs/core-flows"
import { IFulfillmentModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
generateCreateFulfillmentData,
@@ -27,7 +27,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.FULFILLMENT)
service = appContainer.resolve(Modules.FULFILLMENT)
})
describe("createFulfillmentWorkflow", () => {
integration-tests/modules/__tests__/fulfillment/index.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IFulfillmentModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user"
import {
@@ -24,7 +24,7 @@ medusaIntegrationTestRunner({
beforeAll(() => {
container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT)
service = container.resolve(Modules.FULFILLMENT)
})
beforeEach(async () => {
integration-tests/modules/__tests__/invites/accept-invite.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER)
userModuleService = appContainer.resolve(Modules.USER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/invites/delete-invite.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER)
userModuleService = appContainer.resolve(Modules.USER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/invites/list-invites.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER)
userModuleService = appContainer.resolve(Modules.USER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/invites/resend-invite.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER)
userModuleService = appContainer.resolve(Modules.USER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/invites/retrieve-invite.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER)
userModuleService = appContainer.resolve(Modules.USER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/link-modules/cart-links.spec.ts
+7 -11
View File
@@ -5,7 +5,7 @@ import {
IRegionModuleService,
ISalesChannelModuleService,
} from "@medusajs/types"
import { ModuleRegistrationName, Modules } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -26,16 +26,12 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER)
scModuleService = appContainer.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
paymentModuleService = appContainer.resolve(
ModuleRegistrationName.PAYMENT
)
cartModuleService = appContainer.resolve(Modules.CART)
regionModule = appContainer.resolve(Modules.REGION)
customerModule = appContainer.resolve(Modules.CUSTOMER)
scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
regionModule = appContainer.resolve(Modules.REGION)
paymentModuleService = appContainer.resolve(Modules.PAYMENT)
remoteQuery = appContainer.resolve("remoteQuery")
remoteLink = appContainer.resolve("remoteLink")
})
integration-tests/modules/__tests__/link-modules/cart-region.spec.ts
+3 -3
View File
@@ -1,5 +1,5 @@
import { ICartModuleService, IRegionModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -17,8 +17,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
cartModuleService = appContainer.resolve(Modules.CART)
regionModule = appContainer.resolve(Modules.REGION)
remoteQuery = appContainer.resolve("remoteQuery")
})
integration-tests/modules/__tests__/link-modules/define-link.spec.ts
+30 -30
View File
@@ -29,7 +29,7 @@ medusaIntegrationTestRunner({
expect(link.serviceName).toEqual(linkDefinition.serviceName)
expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0])
expect(linkDefinition).toEqual({
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
isLink: true,
alias: [
{
@@ -42,7 +42,7 @@ medusaIntegrationTestRunner({
primaryKeys: ["id", "currency_code", "region_id"],
relationships: [
{
serviceName: "currency",
serviceName: "Currency",
entity: "Currency",
primaryKey: "code",
foreignKey: "currency_code",
@@ -53,7 +53,7 @@ medusaIntegrationTestRunner({
deleteCascade: false,
},
{
serviceName: "region",
serviceName: "Region",
entity: "Region",
primaryKey: "id",
foreignKey: "region_id",
@@ -66,7 +66,7 @@ medusaIntegrationTestRunner({
],
extends: [
{
serviceName: "currency",
serviceName: "Currency",
fieldAlias: {
region: {
path: "region_link.region",
@@ -75,7 +75,7 @@ medusaIntegrationTestRunner({
},
},
relationship: {
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "currency_code",
foreignKey: "code",
alias: "region_link",
@@ -83,7 +83,7 @@ medusaIntegrationTestRunner({
},
},
{
serviceName: "region",
serviceName: "Region",
fieldAlias: {
currency: {
path: "currency_link.currency",
@@ -92,7 +92,7 @@ medusaIntegrationTestRunner({
},
},
relationship: {
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "region_id",
foreignKey: "id",
alias: "currency_link",
@@ -124,20 +124,20 @@ medusaIntegrationTestRunner({
expect(link.serviceName).toEqual(linkDefinition.serviceName)
expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0])
expect(linkDefinition).toEqual({
serviceName: "productProductVariantRegionRegionLink",
serviceName: "ProductProductVariantRegionRegionLink",
isLink: true,
alias: [
{
name: ["product_variant_region"],
args: {
entity: "LinkProductServiceProductVariantRegionRegion",
entity: "LinkProductProductVariantRegionRegion",
},
},
],
primaryKeys: ["id", "product_variant_id", "region_id"],
relationships: [
{
serviceName: "productService",
serviceName: "Product",
entity: "ProductVariant",
primaryKey: "id",
foreignKey: "product_variant_id",
@@ -148,7 +148,7 @@ medusaIntegrationTestRunner({
deleteCascade: false,
},
{
serviceName: "region",
serviceName: "Region",
entity: "Region",
primaryKey: "id",
foreignKey: "region_id",
@@ -161,7 +161,7 @@ medusaIntegrationTestRunner({
],
extends: [
{
serviceName: "productService",
serviceName: "Product",
fieldAlias: {
region: {
path: "region_link.region",
@@ -170,7 +170,7 @@ medusaIntegrationTestRunner({
},
},
relationship: {
serviceName: "productProductVariantRegionRegionLink",
serviceName: "ProductProductVariantRegionRegionLink",
primaryKey: "product_variant_id",
foreignKey: "id",
alias: "region_link",
@@ -178,7 +178,7 @@ medusaIntegrationTestRunner({
},
},
{
serviceName: "region",
serviceName: "Region",
fieldAlias: {
product_variant: {
path: "product_variant_link.product_variant",
@@ -189,7 +189,7 @@ medusaIntegrationTestRunner({
},
},
relationship: {
serviceName: "productProductVariantRegionRegionLink",
serviceName: "ProductProductVariantRegionRegionLink",
primaryKey: "region_id",
foreignKey: "id",
alias: "product_variant_link",
@@ -224,7 +224,7 @@ medusaIntegrationTestRunner({
expect(link.serviceName).toEqual(linkDefinition.serviceName)
expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0])
expect(linkDefinition).toEqual({
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
isLink: true,
alias: [
{
@@ -237,7 +237,7 @@ medusaIntegrationTestRunner({
primaryKeys: ["id", "currency_code", "region_id"],
relationships: [
{
serviceName: "currency",
serviceName: "Currency",
entity: "Currency",
primaryKey: "code",
foreignKey: "currency_code",
@@ -248,7 +248,7 @@ medusaIntegrationTestRunner({
deleteCascade: true,
},
{
serviceName: "region",
serviceName: "Region",
entity: "Region",
primaryKey: "id",
foreignKey: "region_id",
@@ -261,7 +261,7 @@ medusaIntegrationTestRunner({
],
extends: [
{
serviceName: "currency",
serviceName: "Currency",
fieldAlias: {
region: {
path: "region_link.region",
@@ -270,7 +270,7 @@ medusaIntegrationTestRunner({
},
},
relationship: {
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "currency_code",
foreignKey: "code",
alias: "region_link",
@@ -278,7 +278,7 @@ medusaIntegrationTestRunner({
},
},
{
serviceName: "region",
serviceName: "Region",
fieldAlias: {
currency: {
path: "currency_link.currency",
@@ -287,7 +287,7 @@ medusaIntegrationTestRunner({
},
},
relationship: {
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "region_id",
foreignKey: "id",
alias: "currency_link",
@@ -316,9 +316,9 @@ medusaIntegrationTestRunner({
})
.filter(Boolean)[0]
expect(link.serviceName).toEqual("currencyCurrencyRegionRegionLink")
expect(link.serviceName).toEqual("CurrencyCurrencyRegionRegionLink")
expect(linkDefinition).toEqual({
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
isLink: true,
alias: [
{
@@ -331,7 +331,7 @@ medusaIntegrationTestRunner({
primaryKeys: ["id", "currency_code", "region_id"],
relationships: [
{
serviceName: "currency",
serviceName: "Currency",
entity: "Currency",
primaryKey: "code",
foreignKey: "currency_code",
@@ -342,7 +342,7 @@ medusaIntegrationTestRunner({
deleteCascade: false,
},
{
serviceName: "region",
serviceName: "Region",
entity: "Region",
primaryKey: "id",
foreignKey: "region_id",
@@ -355,7 +355,7 @@ medusaIntegrationTestRunner({
],
extends: [
{
serviceName: "currency",
serviceName: "Currency",
fieldAlias: {
regions: {
path: "region_link.region",
@@ -364,7 +364,7 @@ medusaIntegrationTestRunner({
},
},
relationship: {
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "currency_code",
foreignKey: "code",
alias: "region_link",
@@ -372,7 +372,7 @@ medusaIntegrationTestRunner({
},
},
{
serviceName: "region",
serviceName: "Region",
fieldAlias: {
currency: {
path: "currency_link.currency",
@@ -381,7 +381,7 @@ medusaIntegrationTestRunner({
},
},
relationship: {
serviceName: "currencyCurrencyRegionRegionLink",
serviceName: "CurrencyCurrencyRegionRegionLink",
primaryKey: "region_id",
foreignKey: "id",
alias: "currency_link",
integration-tests/modules/__tests__/link-modules/fulfillment-set-location.spec.ts
+2 -7
View File
@@ -4,7 +4,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
@@ -26,12 +25,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
locationModule = appContainer.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
locationModule = appContainer.resolve(Modules.STOCK_LOCATION)
remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY
)
integration-tests/modules/__tests__/link-modules/product-variant-price-set.spec.ts
+2 -3
View File
@@ -1,7 +1,6 @@
import { IPricingModuleService, IProductModuleService } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
@@ -23,8 +22,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
productModule = appContainer.resolve(Modules.PRODUCT)
pricingModule = appContainer.resolve(Modules.PRICING)
remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY
)
integration-tests/modules/__tests__/link-modules/publishable-key-sales-channel.spec.ts
+3 -9
View File
@@ -2,11 +2,7 @@ import {
IApiKeyModuleService,
ISalesChannelModuleService,
} from "@medusajs/types"
import {
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { Modules, remoteQueryObjectFromString } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -25,10 +21,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
apiKeyModule = appContainer.resolve(ModuleRegistrationName.API_KEY)
scModuleService = appContainer.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
apiKeyModule = appContainer.resolve(Modules.API_KEY)
scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
remoteQuery = appContainer.resolve("remoteQuery")
remoteLink = appContainer.resolve("remoteLink")
})
integration-tests/modules/__tests__/link-modules/region-payment-provider.spec.ts
+2 -6
View File
@@ -1,9 +1,5 @@
import { IRegionModuleService } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -21,7 +17,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
regionModule = appContainer.resolve(Modules.REGION)
remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY
)
integration-tests/modules/__tests__/link-modules/sales-channel-location.spec.ts
+3 -9
View File
@@ -2,11 +2,7 @@ import {
ISalesChannelModuleService,
IStockLocationService,
} from "@medusajs/types"
import {
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { Modules, remoteQueryObjectFromString } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -24,10 +20,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
scService = appContainer.resolve(ModuleRegistrationName.SALES_CHANNEL)
locationService = appContainer.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
scService = appContainer.resolve(Modules.SALES_CHANNEL)
locationService = appContainer.resolve(Modules.STOCK_LOCATION)
remoteQuery = appContainer.resolve("remoteQuery")
remoteLink = appContainer.resolve("remoteLink")
})
integration-tests/modules/__tests__/link-modules/shipping-option-price-set.spec.ts
+3 -9
View File
@@ -2,11 +2,7 @@ import {
IFulfillmentModuleService,
IPricingModuleService,
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
adminHeaders,
@@ -28,10 +24,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
pricingModule = appContainer.resolve(Modules.PRICING)
remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY
)
integration-tests/modules/__tests__/link-modules/store-currency.spec.ts
+3 -8
View File
@@ -1,8 +1,5 @@
import { ICurrencyModuleService, IStoreModuleService } from "@medusajs/types"
import {
ModuleRegistrationName,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { Modules, remoteQueryObjectFromString } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -20,10 +17,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
storeModuleService = appContainer.resolve(ModuleRegistrationName.STORE)
currencyModuleService = appContainer.resolve(
ModuleRegistrationName.CURRENCY
)
storeModuleService = appContainer.resolve(Modules.STORE)
currencyModuleService = appContainer.resolve(Modules.CURRENCY)
remoteQuery = appContainer.resolve("remoteQuery")
})
integration-tests/modules/__tests__/modules/remote-query.spec.ts
+4 -8
View File
@@ -1,9 +1,5 @@
import { IRegionModuleService } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../..//helpers/create-admin-user"
import { adminHeaders } from "../../../helpers/create-admin-user"
@@ -23,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
regionModule = appContainer.resolve(Modules.REGION)
remoteQuery = appContainer.resolve(
ContainerRegistrationKeys.REMOTE_QUERY
)
@@ -131,7 +127,7 @@ medusaIntegrationTestRunner({
}
)
).rejects.toThrow(
`regionRegionPaymentPaymentProviderLink region_id not found: ${regionNoLink.id}`
`RegionRegionPaymentPaymentProviderLink region_id not found: ${regionNoLink.id}`
)
// Only validate the relations with Payment. It doesn't fail because the link didn't return any data
@@ -174,7 +170,7 @@ medusaIntegrationTestRunner({
}
)
).rejects.toThrow(
"payment id not found: pp_system_default_non_existent"
"Payment id not found: pp_system_default_non_existent"
)
// everything is fine
integration-tests/modules/__tests__/notification/admin/notification.spec.ts
+4 -7
View File
@@ -4,11 +4,8 @@ import {
INotificationModuleService,
Logger,
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner, TestEventUtils } from "medusa-test-utils"
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -19,7 +16,7 @@ medusaIntegrationTestRunner({
let logger: Logger
beforeAll(async () => {
service = getContainer().resolve(ModuleRegistrationName.NOTIFICATION)
service = getContainer().resolve(Modules.NOTIFICATION)
logger = getContainer().resolve(ContainerRegistrationKeys.LOGGER)
})
@@ -166,7 +163,7 @@ medusaIntegrationTestRunner({
describe("Configurable notification subscriber", () => {
let eventBus: IEventBusModuleService
beforeAll(async () => {
eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS)
eventBus = getContainer().resolve(Modules.EVENT_BUS)
})
it("should successfully sent a notification when an order is created (based on configuration)", async () => {
integration-tests/modules/__tests__/order/draft-order.spec.ts
+10 -20
View File
@@ -9,11 +9,7 @@ import {
IStockLocationServiceNext,
ITaxModuleService,
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
adminHeaders,
@@ -42,21 +38,15 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
cartModuleService = appContainer.resolve(ModuleRegistrationName.CART)
regionModuleService = appContainer.resolve(ModuleRegistrationName.REGION)
scModuleService = appContainer.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT)
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
inventoryModule = appContainer.resolve(ModuleRegistrationName.INVENTORY)
stockLocationModule = appContainer.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
taxModule = appContainer.resolve(ModuleRegistrationName.TAX)
cartModuleService = appContainer.resolve(Modules.CART)
regionModuleService = appContainer.resolve(Modules.REGION)
scModuleService = appContainer.resolve(Modules.SALES_CHANNEL)
productModule = appContainer.resolve(Modules.PRODUCT)
pricingModule = appContainer.resolve(Modules.PRICING)
inventoryModule = appContainer.resolve(Modules.INVENTORY)
stockLocationModule = appContainer.resolve(Modules.STOCK_LOCATION)
fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
taxModule = appContainer.resolve(Modules.TAX)
remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK)
remoteQuery = appContainer.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
})
integration-tests/modules/__tests__/order/order.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IOrderModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
adminHeaders,
@@ -18,7 +18,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
orderModule = appContainer.resolve(ModuleRegistrationName.ORDER)
orderModule = appContainer.resolve(Modules.ORDER)
})
beforeEach(async () => {
integration-tests/modules/__tests__/order/workflows/__fixtures__/index.ts
+8 -15
View File
@@ -8,24 +8,19 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
const providerId = "manual_test-provider"
export async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -49,7 +44,7 @@ export async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -211,9 +206,7 @@ export async function createOrderFixture({
location,
inventoryItem,
}) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
@@ -287,7 +280,7 @@ export async function createOrderFixture({
customer_id: "joe",
})
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const inventoryModule = container.resolve(Modules.INVENTORY)
await inventoryModule.createReservationItems([
{
line_item_id: order.items![0].id,
integration-tests/modules/__tests__/order/workflows/begin-order-claim.spec.ts
+8 -15
View File
@@ -15,7 +15,6 @@ import {
import {
ClaimType,
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -28,18 +27,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -63,7 +58,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -237,9 +232,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
integration-tests/modules/__tests__/order/workflows/begin-order-exchange.spec.ts
+9 -14
View File
@@ -17,7 +17,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -30,19 +29,15 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const customerService = container.resolve(ModuleRegistrationName.CUSTOMER)
const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(Modules.INVENTORY)
const customerService = container.resolve(Modules.CUSTOMER)
const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK)
const customer = await customerService.createCustomers({
@@ -72,7 +67,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -292,7 +287,7 @@ async function createOrderFixture({
customer,
region,
}) {
const orderService = container.resolve(ModuleRegistrationName.ORDER)
const orderService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: region.id,
email: "foo@bar.com",
integration-tests/modules/__tests__/order/workflows/begin-order-return.spec.ts
+8 -15
View File
@@ -13,7 +13,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -26,18 +25,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -61,7 +56,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -238,9 +233,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
integration-tests/modules/__tests__/order/workflows/cancel-order.spec.ts
+3 -3
View File
@@ -4,8 +4,8 @@ import {
createOrderFulfillmentWorkflow,
} from "@medusajs/core-flows"
import {
InventoryItemDTO,
IOrderModuleService,
InventoryItemDTO,
OrderWorkflow,
ProductDTO,
RegionDTO,
@@ -14,7 +14,7 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -52,7 +52,7 @@ medusaIntegrationTestRunner({
product = fixtures.product
inventoryItem = fixtures.inventoryItem
orderService = container.resolve(ModuleRegistrationName.ORDER)
orderService = container.resolve(Modules.ORDER)
})
it("should cancel an order", async () => {
integration-tests/modules/__tests__/order/workflows/create-complete-return.spec.ts
+9 -16
View File
@@ -17,7 +17,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -30,18 +29,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true }
const providerId = "manual_test-provider"
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const pricingModule = container.resolve(ModuleRegistrationName.PRICING)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const pricingModule = container.resolve(Modules.PRICING)
const inventoryModule = container.resolve(Modules.INVENTORY)
const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK)
const shippingProfile = await fulfillmentService.createShippingProfiles({
@@ -66,7 +61,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -241,9 +236,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
@@ -390,7 +383,7 @@ medusaIntegrationTestRunner({
product = fixtures.product
fulfillmentSet = fixtures.fulfillmentSet
orderService = container.resolve(ModuleRegistrationName.ORDER)
orderService = container.resolve(Modules.ORDER)
})
it("should create a return order", async () => {
integration-tests/modules/__tests__/order/workflows/create-fulfillment.spec.ts
+11 -22
View File
@@ -17,7 +17,6 @@ import {
import {
BigNumber,
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
@@ -31,17 +30,13 @@ const variantSkuWithInventory = "test-variant"
let inventoryItem
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -65,7 +60,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -226,9 +221,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product, location }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
@@ -310,7 +303,7 @@ async function createOrderFixture({ container, product, location }) {
customer_id: "joe",
})
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.createReservationItems([
{
@@ -355,13 +348,11 @@ medusaIntegrationTestRunner({
location = fixtures.location
product = fixtures.product
orderService = container.resolve(ModuleRegistrationName.ORDER)
orderService = container.resolve(Modules.ORDER)
})
it("should create a order fulfillment and cancel it", async () => {
const inventoryModule = container.resolve(
ModuleRegistrationName.INVENTORY
)
const inventoryModule = container.resolve(Modules.INVENTORY)
const order = await createOrderFixture({ container, product, location })
const itemWithInventory = order.items!.find(
@@ -534,9 +525,7 @@ medusaIntegrationTestRunner({
expect(orderFulfill.fulfillments).toHaveLength(1)
expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1)
const inventoryModule = container.resolve(
ModuleRegistrationName.INVENTORY
)
const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.listReservationItems({
line_item_id: order.items![0].id,
})
integration-tests/modules/__tests__/order/workflows/create-shipment.spec.ts
+10 -19
View File
@@ -16,7 +16,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -30,17 +29,13 @@ const providerId = "manual_test-provider"
let inventoryItem
async function prepareDataFixtures({ container }) {
const fulfillmentService = container.resolve(
ModuleRegistrationName.FULFILLMENT
)
const salesChannelService = container.resolve(
ModuleRegistrationName.SALES_CHANNEL
)
const fulfillmentService = container.resolve(Modules.FULFILLMENT)
const salesChannelService = container.resolve(Modules.SALES_CHANNEL)
const stockLocationModule: IStockLocationService = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
Modules.STOCK_LOCATION
)
const productModule = container.resolve(ModuleRegistrationName.PRODUCT)
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const productModule = container.resolve(Modules.PRODUCT)
const inventoryModule = container.resolve(Modules.INVENTORY)
const shippingProfile = await fulfillmentService.createShippingProfiles({
name: "test",
@@ -64,7 +59,7 @@ async function prepareDataFixtures({ container }) {
})
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -227,9 +222,7 @@ async function prepareDataFixtures({ container }) {
}
async function createOrderFixture({ container, product, location }) {
const orderService: IOrderModuleService = container.resolve(
ModuleRegistrationName.ORDER
)
const orderService: IOrderModuleService = container.resolve(Modules.ORDER)
let order = await orderService.createOrders({
region_id: "test_region_id",
email: "foo@bar.com",
@@ -302,7 +295,7 @@ async function createOrderFixture({ container, product, location }) {
customer_id: "joe",
})
const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY)
const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.createReservationItems([
{
line_item_id: order.items![0].id,
@@ -346,7 +339,7 @@ medusaIntegrationTestRunner({
location = fixtures.location
product = fixtures.product
orderService = container.resolve(ModuleRegistrationName.ORDER)
orderService = container.resolve(Modules.ORDER)
})
it("should create a order fulfillment", async () => {
@@ -417,9 +410,7 @@ medusaIntegrationTestRunner({
expect(orderFulfill.fulfillments).toHaveLength(1)
expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1)
const inventoryModule = container.resolve(
ModuleRegistrationName.INVENTORY
)
const inventoryModule = container.resolve(Modules.INVENTORY)
const reservation = await inventoryModule.listReservationItems({
line_item_id: order.items![0].id,
})
integration-tests/modules/__tests__/order/workflows/order-change-actions.ts
+2 -2
View File
@@ -13,7 +13,7 @@ import {
OrderChangeDTO,
OrderDTO,
} from "@medusajs/types"
import { ChangeActionType, ModuleRegistrationName } from "@medusajs/utils"
import { ChangeActionType, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createOrderFixture, prepareDataFixtures } from "./__fixtures__"
@@ -48,7 +48,7 @@ medusaIntegrationTestRunner({
})
orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
})
describe("createOrderChangeActionsWorkflow", () => {
integration-tests/modules/__tests__/order/workflows/order-change.spec.ts
+4 -4
View File
@@ -8,7 +8,7 @@ import {
deleteOrderChangeWorkflowId,
} from "@medusajs/core-flows"
import { IOrderModuleService, OrderChangeDTO, OrderDTO } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createOrderFixture, prepareDataFixtures } from "./__fixtures__"
@@ -100,7 +100,7 @@ medusaIntegrationTestRunner({
})
orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
})
it("should successfully cancel an order change", async () => {
@@ -179,7 +179,7 @@ medusaIntegrationTestRunner({
})
orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
})
it("should successfully delete an order change", async () => {
@@ -256,7 +256,7 @@ medusaIntegrationTestRunner({
})
orderChange = result
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
})
it("should successfully decline an order change", async () => {
integration-tests/modules/__tests__/order/workflows/return/create-return-shipping.spec.ts
+2 -2
View File
@@ -5,7 +5,7 @@ import {
import { IFulfillmentModuleService, OrderDTO, ReturnDTO } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -54,7 +54,7 @@ medusaIntegrationTestRunner({
fields: ["order_id", "id", "status", "order_change_id"],
})
service = container.resolve(ModuleRegistrationName.FULFILLMENT)
service = container.resolve(Modules.FULFILLMENT)
;[returnOrder] = await remoteQuery(remoteQueryObject)
})
integration-tests/modules/__tests__/order/workflows/return/items.spec.ts
+2 -2
View File
@@ -6,7 +6,7 @@ import {
import { IOrderModuleService, OrderDTO, ReturnDTO } from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
remoteQueryObjectFromString,
} from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
@@ -65,7 +65,7 @@ medusaIntegrationTestRunner({
fields: ["order_id", "id", "status", "order_change_id"],
})
service = container.resolve(ModuleRegistrationName.ORDER)
service = container.resolve(Modules.ORDER)
;[returnOrder] = await remoteQuery(remoteQueryObject)
})
integration-tests/modules/__tests__/payment/payment-session.workflows.spec.ts
+3 -3
View File
@@ -3,7 +3,7 @@ import {
createPaymentSessionsWorkflowId,
} from "@medusajs/core-flows"
import { IPaymentModuleService, IRegionModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -21,8 +21,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
paymentModule = appContainer.resolve(ModuleRegistrationName.PAYMENT)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
paymentModule = appContainer.resolve(Modules.PAYMENT)
regionModule = appContainer.resolve(Modules.REGION)
remoteLink = appContainer.resolve("remoteLink")
})
integration-tests/modules/__tests__/price-lists/admin/price-lists.spec.ts
+5 -9
View File
@@ -4,11 +4,7 @@ import {
IProductModuleService,
IRegionModuleService,
} from "@medusajs/types"
import {
ModuleRegistrationName,
PriceListStatus,
PriceListType,
} from "@medusajs/utils"
import { Modules, PriceListStatus, PriceListType } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
import { createVariantPriceSet } from "../../../helpers/create-variant-price-set"
@@ -37,10 +33,10 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT)
customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER)
regionModule = appContainer.resolve(ModuleRegistrationName.REGION)
pricingModule = appContainer.resolve(Modules.PRICING)
productModule = appContainer.resolve(Modules.PRODUCT)
customerModule = appContainer.resolve(Modules.CUSTOMER)
regionModule = appContainer.resolve(Modules.REGION)
})
beforeEach(async () => {
integration-tests/modules/__tests__/product/admin/products.spec.ts
+3 -7
View File
@@ -5,11 +5,7 @@ import {
ProductDTO,
ProductVariantDTO,
} from "@medusajs/types"
import {
ModuleRegistrationName,
PriceListStatus,
PriceListType,
} from "@medusajs/utils"
import { Modules, PriceListStatus, PriceListType } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
import { createVariantPriceSet } from "../../../helpers/create-variant-price-set"
@@ -54,8 +50,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING)
productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT)
pricingModule = appContainer.resolve(Modules.PRICING)
productModule = appContainer.resolve(Modules.PRODUCT)
})
beforeEach(async () => {
integration-tests/modules/__tests__/product/workflows/batch-products.spec.ts
+2 -2
View File
@@ -5,7 +5,7 @@ import {
batchProductVariantsWorkflowId,
} from "@medusajs/core-flows"
import { IProductModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(50000)
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.PRODUCT)
service = appContainer.resolve(Modules.PRODUCT)
})
describe("batchProductWorkflow", () => {
integration-tests/modules/__tests__/regions/admin/regions.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IRegionModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.REGION)
service = appContainer.resolve(Modules.REGION)
})
beforeEach(async () => {
integration-tests/modules/__tests__/shipping-options/store/shipping-options.spec.ts
+3 -9
View File
@@ -2,11 +2,7 @@ import {
IFulfillmentModuleService,
IRegionModuleService,
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
} from "@medusajs/utils"
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import {
createAdminUser,
@@ -39,10 +35,8 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
fulfillmentModule = appContainer.resolve(
ModuleRegistrationName.FULFILLMENT
)
regionService = appContainer.resolve(ModuleRegistrationName.REGION)
fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT)
regionService = appContainer.resolve(Modules.REGION)
const publishableKey = await generatePublishableKey(appContainer)
storeHeaders = generateStoreHeaders({ publishableKey })
})
integration-tests/modules/__tests__/shipping-options/workflows/batch-shipping-options-rules.ts
+3 -6
View File
@@ -15,7 +15,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -33,7 +32,7 @@ async function createShippingOptionFixture({
shippingProfile,
}) {
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -123,7 +122,7 @@ medusaIntegrationTestRunner({
beforeAll(() => {
container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT)
service = container.resolve(Modules.FULFILLMENT)
})
describe("Fulfillment workflows", () => {
@@ -153,9 +152,7 @@ medusaIntegrationTestRunner({
],
})
const stockLocationModule = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
const stockLocationModule = container.resolve(Modules.STOCK_LOCATION)
const location = await stockLocationModule.createStockLocations({
name: "Europe",
integration-tests/modules/__tests__/shipping-options/workflows/create-shipping-options.ts
+4 -7
View File
@@ -9,7 +9,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -29,7 +28,7 @@ medusaIntegrationTestRunner({
beforeAll(() => {
container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT)
service = container.resolve(Modules.FULFILLMENT)
})
describe("Fulfillment workflows", () => {
@@ -59,9 +58,7 @@ medusaIntegrationTestRunner({
],
})
const stockLocationModule = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
const stockLocationModule = container.resolve(Modules.STOCK_LOCATION)
const location = await stockLocationModule.createStockLocations({
name: "Europe",
@@ -93,7 +90,7 @@ medusaIntegrationTestRunner({
it("should create shipping options and prices", async () => {
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -209,7 +206,7 @@ medusaIntegrationTestRunner({
it("should revert the shipping options and prices", async () => {
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
integration-tests/modules/__tests__/shipping-options/workflows/delete-shipping-options.ts
+4 -7
View File
@@ -12,7 +12,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -32,7 +31,7 @@ medusaIntegrationTestRunner({
beforeAll(() => {
container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT)
service = container.resolve(Modules.FULFILLMENT)
})
describe("Fulfillment workflows", () => {
@@ -62,9 +61,7 @@ medusaIntegrationTestRunner({
],
})
const stockLocationModule = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
const stockLocationModule = container.resolve(Modules.STOCK_LOCATION)
const location = await stockLocationModule.createStockLocations({
name: "Europe",
@@ -96,7 +93,7 @@ medusaIntegrationTestRunner({
it("should delete shipping options", async () => {
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -179,7 +176,7 @@ medusaIntegrationTestRunner({
it("should revert the deleted shipping options", async () => {
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
integration-tests/modules/__tests__/shipping-options/workflows/update-shipping-options.ts
+4 -7
View File
@@ -13,7 +13,6 @@ import {
} from "@medusajs/types"
import {
ContainerRegistrationKeys,
ModuleRegistrationName,
Modules,
RuleOperator,
remoteQueryObjectFromString,
@@ -33,7 +32,7 @@ medusaIntegrationTestRunner({
beforeAll(() => {
container = getContainer()
service = container.resolve(ModuleRegistrationName.FULFILLMENT)
service = container.resolve(Modules.FULFILLMENT)
})
describe("Fulfillment workflows", () => {
@@ -63,9 +62,7 @@ medusaIntegrationTestRunner({
],
})
const stockLocationModule = container.resolve(
ModuleRegistrationName.STOCK_LOCATION
)
const stockLocationModule = container.resolve(Modules.STOCK_LOCATION)
const location = await stockLocationModule.createStockLocations({
name: "Europe",
@@ -97,7 +94,7 @@ medusaIntegrationTestRunner({
it("should update shipping options", async () => {
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
@@ -262,7 +259,7 @@ medusaIntegrationTestRunner({
it("should revert the shipping options", async () => {
const regionService = container.resolve(
ModuleRegistrationName.REGION
Modules.REGION
) as IRegionModuleService
const [region] = await regionService.createRegions([
integration-tests/modules/__tests__/store/admin/store.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IStoreModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.STORE)
service = appContainer.resolve(Modules.STORE)
})
beforeEach(async () => {
integration-tests/modules/__tests__/tax/admin/tax.spec.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { ITaxModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -20,7 +20,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.TAX)
service = appContainer.resolve(Modules.TAX)
})
beforeEach(async () => {
integration-tests/modules/__tests__/tax/workflow/tax.spec.ts
+2 -2
View File
@@ -1,10 +1,10 @@
import { ITaxModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import {
createTaxRateRulesStepId,
updateTaxRatesWorkflow,
} from "@medusajs/core-flows"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../../helpers/create-admin-user"
@@ -24,7 +24,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
service = appContainer.resolve(ModuleRegistrationName.TAX)
service = appContainer.resolve(Modules.TAX)
})
beforeEach(async () => {
integration-tests/modules/__tests__/users/update-user.spec.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import { IUserModuleService } from "@medusajs/types"
import { ModuleRegistrationName } from "@medusajs/utils"
import { Modules } from "@medusajs/utils"
import { medusaIntegrationTestRunner } from "medusa-test-utils"
import { createAdminUser } from "../../../helpers/create-admin-user"
@@ -19,7 +19,7 @@ medusaIntegrationTestRunner({
beforeAll(async () => {
appContainer = getContainer()
userModuleService = appContainer.resolve(ModuleRegistrationName.USER)
userModuleService = appContainer.resolve(Modules.USER)
})
beforeEach(async () => {
integration-tests/modules/helpers/create-authenticated-customer.ts
+3 -5
View File
@@ -1,6 +1,6 @@
import { CreateCustomerDTO, MedusaContainer } from "@medusajs/types"
import { Modules } from "@medusajs/utils"
import { ModuleRegistrationName } from "@medusajs/utils"
import jwt from "jsonwebtoken"
export const createAuthenticatedCustomer = async (
@@ -8,10 +8,8 @@ export const createAuthenticatedCustomer = async (
customerData: Partial<CreateCustomerDTO> = {}
) => {
const { http } = appContainer.resolve("configModule").projectConfig
const authService = appContainer.resolve(ModuleRegistrationName.AUTH)
const customerModuleService = appContainer.resolve(
ModuleRegistrationName.CUSTOMER
)
const authService = appContainer.resolve(Modules.AUTH)
const customerModuleService = appContainer.resolve(Modules.CUSTOMER)
const customer = await customerModuleService.createCustomers({
first_name: "John",
integration-tests/modules/helpers/create-variant-price-set.ts
+1 -1
View File
@@ -24,7 +24,7 @@ export const createVariantPriceSet = async ({
}): Promise<PriceSetDTO> => {
const remoteLink = container.resolve("remoteLink")
const pricingModuleService: IPricingModuleService = container.resolve(
"pricingModuleService"
Modules.PRICING
)
const priceSet = await pricingModuleService.createPriceSets({