Merge remote-tracking branch 'origin/develop' into defect/CSR-1168

src/layouts/quote/quote.spec.js

@@ -0,0 +1,128 @@
+import { shallowMount, flushPromises } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { applicationConfig } from "@/constants/application-config";
+import quote from "@/layouts/quote/quote.vue";
+import store from "@/store";
+import * as navigateToHeritage from "@/helpers/heritage-integration/navigation-helper";
+
+jest.mock("@/store", () => ({
+    commit: jest.fn(),
+    dispatch: jest.fn(),
+}));
+
+// Mock our module for promises.
+jest.mock("@/helpers/layout-helper.js", () => ({
+    settleAllPromises: jest.fn(),
+}));
+
+// Mock fetchCmsContentForPage
+jest.mock("@/helpers/cms-content-helper", () => ({
+    fetchCmsContentForPage: jest.fn(),
+}));
+
+jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
+    navigateToHeritageFunnel: jest.fn(),
+}));
+
+jest.mock(
+    "@/store",
+    () => {
+        return {};
+    },
+    { virtual: true }
+);
+
+store.getters = {
+    order: {
+        accountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+    },
+    payment: {
+        insuranceCoverage: {},
+        isInsurance: false,
+    },
+};
+
+afterEach(() => {
+    // reset store after each test
+    store.getters = {
+        order: {
+            accountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+        },
+        payment: {
+            insuranceCoverage: {},
+            isInsurance: false,
+        },
+    };
+});
+
+describe("quote.vue", () => {
+    test("IsInsurance false should navigateWithSaving", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({
+            customMountOptions: {
+                router: {
+                    navigateWithSaving: jest.fn(),
+                },
+                route: { quote },
+            },
+        });
+
+        store.getters.payment = {
+            insuranceCoverage: {},
+            isInsurance: false,
+        };
+
+        wrapper.vm.dispatchStoreAction = jest.fn(() => {
+            return {
+                data: [],
+            };
+        });
+
+        //Act
+        await wrapper.vm.forwardButtonAction();
+
+        //Assert
+        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
+    });
+
+    test("IsInsurance true should navigateToHeritageFunnel", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({
+            customMountOptions: {
+                router: {
+                    navigateWithSaving: jest.fn(),
+                },
+                route: { quote },
+            },
+        });
+
+        store.getters.payment = {
+            insuranceCoverage: {},
+            isInsurance: true,
+        };
+
+        wrapper.vm.dispatchStoreAction = jest.fn(() => {
+            return {
+                data: [],
+            };
+        });
+
+        //Act
+        await wrapper.vm.forwardButtonAction();
+
+        //Assert
+        expect(navigateToHeritage.navigateToHeritageFunnel).toHaveBeenCalled();
+    });
+});
+
+function setupMocks({ customMountOptions }) {
+    const mountOptions = getMountOptions({
+        ...customMountOptions,
+    });
+
+    mountOptions.global.mocks["$store"] = store;
+    mountOptions["attachTo"] = document.body;
+
+    const wrapper = shallowMount(quote, mountOptions);
+    return { wrapper };
+}

src/layouts/quote/quote.vue

@@ -1,4 +1,3 @@
-digital
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -182,6 +181,7 @@ export default {
                     false
                 );
             }
+
             if (this.$store.getters.order.accountNumber != applicationConfig.CASH_ACCOUNT_NUMBER) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }
@@ -199,7 +199,15 @@ export default {
             );
             this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.selectedVaps, false);
 
-            navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+            const payment = this.$store.getters.payment;
+            if (payment.isInsurance) {
+                navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+            } else {
+                this.$router.navigateWithSaving(
+                    this.navigationScenarios.CLICKED_FORWARD_WITH_CASH,
+                    this.$route
+                );
+            }
         },
     },
     components: {

src/layouts/service-location/service-location.vue

@@ -1,11 +1,12 @@
-fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
+            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
+                ref="funnelFooter"
                 :isForwardActionDisabled="!meta.valid"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
@@ -18,11 +19,13 @@ fmg
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form } from "vee-validate";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 
 export default {
     name: "service-location",
@@ -53,14 +56,19 @@ export default {
             return true;
         },
 
-        backButtonAction() {},
+        backButtonAction() {
-        forwardButtonAction() {},
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+        },
+        forwardButtonAction() {
+            navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+        },
     },
     components: {
         funnelHeader,
         funnelFooter,
         funnelSubHeader,
         Form,
+        loadingModal,
     },
 };
 </script>

src/router/router-constants/fmgPage-values.js

@@ -14,6 +14,7 @@ const fmgPageValues = {
     ESTIMATE: "estimate",
     ADDRESS_VEHICLES: "address-vehicles",
     QUOTE: "quote",
+    SERVICE_LOCATION: "service-location",
     HERITAGE: "heritage",
 };
 

src/router/router-constants/navigation-scenarios.js

@@ -10,6 +10,7 @@ const navigationScenarios = {
     // General
     CLICKED_BACK: "CLICKED_BACK",
     CLICKED_FORWARD: "CLICKED_FORWARD",
+    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
 
     // YMMS
     SELECTED_YEAR: "SELECTED_YEAR",

src/router/router-constants/routing-table.js

@@ -407,6 +407,19 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.SERVICE_LOCATION,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
             ],
         },
     ];