test: unit test fixes (#126)

* test: moved gateway inside test. * chore: lock file * test: updated to work with latest devkit changes * fix: should never have been a manual plp option * fix: build issue * chore: lock file
elasticpath · Nov 16, 2023 · 92c36ee · 92c36ee
1 parent 88d82d2
commit 92c36ee
Show file tree

Hide file tree

Showing 15 changed files with 227 additions and 164 deletions.
diff --git a/packages/composable-common/src/payment-gateways/check-gateway.test.ts b/packages/composable-common/src/payment-gateways/check-gateway.test.ts
@@ -2,15 +2,14 @@ import { gateway, MemoryStorageFactory } from "@moltin/sdk"
 import { it, describe, expect } from "vitest"
 import { checkGateway } from "./check-gateway"
 
-const client = gateway({
-  client_id: "123",
-  client_secret: "456",
-  host: "mock-host.com",
-  storage: new MemoryStorageFactory(),
-})
-
 describe("check-gateway", () => {
   it("checkGateway should give success response when gateway is active", async () => {
+    const client = gateway({
+      client_id: "123",
+      client_secret: "456",
+      host: "mock-host.com",
+      storage: new MemoryStorageFactory(),
+    })
     expect(await checkGateway(client, "manual")).toEqual({
       success: true,
       data: {
@@ -23,6 +22,12 @@ describe("check-gateway", () => {
   })
 
   it("checkGateway should give failure response when gateway is not enabled", async () => {
+    const client = gateway({
+      client_id: "123",
+      client_secret: "456",
+      host: "mock-host.com",
+      storage: new MemoryStorageFactory(),
+    })
     expect(await checkGateway(client, "elastic_path_payments_stripe")).toEqual({
       success: false,
       error: new Error(`elastic_path_payments_stripe gateway is not enabled`),

diff --git a/packages/composable-common/src/payment-gateways/ep-payments/update-gateway.test.ts b/packages/composable-common/src/payment-gateways/ep-payments/update-gateway.test.ts
@@ -2,15 +2,14 @@ import { it, describe, expect } from "vitest"
 import { updateEpPaymentGateway } from "./update-gateway"
 import { gateway, MemoryStorageFactory } from "@moltin/sdk"
 
-const client = gateway({
-  client_id: "123",
-  client_secret: "456",
-  host: "mock-host.com",
-  storage: new MemoryStorageFactory(),
-})
-
 describe("update-gateway", () => {
   it("updateEpPaymentGateway should give success response", async () => {
+    const client = gateway({
+      client_id: "123",
+      client_secret: "456",
+      host: "mock-host.com",
+      storage: new MemoryStorageFactory(),
+    })
     expect(await updateEpPaymentGateway(client, "new-account-id")).toEqual({
       success: true,
       data: {

diff --git a/packages/d2c-schematics/__tests__/application.test.ts b/packages/d2c-schematics/__tests__/application.test.ts
@@ -32,21 +32,25 @@ describe("Application Schematic", () => {
 
   let workspaceTree: UnitTestTree
   beforeEach(async () => {
-    workspaceTree = await schematicRunner
-      .runSchematicAsync("workspace", workspaceOptions)
-      .toPromise()
+    workspaceTree = await schematicRunner.runSchematic(
+      "workspace",
+      workspaceOptions,
+    )
   })
 
   it("should create public files for core application", async () => {
     const options = { ...defaultOptions }
 
     try {
-      const tree = await schematicRunner
-        .runSchematicAsync("application", options, workspaceTree)
-        .toPromise()
+      const tree = await schematicRunner.runSchematic(
+        "application",
+        options,
+        workspaceTree,
+      )
+
       const files = tree.files
 
-      expect(files).toIncludeAllPartialMembers(["/public/favicon.ico"])
+      expect(files).toContain("/public/favicon.ico")
     } catch (err) {
       throw new Error(err)
     }
@@ -56,9 +60,12 @@ describe("Application Schematic", () => {
     const options = { ...defaultOptions }
 
     try {
-      const tree = await schematicRunner
-        .runSchematicAsync("application", options, workspaceTree)
-        .toPromise()
+      const tree = await schematicRunner.runSchematic(
+        "application",
+        options,
+        workspaceTree,
+      )
+
       const files = tree.files
 
       expect(files).toIncludeAllPartialMembers(["/src/styles/globals.css"])
@@ -69,9 +76,12 @@ describe("Application Schematic", () => {
 
   it("should create middleware files of an application", async () => {
     const options = { ...defaultOptions }
-    const tree = await schematicRunner
-      .runSchematicAsync("application", options, workspaceTree)
-      .toPromise()
+    const tree = await schematicRunner.runSchematic(
+      "application",
+      options,
+      workspaceTree,
+    )
+
     const files = tree.files
 
     expect(files).toIncludeAllPartialMembers([
@@ -88,9 +98,12 @@ describe("Application Schematic", () => {
 
   it("should create core files of an application", async () => {
     const options = { ...defaultOptions }
-    const tree = await schematicRunner
-      .runSchematicAsync("application", options, workspaceTree)
-      .toPromise()
+    const tree = await schematicRunner.runSchematic(
+      "application",
+      options,
+      workspaceTree,
+    )
+
     const files = tree.files
 
     expect(files.filter((f) => f.startsWith("/src/")).sort()).toEqual(
@@ -120,9 +133,9 @@ describe("Application Schematic", () => {
         "/src/lib/epcc-server-client.ts",
         "/src/lib/epcc-server-side-implicit-client.ts",
         "/src/lib/form-url-encode-body.ts",
-        "/src/lib/get-cookie.ts",
         "/src/lib/get-store-context.ts",
         "/src/lib/is-empty-object.ts",
+        "/src/lib/middleware/apply-set-cookie.ts",
         "/src/lib/middleware/cart-cookie-middleware.ts",
         "/src/lib/middleware/create-missing-environment-variable-url.ts",
         "/src/lib/middleware/implicit-auth-middleware.ts",

diff --git a/packages/d2c-schematics/__tests__/cart.test.ts b/packages/d2c-schematics/__tests__/cart.test.ts
@@ -30,19 +30,22 @@ describe("Cart Schematic", () => {
     /**
      * Cart schematic depends on workspace and application schematics
      */
-    const workspaceTree = await schematicRunner
-      .runSchematicAsync("workspace", workspaceOptions)
-      .toPromise()
-    initTree = await schematicRunner
-      .runSchematicAsync("application", applicationOptions, workspaceTree)
-      .toPromise()
+    const workspaceTree = await schematicRunner.runSchematic(
+      "workspace",
+      workspaceOptions,
+    )
+
+    initTree = await schematicRunner.runSchematic(
+      "application",
+      applicationOptions,
+      workspaceTree,
+    )
   })
 
   it("should create cart page files of an application", async () => {
     const options = { ...defaultOptions }
-    const tree = await schematicRunner
-      .runSchematicAsync("cart", options, initTree)
-      .toPromise()
+    const tree = await schematicRunner.runSchematic("cart", options, initTree)
+
     const files = tree.files
 
     expect(files).toIncludeAllPartialMembers([

diff --git a/packages/d2c-schematics/__tests__/d2c.test.ts b/packages/d2c-schematics/__tests__/d2c.test.ts
@@ -25,20 +25,16 @@ describe("EP New Schematic", () => {
   it("should create files of a workspace", async () => {
     const options = { ...defaultOptions }
 
-    const tree: any = await schematicRunner
-      .runSchematicAsync("d2c", options)
-      .toPromise()
-      .catch((err) => console.log("error caught:", err))
+    const tree = await schematicRunner.runSchematic("d2c", options)
 
     const files = tree.files
     expect(files).toContain("/bar/package.json")
   })
 
   it("should create cart schematic files", async () => {
     const options = { ...defaultOptions }
-    const tree = await schematicRunner
-      .runSchematicAsync("d2c", options)
-      .toPromise()
+    const tree = await schematicRunner.runSchematic("d2c", options)
+
     const files = tree.files
 
     expect(files).toIncludeAllPartialMembers([

diff --git a/packages/d2c-schematics/__tests__/featured-product.test.ts b/packages/d2c-schematics/__tests__/featured-product.test.ts
@@ -10,7 +10,7 @@ import { Schema as FeaturedProductOptions } from "../featured-products/schema"
 describe("Featured Products Schematic", () => {
   const schematicRunner = new SchematicTestRunner(
     "@schematics/angular",
-    require.resolve("../collection.json")
+    require.resolve("../collection.json"),
   )
 
   const workspaceOptions: WorkspaceOptions = {
@@ -31,19 +31,26 @@ describe("Featured Products Schematic", () => {
     /**
      * Featured Products schematic depends on workspace and application schematics
      */
-    const workspaceTree = await schematicRunner
-      .runSchematicAsync("workspace", workspaceOptions)
-      .toPromise()
-    initTree = await schematicRunner
-      .runSchematicAsync("application", applicationOptions, workspaceTree)
-      .toPromise()
+    const workspaceTree = await schematicRunner.runSchematic(
+      "workspace",
+      workspaceOptions,
+    )
+
+    initTree = await schematicRunner.runSchematic(
+      "application",
+      applicationOptions,
+      workspaceTree,
+    )
   })
 
   it("featured products schematic should create component files", async () => {
     const options = { ...defaultOptions }
-    const tree = await schematicRunner
-      .runSchematicAsync("featured-products", options, initTree)
-      .toPromise()
+    const tree = await schematicRunner.runSchematic(
+      "featured-products",
+      options,
+      initTree,
+    )
+
     const files = tree.files
 
     expect(files).toIncludeAnyMembers([

diff --git a/packages/d2c-schematics/__tests__/footer.test.ts b/packages/d2c-schematics/__tests__/footer.test.ts
@@ -9,7 +9,7 @@ import { Schema as ApplicationOptions } from "../application/schema"
 describe("Footer Schematic", () => {
   const schematicRunner = new SchematicTestRunner(
     "@schematics/angular",
-    require.resolve("../collection.json")
+    require.resolve("../collection.json"),
   )
 
   const workspaceOptions: WorkspaceOptions = {
@@ -30,19 +30,22 @@ describe("Footer Schematic", () => {
     /**
      * Footer schematic depends on workspace and application schematics
      */
-    const workspaceTree = await schematicRunner
-      .runSchematicAsync("workspace", workspaceOptions)
-      .toPromise()
-    initTree = await schematicRunner
-      .runSchematicAsync("application", applicationOptions, workspaceTree)
-      .toPromise()
+    const workspaceTree = await schematicRunner.runSchematic(
+      "workspace",
+      workspaceOptions,
+    )
+
+    initTree = await schematicRunner.runSchematic(
+      "application",
+      applicationOptions,
+      workspaceTree,
+    )
   })
 
   it("should create footer component files of an application", async () => {
     const options = { ...defaultOptions }
-    const tree = await schematicRunner
-      .runSchematicAsync("footer", options, initTree)
-      .toPromise()
+    const tree = await schematicRunner.runSchematic("footer", options, initTree)
+
     const files = tree.files
 
     expect(files).toIncludeAllPartialMembers([

diff --git a/packages/d2c-schematics/__tests__/header.test.ts b/packages/d2c-schematics/__tests__/header.test.ts
@@ -32,19 +32,22 @@ describe("Header Schematic", () => {
     /**
      * Header schematic depends on workspace and application schematics
      */
-    const workspaceTree = await schematicRunner
-      .runSchematicAsync("workspace", workspaceOptions)
-      .toPromise()
-    initTree = await schematicRunner
-      .runSchematicAsync("application", applicationOptions, workspaceTree)
-      .toPromise()
+    const workspaceTree = await schematicRunner.runSchematic(
+      "workspace",
+      workspaceOptions,
+    )
+
+    initTree = await schematicRunner.runSchematic(
+      "application",
+      applicationOptions,
+      workspaceTree,
+    )
   })
 
   it("should create header component files of an application", async () => {
     const options = { ...defaultOptions }
-    const tree = await schematicRunner
-      .runSchematicAsync("header", options, initTree)
-      .toPromise()
+    const tree = await schematicRunner.runSchematic("header", options, initTree)
+
     const files = tree.files
 
     expect(
@@ -65,9 +68,10 @@ describe("Header Schematic", () => {
   })
 
   it("header schematic should not import search modal module when search=false", async () => {
-    const tree = await schematicRunner
-      .runSchematicAsync("header", { ...defaultOptions, search: false })
-      .toPromise()
+    const tree = await schematicRunner.runSchematic("header", {
+      ...defaultOptions,
+      search: false,
+    })
 
     const tsSrcFile = createSourceFile(
       "Header.tsx",
@@ -82,9 +86,10 @@ describe("Header Schematic", () => {
   })
 
   it("header schematic should import search modal module when search=true", async () => {
-    const tree = await schematicRunner
-      .runSchematicAsync("header", { ...defaultOptions, search: true })
-      .toPromise()
+    const tree = await schematicRunner.runSchematic("header", {
+      ...defaultOptions,
+      search: true,
+    })
 
     const tsSrcFile = createSourceFile(
       "Header.tsx",