Merge branch 'develop' into feature/SSR-105

src/layouts/vehicle-make/vehicle-make.spec.js

@@ -39,11 +39,17 @@ describe("vehicle-make.vue", () => {
     );
 
     //Assert
-    apiPromise.finally(() => {
+    return apiPromise.finally(() => {
-      expect(makeQuestion.methods.initializeComponent).toHaveBeenCalledWith(
+        try {
-        makeQuestionInitialData
+          expect(makeQuestion.methods.initializeComponent).toHaveBeenCalledWith(
-      );
+            makeQuestionInitialData
+          );
+        }
+        catch (e) {
+            throw e
+        }
     });
+
   });
 
   test("BackButtonAction triggers a router.navigate change", async () => {
@@ -68,9 +74,15 @@ describe("vehicle-make.vue", () => {
     await nextTick();
 
     //Assert
-    apiPromise.finally(() => {
+    return apiPromise.finally(() => {
-      expect(wrapper.vm.$router.navigate).toHaveBeenCalled();
+      try {
-    });
+          expect(wrapper.vm.$router.navigate).toHaveBeenCalled();
+      }
+      catch (e) {
+          throw e
+      }
+  });
+
   });
 
   test("Year set, arePagePrerequisitesValid should be true ", async () => {

src/layouts/vehicle-model/vehicle-model.spec.js

@@ -36,17 +36,23 @@ describe("vehicle-model.vue", () => {
       undefined,
       (c) => c(wrapper.vm)
     );
+
     //Assert
-    apiPromise.finally(() => {
+    return apiPromise.finally(() => {
-      expect(modelQuestion.methods.initializeComponent).toHaveBeenCalledWith(
+      try {
-        modelQuestionInitialData
+        expect(modelQuestion.methods.initializeComponent).toHaveBeenCalledWith(
-      );
+          modelQuestionInitialData
+        );
+      }
+      catch (e) {
+          throw e
+      }
     });
   });
 });
 
 describe("vehicle-model.vue", () => {
-  test("BackButtonAction triggers a router.navigateWithoutSaving change", async () => {
+  test("BackButtonAction triggers a router.navigate change", async () => {
     //Arrange
     const { wrapper, apiPromise } = setupMocks({
       pageHeaderWidgetHeaderText: "Select a model to get started",
@@ -65,12 +71,20 @@ describe("vehicle-model.vue", () => {
     );
     wrapper.vm.backButtonAction();
     await nextTick();
+
     //Assert
-    apiPromise.finally(() => {
+    return apiPromise.finally(() => {
-      expect(wrapper.vm.$router.navigate).toHaveBeenCalled();
+      try {
-      });
+          expect(wrapper.vm.$router.navigate).toHaveBeenCalled();
+      }
+      catch (e) {
+          throw e
+      }
+    });
+    
   });
 });
+
 describe("vehicle-model.vue", () => {
   test("Make set, arePagePrerequisitesValid should be true ", async () => {
     //Arrange

src/layouts/vehicle-style/vehicle-style.spec.js

@@ -43,10 +43,15 @@ describe("vehicle-style.vue", () => {
         );
 
         //Assert
-        apiPromise.finally(() => {
+        return apiPromise.finally(() => {
-            expect(styleQuestion.methods.initializeComponent).toHaveBeenCalledWith(
+            try {
-                styleQuestionInitialData
+                expect(styleQuestion.methods.initializeComponent).toHaveBeenCalledWith(
-            );
+                    styleQuestionInitialData
+                );
+            }
+            catch (e) {
+                throw e
+            }
         });
     });
 
@@ -72,8 +77,13 @@ describe("vehicle-style.vue", () => {
         await nextTick();
 
         //Assert
-        apiPromise.finally(() => {
+        return apiPromise.finally(() => {
-            expect(wrapper.vm.$router.navigate).toHaveBeenCalled();
+            try {
+                expect(wrapper.vm.$router.navigate).toHaveBeenCalled();
+            }
+            catch (e) {
+                throw e
+            }
         });
     });
 

src/layouts/vehicle-year/vehicle-year.spec.js

@@ -36,11 +36,17 @@ describe("vehicle-year.vue", () => {
     );
 
     //Assert
-    apiPromise.finally(() => {
+    return apiPromise.finally(() => {
-      expect(yearQuestion.methods.initializeComponent).toHaveBeenCalledWith(
+      try {
-        yearQuestionInitialData
+        expect(yearQuestion.methods.initializeComponent).toHaveBeenCalledWith(
-      );
+          yearQuestionInitialData
+        );
+      }
+      catch (e) {
+          throw e
+      }
     });
+
   });
 });