test: Use Factory to mock FulfillmentMethod

Signed-off-by: trojanh <[email protected]>
reactioncommerce · Dec 21, 2019 · e85280c · e85280c
1 parent 5a64d0a
commit e85280c
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 38 deletions.
diff --git a/tests/integration/api/mutations/shippingRates/createFlatRateFulfillmentMethod.test.js b/tests/integration/api/mutations/shippingRates/createFlatRateFulfillmentMethod.test.js
@@ -12,7 +12,7 @@ const shopName = "Test Shop";
 
 const groups = ["Standard", "Priority", "Next-Day"];
 
-const mockShippingMethod = {
+const mockFulfillmentMethodInput = {
   name: "mockMethod",
   label: `${groups[0]} mockMethod`,
   handling: 9.5,
@@ -67,7 +67,7 @@ test("user can not create flat rate fulfillment method if admin is not logged in
     await createFlatRateFulfillmentMethod({
       input: {
         shopId: opaqueShopId,
-        method: mockShippingMethod
+        method: mockFulfillmentMethodInput
       }
     });
   } catch (errors) {
@@ -84,15 +84,15 @@ test("user can create flat rate fulfillment method if admin is logged in", async
     result = await createFlatRateFulfillmentMethod({
       input: {
         shopId: opaqueShopId,
-        method: mockShippingMethod
+        method: mockFulfillmentMethodInput
       }
     });
   } catch (error) {
     expect(error).toBeUndefined();
     return;
   }
 
-  expect(result.createFlatRateFulfillmentMethod.method).toEqual(mockShippingMethod);
+  expect(result.createFlatRateFulfillmentMethod.method).toEqual(mockFulfillmentMethodInput);
 });
 
 
diff --git a/tests/integration/api/mutations/shippingRates/deleteFlatRateFulfillmentMethod.test.js b/tests/integration/api/mutations/shippingRates/deleteFlatRateFulfillmentMethod.test.js
@@ -12,8 +12,10 @@ const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 const shopName = "Test Shop";
 
 const groups = ["Standard", "Priority", "Next-Day"];
+const mockFulfillmentMethodId = "mockMethod";
+const opaqueMockFulfillmentMethodId = encodeOpaqueId("reaction/fulfillmentMethod", mockFulfillmentMethodId);
 
-const mockShippingMethod = {
+const mockFulfillmentMethodData = {
   name: "mockMethod",
   label: `${groups[0]} mockMethod`,
   handling: 9.5,
@@ -24,8 +26,11 @@ const mockShippingMethod = {
   group: groups[0]
 };
 
-const mockShippingMethodId = "mockMethod";
-const opaqueMockShippingMethodId = encodeOpaqueId("reaction/fulfillmentMethod", mockShippingMethodId);
+const mockFulfillmentMethod = Factory.FulfillmentMethod.makeOne({
+  ...mockFulfillmentMethodData,
+  _id: mockFulfillmentMethodId,
+  shopId: internalShopId
+});
 
 const mockCustomerAccount = Factory.Account.makeOne({
   roles: {
@@ -52,9 +57,9 @@ beforeAll(async () => {
 
   await testApp.collections.Shipping.insertOne({
     methods: [{
-      _id: mockShippingMethodId,
+      _id: mockFulfillmentMethodId,
       shopId: internalShopId,
-      ...mockShippingMethod
+      ...mockFulfillmentMethod
     }],
     shopId: internalShopId
   });
@@ -79,7 +84,7 @@ test("user can not delete flat rate fulfillment method if admin is not logged in
   try {
     await deleteFlatRateFulfillmentMethod({
       input: {
-        methodId: opaqueMockShippingMethodId,
+        methodId: opaqueMockFulfillmentMethodId,
         shopId: opaqueShopId
       }
     });
@@ -96,7 +101,7 @@ test("user can delete flat rate fulfillment method if admin is logged in", async
   try {
     result = await deleteFlatRateFulfillmentMethod({
       input: {
-        methodId: opaqueMockShippingMethodId,
+        methodId: opaqueMockFulfillmentMethodId,
         shopId: opaqueShopId
       }
     });
@@ -106,8 +111,8 @@ test("user can delete flat rate fulfillment method if admin is logged in", async
   }
 
   expect(result.deleteFlatRateFulfillmentMethod.method).toEqual({
-    _id: opaqueMockShippingMethodId,
-    ...mockShippingMethod
+    _id: opaqueMockFulfillmentMethodId,
+    ...mockFulfillmentMethodData
   });
 });
 

diff --git a/tests/integration/api/mutations/shippingRates/updateFlatRateFulfillmentMethod.test.js b/tests/integration/api/mutations/shippingRates/updateFlatRateFulfillmentMethod.test.js
@@ -12,8 +12,12 @@ const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 const shopName = "Test Shop";
 
 const groups = ["Standard", "Priority", "Next-Day"];
+const mockFulfillmentMethodId = "mockMethod";
+const opaqueMockFulfillmentMethodId = encodeOpaqueId("reaction/fulfillmentMethod", mockFulfillmentMethodId);
 
-const mockShippingMethod = {
+const mockFulfillmentMethod = Factory.FulfillmentMethod.makeOne({
+  _id: mockFulfillmentMethodId,
+  shopId: internalShopId,
   name: "mockMethod",
   label: `${groups[0]} mockMethod`,
   handling: 9.5,
@@ -22,10 +26,18 @@ const mockShippingMethod = {
   isEnabled: true,
   fulfillmentTypes: ["shipping"],
   group: groups[0]
-};
+});
 
-const mockShippingMethodId = "mockMethod";
-const opaqueMockShippingMethodId = encodeOpaqueId("reaction/fulfillmentMethod", mockShippingMethodId);
+const mockFulfillmentMethodInput = {
+  name: "mockMethod2",
+  label: `${groups[1]} mockMethod`,
+  handling: 19.5,
+  rate: 80,
+  cost: 8,
+  isEnabled: false,
+  fulfillmentTypes: ["shipping"],
+  group: groups[1]
+};
 
 const mockCustomerAccount = Factory.Account.makeOne({
   roles: {
@@ -51,11 +63,7 @@ beforeAll(async () => {
   await testApp.insertPrimaryShop({ _id: internalShopId, name: shopName });
 
   await testApp.collections.Shipping.insertOne({
-    methods: [{
-      _id: mockShippingMethodId,
-      shopId: internalShopId,
-      ...mockShippingMethod
-    }],
+    methods: [mockFulfillmentMethod],
     shopId: internalShopId
   });
 });
@@ -79,13 +87,9 @@ test("user can not update flat rate fulfillment method if admin is not logged in
   try {
     await updateFlatRateFulfillmentMethod({
       input: {
-        methodId: opaqueMockShippingMethodId,
+        methodId: opaqueMockFulfillmentMethodId,
         shopId: opaqueShopId,
-        method: {
-          ...mockShippingMethod,
-          label: `${groups[1]} mockMethod`,
-          group: groups[1]
-        }
+        method: mockFulfillmentMethodInput
       }
     });
   } catch (errors) {
@@ -101,13 +105,9 @@ test("user can update flat rate fulfillment method if admin is logged in", async
   try {
     result = await updateFlatRateFulfillmentMethod({
       input: {
-        methodId: opaqueMockShippingMethodId,
+        methodId: opaqueMockFulfillmentMethodId,
         shopId: opaqueShopId,
-        method: {
-          ...mockShippingMethod,
-          label: `${groups[1]} mockMethod`,
-          group: groups[1]
-        }
+        method: mockFulfillmentMethodInput
       }
     });
   } catch (error) {
@@ -116,10 +116,8 @@ test("user can update flat rate fulfillment method if admin is logged in", async
   }
 
   expect(result.updateFlatRateFulfillmentMethod.method).toEqual({
-    ...mockShippingMethod,
-    _id: opaqueMockShippingMethodId,
-    label: `${groups[1]} mockMethod`,
-    group: groups[1]
+    ...mockFulfillmentMethodInput,
+    _id: opaqueMockFulfillmentMethodId
   });
 });
 

diff --git a/tests/util/factory.js b/tests/util/factory.js
@@ -90,6 +90,8 @@ import {
 
 import { AddressValidationRule } from "../../src/core-services/address/simpleSchemas.js";
 
+import FulfillmentMethod from "../../src/plugins/shipping-rates/util/methodSchema.js";
+
 const schemasToAddToFactory = {
   Account,
   AccountProfileAddress,
@@ -107,6 +109,7 @@ const schemasToAddToFactory = {
   Discounts,
   Email,
   EmailTemplates,
+  FulfillmentMethod,
   Group,
   NavigationItem,
   NavigationTree,