refactor

src/core/test-app/runner/config/cancel-shipments-multiple.ts

@@ -9,8 +9,8 @@ import { BaseTestConfigOptions } from "./base-test-config-options";
 
 export interface ShipmentConfig {
   deliveryServiceName: string;
-  shipFrom?: AddressWithContactInfoPOJO;
-  shipTo?: AddressWithContactInfoPOJO;
+  shipFrom: AddressWithContactInfoPOJO;
+  shipTo: AddressWithContactInfoPOJO;
   weight: {
     value: number;
     unit: WeightUnit;

src/core/test-app/runner/validate-config.ts

@@ -64,17 +64,21 @@ const cancelShipmentsSingleTestParamsSchema = Joi.object({
   }
 });
 
-const cancelShipmentsMultipleTestParamsSchema = Joi.object({
-  ...baseTestParamValidations,
-  ...[{
-    deliveryServiceName: Joi.string().optional(),
-    shipDateTime: DateTimeZone[_internal].schema.optional(),
-    shipFrom: AddressWithContactInfo[_internal].schema.optional(),
-    shipTo: AddressWithContactInfo[_internal].schema.optional(),
-    weight: Weight[_internal].schema.optional(),
-    dimensions: Dimensions[_internal].schema.optional()
-  }]
-});
+const cancelShipmentsMultipleTestParamsSchema = Joi.object(
+  Object.assign(
+    baseTestParamValidations,
+    {
+      shipments: Joi.array().items({
+        deliveryServiceName: Joi.string().optional(),
+        shipDateTime: DateTimeZone[_internal].schema.optional(),
+        shipFrom: AddressWithContactInfo[_internal].schema.optional(),
+        shipTo: AddressWithContactInfo[_internal].schema.optional(),
+        weight: Weight[_internal].schema.optional(),
+        dimensions: Dimensions[_internal].schema.optional()
+      })
+    }
+  )
+);
 
 const createShipmentDomesticTestParamsSchema = Joi.object({
   ...baseTestParamValidations,

src/core/test-app/tests/cancel-shipments-multiple.ts

@@ -50,15 +50,11 @@ export class CancelShipmentsMultiple extends Suite {
       throw new Error("connect.config.js shipments must contain two or more shipments");
     }
 
-    const userOverrides: {
-      deliveryServiceName: string;
-      shipFrom?: AddressWithContactInfoPOJO,
-      shipTo?: AddressWithContactInfoPOJO,
-      shipDateTime: string;
-    }[] = [];
-
     const shipmentNumber = config.shipments.length || 2;
+    const defaults: CancelShipmentsMultipleTestParams = { shipments: [] };
+    const { tomorrow } = initializeTimeStamps();
 
+    // Genereate the potential user overrides 
     for (let i = 0; i < shipmentNumber; i++) {
       const deliveryServiceName = config.shipments[i] && config.shipments[i].deliveryServiceName || "";
       const deliveryService = this.setDeliveryService(deliveryServiceName);
@@ -69,27 +65,11 @@ export class CancelShipmentsMultiple extends Suite {
         break;
       }
 
-      const { tomorrow } = initializeTimeStamps();
-
-      userOverrides.push({
+      defaults.shipments.push({
         deliveryServiceName: deliveryService.name,
-        shipFrom,
-        shipTo,
-        shipDateTime: tomorrow
-      });
-    }
-
-    if (userOverrides.length === 0) {
-      return undefined;
-    }
-
-    const defaults: CancelShipmentsMultipleTestParams = { shipments: [] };
-    defaults.shipments = userOverrides.map((test) => {
-      return {
-        deliveryServiceName: test.deliveryServiceName,
-        shipDateTime: test.shipDateTime,
-        shipFrom: test.shipFrom,
-        shipTo: test.shipTo,
+        shipDateTime: tomorrow,
+        shipFrom: shipFrom,
+        shipTo: shipTo,
         weight: {
           unit: WeightUnit.Pounds,
           value: 50.0,
@@ -100,15 +80,19 @@ export class CancelShipmentsMultiple extends Suite {
           height: 12,
           unit: LengthUnit.Inches
         }
-      }
-    });
+      });
+    }
+
+    if (defaults.shipments.length === 0) {
+      return undefined;
+    }
 
     const testParams = { shipments: [] } as CancelShipmentsMultipleTestParams;
 
     for (let i = 0; i < shipmentNumber; i++) {
       const reduced = reduceDefaultsWithConfig<
         ShipmentConfig
-      >(defaults.shipments[i], config.shipments[i] || {});
+      >(defaults.shipments[i], config.shipments[i]);
 
       testParams.shipments.push(reduced);
     }

src/core/test-app/utils/reduce-defaults-with-config.ts

@@ -7,7 +7,7 @@
  */
 export default function reduceDefaultsWithConfig<T>(
   defaultObject: T,
-  configObject: object,
+  configObject: object = {},
 ): T {
   const whiteListKeys = Object.keys(defaultObject);
 

test/specs/core/test-app/tests/cancel-shipments-multiple.spec.js

@@ -194,6 +194,46 @@ describe("The cancel multiple shipments test suite", () => {
     });
   });
 
+  describe("When a user configs a more than two shipments", () => {
+    it("should update the methodargs to reflect the new properties", () => {
+      const { appDefinition, connectArgs, staticConfigTests, options } = generateBasicAppAndConfigs();
+      appDefinition.deliveryServices.push({
+        id: "9cf1bfda-7ee4-4f03-96f6-6eab52243eee",
+        name: "Better Delivery Service",
+        code: "better_ds",
+        manifestType: "physical",
+        originCountries: ["MX"],
+        destinationCountries: ["MX"],
+        labelFormats: ["pdf"],
+        labelSizes: ["A4"],
+        packaging: [pojo.packaging()]
+      });
+
+      staticConfigTests.cancelShipments_multiple = {
+        shipments: [
+          {
+            deliveryServiceName: "Better Delivery Service"
+          },
+          {
+            deliveryServiceName: "Dummy Delivery Service"
+          },
+          {
+            deliveryServiceName: "Better Delivery Service"
+          }
+        ]
+      };
+
+      const app = new CarrierApp(appDefinition);
+      const args = { app, connectArgs, staticConfigTests, options };
+      const testSuite = new CancelShipmentsMultiple(args);
+      const tests = testSuite.tests();
+
+      expect(tests[0].title).to.include("3 shipments");
+      expect(tests[0].methodArgs[0].deliveryService.id).to.equal("9cf1bfda-7ee4-4f03-96f6-6eab52243eee");
+      expect(tests[0].methodArgs[1].deliveryService.id).to.equal("22222222-2222-2222-2222-222222222222");
+    });
+  });
+
   describe("When a delivery service has addresses that we don't have samples but user uses valid configs", () => {
     it("should generate tests", () => {
       const { appDefinition, connectArgs, staticConfigTests, options } = generateBasicAppAndConfigs();