fix: integration tests modules 2 (#6599)

Currently, if the v2 flag is not enabled it can lead to issues if the modules are part of the medusa config as they will get loaded anyway leading to issues if the migrations did not ran

integration-tests/modules/__tests__/cart/store/cart.workflows.spec.ts

@@ -22,7 +22,7 @@ import {
 import adminSeeder from "../../../../helpers/admin-seeder"
 import { medusaIntegrationTestRunner } from "medusa-test-utils"
 
-jest.setTimeout(50000)
+jest.setTimeout(200000)
 
 const env = { MEDUSA_FF_MEDUSA_V2: true }
 

integration-tests/modules/__tests__/link-modules/index.ts

@@ -1,188 +1,228 @@
 import { initialize, runMigrations } from "@medusajs/link-modules"
 import { MedusaModule, ModuleJoinerConfig } from "@medusajs/modules-sdk"
+import { medusaIntegrationTestRunner } from "medusa-test-utils/dist"
 
 jest.setTimeout(5000000)
 
-const DB_HOST = process.env.DB_HOST
+medusaIntegrationTestRunner({
-const DB_USERNAME = process.env.DB_USERNAME
+  force_modules_migration: true,
-const DB_PASSWORD = process.env.DB_PASSWORD
+  testSuite: ({ dbConnection, getContainer }) => {
-const DB_NAME = process.env.DB_TEMP_NAME
+    let DB_URL
-const DB_URL = `postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}/${DB_NAME}`
+    let container
+    let links
 
-describe("Link Modules", () => {
+    beforeAll(async () => {
-  let links
+      DB_URL = dbConnection.manager.connection.options.url
-  const linkDefinition: ModuleJoinerConfig[] = [
+      container = getContainer()
-    {
+
-      serviceName: "linkServiceName",
+      const linkDefinition: ModuleJoinerConfig[] = [
-      isLink: true,
-      databaseConfig: {
-        tableName: "linkTableName",
-        idPrefix: "prefix",
-        extraFields: {
-          extra_field: {
-            type: "integer",
-            defaultValue: "-1",
-          },
-          another_field: {
-            type: "string",
-            nullable: true,
-          },
-        },
-      },
-      relationships: [
         {
-          serviceName: "moduleA",
+          serviceName: "linkServiceName",
-          primaryKey: "id",
+          isLink: true,
-          foreignKey: "product_id",
+          databaseConfig: {
-          alias: "product",
+            tableName: "linkTableName",
+            idPrefix: "prefix",
+            extraFields: {
+              extra_field: {
+                type: "integer",
+                defaultValue: "-1",
+              },
+              another_field: {
+                type: "string",
+                nullable: true,
+              },
+            },
+          },
+          relationships: [
+            {
+              serviceName: "moduleA",
+              primaryKey: "id",
+              foreignKey: "product_id",
+              alias: "product",
+            },
+            {
+              serviceName: "moduleB",
+              primaryKey: "id",
+              foreignKey: "inventory_item_id",
+              alias: "inventory",
+            },
+          ],
         },
-        {
+      ]
-          serviceName: "moduleB",
+      const dbConfig = {
-          primaryKey: "id",
+        database: {
-          foreignKey: "inventory_item_id",
+          clientUrl: DB_URL,
-          alias: "inventory",
         },
-      ],
+      }
-    },
-  ]
-  const dbConfig = {
-    database: {
-      clientUrl: DB_URL,
-    },
-  }
 
-  beforeAll(async () => {
+      jest.spyOn(MedusaModule, "getLoadedModules").mockImplementation((() => {
-    jest.spyOn(MedusaModule, "getLoadedModules").mockImplementation((() => {
+        return [{ moduleA: [{}] }, { moduleB: [{}] }]
-      return [{ moduleA: [{}] }, { moduleB: [{}] }]
+      }) as any)
-    }) as any)
 
-    await runMigrations({ options: dbConfig }, linkDefinition)
+      await runMigrations({ options: dbConfig }, linkDefinition)
-    links = await initialize(dbConfig, linkDefinition)
+      links = await initialize(dbConfig, linkDefinition)
-  })
-
-  afterAll(async () => {
-    jest.clearAllMocks()
-  })
-
-  it("Should insert values in a declared link", async function () {
-    // simple
-    await links.linkServiceName.create("modA_id", "modB_id")
-
-    // extra fields
-    await links.linkServiceName.create("123", "abc", {
-      extra_field: 333,
-      another_field: "value**",
     })
 
-    // bulk
+    afterAll(async () => {
-    await links.linkServiceName.create([
+      jest.clearAllMocks()
-      ["111", "aaa", { another_field: "test" }],
-      ["222", "bbb"],
-      ["333", "ccc", { extra_field: 2 }],
-      ["444", "bbb"],
-    ])
-
-    const values = await links.linkServiceName.list()
-
-    expect(values).toEqual([
-      {
-        product_id: "modA_id",
-        inventory_item_id: "modB_id",
-        id: expect.stringMatching("prefix_.+"),
-        extra_field: -1,
-        another_field: null,
-        created_at: expect.any(Date),
-        updated_at: expect.any(Date),
-        deleted_at: null,
-      },
-      expect.objectContaining({
-        product_id: "123",
-        inventory_item_id: "abc",
-        id: expect.stringMatching("prefix_.+"),
-        extra_field: 333,
-        another_field: "value**",
-      }),
-      expect.objectContaining({
-        product_id: "111",
-        inventory_item_id: "aaa",
-        extra_field: -1,
-        another_field: "test",
-      }),
-      expect.objectContaining({
-        product_id: "222",
-        inventory_item_id: "bbb",
-        extra_field: -1,
-        another_field: null,
-      }),
-      expect.objectContaining({
-        product_id: "333",
-        inventory_item_id: "ccc",
-        id: expect.stringMatching("prefix_.+"),
-        extra_field: 2,
-      }),
-      expect.objectContaining({
-        product_id: "444",
-        inventory_item_id: "bbb",
-      }),
-    ])
-  })
-
-  it("Should dismiss the link of a given pair of keys", async function () {
-    // simple
-    const dismissSingle = await links.linkServiceName.dismiss(
-      "modA_id",
-      "modB_id"
-    )
-
-    // bulk
-    const dismissMulti = await links.linkServiceName.dismiss([
-      ["111", "aaa"],
-      ["333", "ccc"],
-    ])
-
-    expect(dismissSingle).toEqual([
-      expect.objectContaining({
-        product_id: "modA_id",
-        inventory_item_id: "modB_id",
-        deleted_at: expect.any(Date),
-      }),
-    ])
-
-    expect(dismissMulti).toEqual([
-      expect.objectContaining({
-        product_id: "111",
-        inventory_item_id: "aaa",
-        deleted_at: expect.any(Date),
-      }),
-      expect.objectContaining({
-        product_id: "333",
-        inventory_item_id: "ccc",
-        deleted_at: expect.any(Date),
-      }),
-    ])
-  })
-
-  it("Should delete all the links related to a given key", async function () {
-    await links.linkServiceName.softDelete({
-      inventory_item_id: "bbb",
     })
 
-    const values = await links.linkServiceName.list(
+    describe("Link Modules", () => {
-      { inventory_item_id: "bbb" },
+      it("Should insert values in a declared link", async function () {
-      { withDeleted: true }
+        // simple
-    )
+        await links.linkServiceName.create("modA_id", "modB_id")
 
-    expect(values).toEqual([
+        // extra fields
-      expect.objectContaining({
+        await links.linkServiceName.create("123", "abc", {
-        product_id: "222",
+          extra_field: 333,
-        inventory_item_id: "bbb",
+          another_field: "value**",
-        deleted_at: expect.any(Date),
+        })
-      }),
+
-      expect.objectContaining({
+        // bulk
-        product_id: "444",
+        await links.linkServiceName.create([
-        inventory_item_id: "bbb",
+          ["111", "aaa", { another_field: "test" }],
-        deleted_at: expect.any(Date),
+          ["222", "bbb"],
-      }),
+          ["333", "ccc", { extra_field: 2 }],
-    ])
+          ["444", "bbb"],
-  })
+        ])
+
+        const values = await links.linkServiceName.list()
+
+        expect(values).toEqual([
+          {
+            product_id: "modA_id",
+            inventory_item_id: "modB_id",
+            id: expect.stringMatching("prefix_.+"),
+            extra_field: -1,
+            another_field: null,
+            created_at: expect.any(Date),
+            updated_at: expect.any(Date),
+            deleted_at: null,
+          },
+          expect.objectContaining({
+            product_id: "123",
+            inventory_item_id: "abc",
+            id: expect.stringMatching("prefix_.+"),
+            extra_field: 333,
+            another_field: "value**",
+          }),
+          expect.objectContaining({
+            product_id: "111",
+            inventory_item_id: "aaa",
+            extra_field: -1,
+            another_field: "test",
+          }),
+          expect.objectContaining({
+            product_id: "222",
+            inventory_item_id: "bbb",
+            extra_field: -1,
+            another_field: null,
+          }),
+          expect.objectContaining({
+            product_id: "333",
+            inventory_item_id: "ccc",
+            id: expect.stringMatching("prefix_.+"),
+            extra_field: 2,
+          }),
+          expect.objectContaining({
+            product_id: "444",
+            inventory_item_id: "bbb",
+          }),
+        ])
+      })
+
+      it("Should dismiss the link of a given pair of keys", async function () {
+        // simple
+        await links.linkServiceName.create("modA_id", "modB_id")
+
+        // extra fields
+        await links.linkServiceName.create("123", "abc", {
+          extra_field: 333,
+          another_field: "value**",
+        })
+
+        // bulk
+        await links.linkServiceName.create([
+          ["111", "aaa", { another_field: "test" }],
+          ["222", "bbb"],
+          ["333", "ccc", { extra_field: 2 }],
+          ["444", "bbb"],
+        ])
+
+        // simple
+        const dismissSingle = await links.linkServiceName.dismiss(
+          "modA_id",
+          "modB_id"
+        )
+
+        // bulk
+        const dismissMulti = await links.linkServiceName.dismiss([
+          ["111", "aaa"],
+          ["333", "ccc"],
+        ])
+
+        expect(dismissSingle).toEqual([
+          expect.objectContaining({
+            product_id: "modA_id",
+            inventory_item_id: "modB_id",
+            deleted_at: expect.any(Date),
+          }),
+        ])
+
+        expect(dismissMulti).toEqual([
+          expect.objectContaining({
+            product_id: "111",
+            inventory_item_id: "aaa",
+            deleted_at: expect.any(Date),
+          }),
+          expect.objectContaining({
+            product_id: "333",
+            inventory_item_id: "ccc",
+            deleted_at: expect.any(Date),
+          }),
+        ])
+      })
+
+      it("Should delete all the links related to a given key", async function () {
+        // simple
+        await links.linkServiceName.create("modA_id", "modB_id")
+
+        // extra fields
+        await links.linkServiceName.create("123", "abc", {
+          extra_field: 333,
+          another_field: "value**",
+        })
+
+        // bulk
+        await links.linkServiceName.create([
+          ["111", "aaa", { another_field: "test" }],
+          ["222", "bbb"],
+          ["333", "ccc", { extra_field: 2 }],
+          ["444", "bbb"],
+        ])
+
+        await links.linkServiceName.softDelete({
+          inventory_item_id: "bbb",
+        })
+
+        const values = await links.linkServiceName.list(
+          { inventory_item_id: "bbb" },
+          { withDeleted: true }
+        )
+
+        expect(values).toEqual([
+          expect.objectContaining({
+            product_id: "222",
+            inventory_item_id: "bbb",
+            deleted_at: expect.any(Date),
+          }),
+          expect.objectContaining({
+            product_id: "444",
+            inventory_item_id: "bbb",
+            deleted_at: expect.any(Date),
+          }),
+        ])
+      })
+    })
+  },
 })

integration-tests/modules/__tests__/modules/load-standalone.ts

@@ -3,6 +3,7 @@ import { medusaIntegrationTestRunner } from "medusa-test-utils"
 jest.setTimeout(30000)
 
 medusaIntegrationTestRunner({
+  force_modules_migration: true,
   testSuite: ({ dbConnection }) => {
     describe("Standalone Modules", () => {
       beforeAll(async () => {

integration-tests/modules/package.json

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