From bb64ecde29478de7932ea9b52c965aeb0415d774 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 8 Nov 2022 11:36:07 -0500
Subject: [PATCH 01/22] CSR-748 Remove loading modal from vin and question
 pages

---
 src/layouts/address-lookup/address-lookup.spec.js           | 1 -
 src/layouts/address-lookup/address-lookup.vue               | 3 ---
 src/layouts/address-vehicles/address-vehicles.spec.js       | 1 -
 src/layouts/address-vehicles/address-vehicles.vue           | 3 ---
 src/layouts/capability-questions/capability-questions.vue   | 3 ---
 .../license-plate-lookup/license-plate-lookup.spec.js       | 1 -
 src/layouts/license-plate-lookup/license-plate-lookup.vue   | 3 ---
 src/layouts/molding-questions/molding-questions.vue         | 3 ---
 src/layouts/part-questions/part-questions.vue               | 3 ---
 src/layouts/vehicle-parts/vehicle-parts.spec.js             | 2 --
 src/layouts/vehicle-parts/vehicle-parts.vue                 | 3 ---
 src/layouts/vin-lookup/vin-lookup.vue                       | 3 ---
 src/mixins/vehicle-questions-mixin.js                       | 1 -
 src/mixins/vehicle-questions-mixin.spec.js                  | 6 ------
 src/mixins/vin-pages-mixin.spec.js                          | 5 -----
 15 files changed, 41 deletions(-)

diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js
index bd8689298..21ac345ee 100644
--- a/src/layouts/address-lookup/address-lookup.spec.js
+++ b/src/layouts/address-lookup/address-lookup.spec.js
@@ -724,7 +724,6 @@ function setupMocks({
     wrapper.vm.setCmsContent = jest.fn();
     wrapper.vm.$refs.funnelFooter.updateButtonText = jest.fn();
     wrapper.vm.$refs.funnelFooter.removeLoader = jest.fn();
-    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
 
     return { wrapper };
 }
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index f04797d08..17d7012f1 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -6,7 +6,6 @@
         v-slot="{ meta }"
         autocomplete="off">
         <div class="page-container-grouped-styles">
-            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
             <vehicleBanner
                 cmsWidgetName="VehicleBannerWidget"
@@ -89,7 +88,6 @@ import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-he
 import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 
 import { Form, defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
@@ -458,7 +456,6 @@ export default {
         customerQuestions,
         textboxQuestion,
         alert,
-        loadingModal,
         Form,
     },
 };
diff --git a/src/layouts/address-vehicles/address-vehicles.spec.js b/src/layouts/address-vehicles/address-vehicles.spec.js
index e3ce48a32..33718ff32 100644
--- a/src/layouts/address-vehicles/address-vehicles.spec.js
+++ b/src/layouts/address-vehicles/address-vehicles.spec.js
@@ -149,7 +149,6 @@ describe("addressVehicles.vue", () => {
         // Arrange
         const { wrapper } = setupMocks({});
         wrapper.vm.$refs.funnelFooter.updateButtonText = jest.fn();
-        wrapper.vm.$refs.loadingModal.showModal = jest.fn();
         navigateToHeritage.navigateToHeritageFunnel = jest.fn();
 
         // Act
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 8ae84430e..4babd7a33 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
-            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
                 cmsWidgetName="VehicleBannerWidget"
@@ -53,7 +52,6 @@ import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import alert from "@/ux-components/alert/alert";
 import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -239,7 +237,6 @@ export default {
         alert,
         funnelFooter,
         addressVehiclesQuestion,
-        loadingModal,
     },
 };
 </script>
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 9384a060b..281b3918e 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles capability-questions">
-            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
                 cmsWidgetName="VehicleBannerWidget"
@@ -43,7 +42,6 @@ import alert from "@/ux-components/alert/alert";
 import questionChain from "@/common-components/question-chain/question-chain";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -504,7 +502,6 @@ export default {
         questionChain,
         funnelSubHeader,
         funnelFooter,
-        loadingModal,
         Form,
     },
 };
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
index 5c562d002..166385426 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
@@ -612,7 +612,6 @@ function setupMocks({
     wrapper.vm.getCmsContent = jest.fn().mockImplementation(() => "");
     wrapper.vm.$refs.funnelFooter.updateButtonText = jest.fn();
     wrapper.vm.$refs.funnelFooter.removeLoader = jest.fn();
-    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
 
     return { wrapper, apiPromise };
 }
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 2acec386d..5a384c4c8 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
-            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
                 cmsWidgetName="VehicleBannerWidget"
@@ -98,7 +97,6 @@ import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 import textBlock from "@/common-components/text-block/text-block";
 
 // Supporting files
@@ -390,7 +388,6 @@ export default {
         funnelSubHeader,
         textboxQuestion,
         alert,
-        loadingModal,
         textBlock,
         Form,
     },
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 1b8b6da43..a45df25b7 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles molding-questions">
-            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
                 cmsWidgetName="VehicleBannerWidget"
@@ -44,7 +43,6 @@ import alert from "@/ux-components/alert/alert";
 import questionChain from "@/common-components/question-chain/question-chain";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -466,7 +464,6 @@ export default {
         questionChain,
         funnelSubHeader,
         funnelFooter,
-        loadingModal,
         Form,
     },
 };
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index f9eae9311..d72d84c06 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles part-questions">
-            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
                 cmsWidgetName="VehicleBannerWidget"
@@ -44,7 +43,6 @@ import alert from "@/ux-components/alert/alert";
 import questionChain from "@/common-components/question-chain/question-chain";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -453,7 +451,6 @@ export default {
         questionChain,
         funnelSubHeader,
         funnelFooter,
-        loadingModal,
         Form,
     },
 };
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index f0982057b..7ef65c3a9 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -472,7 +472,6 @@ describe("vehicle-parts.vue", () => {
         });
 
         wrapper.vm.$store.commit = jest.fn();
-        wrapper.vm.$refs.loadingModal.showModal = jest.fn();
 
         wrapper.setData({
             selectedGlassParts: { "Rear-Stationary": { partNumber: "DB12209GTYN" } },
@@ -529,7 +528,6 @@ function setupMocks({ pageHeaderWidgetHeaderText = {}, mountOptionsMockData = {}
 
     wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent;
     wrapper.vm.$refs.funnelFooter.removeLoader = jest.fn();
-    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
     // wrapper.vm.$refs.onSubmit = jest.fn();
     // wrapper.vm.$refs.onInvalidSubmit = jest.fn();
 
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index b50fcc956..e59b77804 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
         <div class="page-container-grouped-styles vehicle-parts">
-            <loadingModal ref="loadingModal" />
             <funnelHeader ref="funnelHeader" cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
                 ref="vehicleBanner"
@@ -50,7 +49,6 @@ import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
 import alert from "@/ux-components/alert/alert";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
@@ -223,7 +221,6 @@ export default {
         funnelSubHeader,
         funnelFooter,
         alert,
-        loadingModal,
     },
 };
 </script>
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 429075a40..7c356e793 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
-            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
                 cmsWidgetName="VehicleBannerWidget"
@@ -116,7 +115,6 @@ import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-he
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 import textBlock from "@/common-components/text-block/text-block";
 
 // Supporting files
@@ -459,7 +457,6 @@ export default {
         textboxQuestion,
         alert,
         vinInformation,
-        loadingModal,
         textBlock,
         Form,
     },
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 440916f5a..6074f959d 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -243,7 +243,6 @@ export default {
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                self.$refs.loadingModal.showModal();
                 navigateToHeritageFunnel();
             }
         },
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 6f14cebdd..557967b2a 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -4,7 +4,6 @@ import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helpe
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeMutations } from "@/constants/store-mutations";
 import { storeActions } from "@/constants/store-actions";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
 import { getters } from "@/store";
@@ -1437,7 +1436,6 @@ describe("vehicle-questions-mixin", () => {
                     storeMutations.UPDATE_GLASS_PARTS,
                     collectedGlassParts
                 );
-                expect(wrapper.vm.$refs.loadingModal.showModal).toHaveBeenCalledTimes(1);
                 expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
             });
         });
@@ -1566,14 +1564,10 @@ function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP }) {
     // store.dispatch = jest.fn();
 
     const mockVehicleQuestionComponent = {
-        components: { loadingModal },
-        template: '<loadingModal ref="loadingModal" />',
         mixins: [vehicleQuestionsMixin, baseMixin.baseMixin],
     };
 
     const wrapper = shallowMount(mockVehicleQuestionComponent, mocks);
 
-    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
-
     return { wrapper };
 }
diff --git a/src/mixins/vin-pages-mixin.spec.js b/src/mixins/vin-pages-mixin.spec.js
index 340cb16fa..ce9c267f9 100644
--- a/src/mixins/vin-pages-mixin.spec.js
+++ b/src/mixins/vin-pages-mixin.spec.js
@@ -2,7 +2,6 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { shallowMount } from "@vue/test-utils";
 import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
@@ -62,14 +61,10 @@ function setupMocks({ partsOrQuestions = [] }) {
     });
 
     const mockVinComponent = {
-        components: { loadingModal },
-        template: '<loadingModal ref="loadingModal" />',
         mixins: [vinPagesMixin, baseMixin.baseMixin],
     };
 
     const wrapper = shallowMount(mockVinComponent, mocks);
 
-    wrapper.vm.$refs.loadingModal.showModal = jest.fn();
-
     return { wrapper };
 }

From 99166d28838ef93fdf4d9d30f47949aab49e3c29 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 8 Nov 2022 13:33:26 -0500
Subject: [PATCH 02/22] CSR-748 Handle going into concept quote page

---
 src/layouts/estimate/estimate.spec.js         | 79 +++++++++++--------
 src/layouts/estimate/estimate.vue             | 11 +--
 .../vehicle-parts/vehicle-parts.spec.js       |  6 +-
 src/mixins/vehicle-questions-mixin.js         |  2 +-
 src/mixins/vehicle-questions-mixin.spec.js    | 16 +++-
 .../router-constants/navigation-scenarios.js  |  1 +
 src/router/router-constants/routing-table.js  | 20 +++++
 7 files changed, 91 insertions(+), 44 deletions(-)

diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index 3a5cee1ed..87c911232 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -39,32 +39,59 @@ describe("estimate.vue", () => {
         ]);
     });
 
-    test("After selecting provide my home address on ForwardButtonAction triggers a router.navigateWithSaving", async () => {
-        //Arrange
-        const { wrapper } = setupMocks({});
-        await wrapper.setData({
-            selectedVinLookupMethod: vinLookupMethodSelections.HOMEADDRESS,
+    describe("move forward", () => {
+        test("After selecting provide my home address on ForwardButtonAction triggers a router.navigateWithSaving", async () => {
+            //Arrange
+            const { wrapper } = setupMocks({});
+            await wrapper.setData({
+                selectedVinLookupMethod: vinLookupMethodSelections.HOMEADDRESS,
+            });
+
+            //Act
+            wrapper.vm.forwardButtonAction();
+
+            //Assert
+            expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
         });
 
-        //Act
-        wrapper.vm.forwardButtonAction();
+        test("After selecting provide my manual vin on ForwardButtonAction triggers a router.navigateWithSaving", async () => {
+            //Arrange
+            const { wrapper } = setupMocks({});
+            await wrapper.setData({
+                selectedVinLookupMethod: vinLookupMethodSelections.MANUALVIN,
+            });
 
-        //Assert
-        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
-    });
+            //Act
+            await wrapper.vm.forwardButtonAction();
 
-    test("After selecting provide my manual vin on ForwardButtonAction triggers a router.navigateWithSaving", async () => {
-        //Arrange
-        const { wrapper } = setupMocks({});
-        await wrapper.setData({
-            selectedVinLookupMethod: vinLookupMethodSelections.MANUALVIN,
+            //Assert
+            expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
         });
 
-        //Act
-        await wrapper.vm.forwardButtonAction();
+        test("Provide my license plate on ForwardButtonAction triggers a router.navigateWithSaving", async () => {
+            //Arrange
+            const { wrapper } = setupMocks({});
+            await wrapper.setData({
+                selectedVinLookupMethod: vinLookupMethodSelections.LICENSEPLATE,
+            });
 
-        //Assert
-        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
+            //Act
+            wrapper.vm.forwardButtonAction();
+
+            //Assert
+            expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
+        });
+
+        // TODO KO
+        describe("isRepair", () => {
+            test.todo("is repair and zip codes are valid/serviceable => go to quote page");
+            test.todo(
+                "is repair and zip codes are valid but not serviceable => show correct alert, remove loader"
+            );
+            test.todo(
+                "is repair and zip codes are not valid/serviceable => show correct alert, remove loader"
+            );
+        });
     });
 
     test("BackButtonAction triggers a router.navigateWithoutSaving change", async () => {
@@ -85,20 +112,6 @@ describe("estimate.vue", () => {
         expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalled();
     });
 
-    test("Provide my license plate on ForwardButtonAction triggers a router.navigateWithSaving", async () => {
-        //Arrange
-        const { wrapper } = setupMocks({});
-        await wrapper.setData({
-            selectedVinLookupMethod: vinLookupMethodSelections.LICENSEPLATE,
-        });
-
-        //Act
-        wrapper.vm.forwardButtonAction();
-
-        //Assert
-        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
-    });
-
     describe("arePagePrerequisitesValid", () => {
         beforeEach(() => {
             store.commit(storeMutations.UPDATE_IS_REPAIR, false);
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index d8cfb4d47..3e84b7678 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -1,7 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
-            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
@@ -91,7 +90,6 @@ import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-he
 import buttonQuestion from "@/common-components/button-question/button-question";
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 import textBlock from "@/common-components/text-block/text-block";
 
 //Supporting Files
@@ -172,7 +170,9 @@ export default {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
+            console.log("forwardButtonAction")
             if (this.isRepair) {
+                console.log("REPAIRRR")
                 const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
                 //todo: validation
                 await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);
@@ -197,8 +197,10 @@ export default {
                 }
                 this.displayNonServiceableZipAlert = false;
 
-                this.$refs.loadingModal.showModal();
-                navigateToHeritageFunnel();
+                return this.$router.navigateWithSaving(
+                    this.navigationScenarios.HAS_NO_QUESTIONS,
+                    this.$route
+                );
             }
 
             if (this.selectedVinLookupMethod === vinLookupMethodSelections.MANUALVIN) {
@@ -256,7 +258,6 @@ export default {
         Form,
         alert,
         textboxQuestion,
-        loadingModal,
         textBlock,
     },
 };
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index 7ef65c3a9..e814daeee 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -467,7 +467,6 @@ describe("vehicle-parts.vue", () => {
                     getters: store.getters,
                     commit: store.commit,
                 },
-                navigateToHeritageFunnel: jest.fn(),
             },
         });
 
@@ -489,7 +488,10 @@ describe("vehicle-parts.vue", () => {
 
         //Assert
         expect(wrapper.vm.$store.commit).toHaveBeenCalled();
-        expect(navigateToHeritageFunnel).toHaveBeenCalled();
+        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+            navigationScenarios.HAS_NO_MORE_QUESTIONS,
+            { query: { fmgPage: "vehicle-parts" } }
+        );
     });
 });
 
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 6074f959d..5574699bd 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -243,7 +243,7 @@ export default {
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                navigateToHeritageFunnel();
+                self.$router.navigateWithSaving(self.navigationScenarios.HAS_NO_MORE_QUESTIONS, self.$route);
             }
         },
         backButtonAction() {
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 557967b2a..ff710d61b 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -1295,7 +1295,7 @@ describe("vehicle-questions-mixin", () => {
             });
         });
 
-        describe("should go to heritage funnel", () => {
+        describe("should go to quote page", () => {
             test("single glass location selected, has no part questions and has one part => go to heritage funnel", async () => {
                 // Arrange
                 const partsOrQuestions = [
@@ -1330,7 +1330,12 @@ describe("vehicle-questions-mixin", () => {
                 await wrapper.vm.navigateForward(partsOrQuestions);
 
                 // Assert
-                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                    navigationScenarios.HAS_NO_MORE_QUESTIONS,
+                    { query: { fmgPage: "vin-lookup" } }
+                );
+                expect(wrapper.vm.$router.navigateWithoutSaving).not.toHaveBeenCalled();
             });
 
             test("multiple glass locations selected, each has one part and no part questions => go to heritage funnel", async () => {
@@ -1436,7 +1441,12 @@ describe("vehicle-questions-mixin", () => {
                     storeMutations.UPDATE_GLASS_PARTS,
                     collectedGlassParts
                 );
-                expect(navigateToHeritageFunnel).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
+                expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+                    navigationScenarios.HAS_NO_MORE_QUESTIONS,
+                    { query: { fmgPage: "vin-lookup" } }
+                );
+                expect(wrapper.vm.$router.navigateWithoutSaving).not.toHaveBeenCalled();
             });
         });
     });
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 91c657cac..47a8681fc 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -18,6 +18,7 @@ const navigationScenarios = {
     SELECTED_MANUAL_VIN: "SELECTED_MANUAL_VIN",
     SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
     SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
+    HAS_NO_QUESTIONS: "HAS_NO_QUESTIONS",
 
     // Question pages
     HAS_PART_QUESTIONS: "HAS_PART_QUESTIONS",
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index e1baa72ce..8dc65c3b9 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -109,6 +109,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
                 },
+                {
+                    scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
             ],
         },
         {
@@ -138,6 +142,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
                 },
+                {
+                    scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
             ],
         },
         {
@@ -171,6 +179,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
                 },
+                {
+                    scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
             ],
         },
         {
@@ -200,6 +212,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.HAS_CAPABILITY_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
                 },
+                {
+                    scenario: navigationScenarios.HAS_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
             ],
         },
         {
@@ -221,6 +237,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.SELECTED_HOME_ADDRESS,
                     destinationFmgPageValue: fmgPageValues.ADDRESS_LOOKUP,
                 },
+                {
+                    scenario: navigationScenarios.HAS_NO_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
             ],
         },
         {

From 8075df60adca32c8e0ebca2ea2087a9b45787538 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Tue, 8 Nov 2022 15:09:14 -0500
Subject: [PATCH 03/22] CSR-748 Handle back buttons

---
 src/layouts/estimate/estimate.vue             |  1 -
 src/layouts/quote/quote.vue                   |  4 ++
 src/mixins/vehicle-questions-mixin.js         | 25 ++++++---
 .../router-constants/navigation-scenarios.js  |  6 ++-
 src/router/router-constants/routing-table.js  | 53 +++++++++++++++++--
 src/store/index.js                            | 20 +------
 6 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 3e84b7678..99362c8fa 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -170,7 +170,6 @@ export default {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {
-            console.log("forwardButtonAction")
             if (this.isRepair) {
                 console.log("REPAIRRR")
                 const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 63b87fbe7..00e7f4e87 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -56,6 +56,7 @@ import servicePackageQuestion from "./service-package-question/service-package-q
 import textBlock from "@/common-components/text-block/text-block";
 import modal from "@/common-components/modal/modal";
 import baseMixin from "@/mixins/base-mixin.js";
+import vehicleQuestionsMixin from "../../mixins/vehicle-questions-mixin";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { Form } from "vee-validate";
@@ -155,6 +156,9 @@ export default {
                     : null;
             }
         },
+        backButtonAction() {
+            vehicleQuestionsMixin.methods.backButtonAction(this);
+        }
     },
     components: {
         funnelHeader,
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 5574699bd..92821da96 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -243,22 +243,31 @@ export default {
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                self.$router.navigateWithSaving(self.navigationScenarios.HAS_NO_MORE_QUESTIONS, self.$route);
+                self.$router.navigateWithSaving(
+                    self.navigationScenarios.HAS_NO_MORE_QUESTIONS,
+                    self.$route
+                );
             }
         },
-        backButtonAction() {
+        // Can't use `this` because navigateForward is also called from quote
+        backButtonAction(vm) {
+            const self = vm ?? this;
             const partsOrQuestions = (
-                this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) ??
-                this.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS)
+                self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) ??
+                self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ?? 
+                self.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS) ?? 
+                self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) 
             )?.partsOrQuestions;
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
             const hasGlassLocationWithMultipleParts =
                 this.hasGlassLocationWithMultipleParts(partsOrQuestions);
             const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
             const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
-            let backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_NO_QUESTIONS;
+            let backNavigationScenario = self.$store.getters.vehicle.vin
+                ? navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS
+                : navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS;
 
-            const currentPage = this.$route.query.fmgPage;
+            const currentPage = self.$route.query.fmgPage;
             if (
                 hasCapabilityQuestions &&
                 this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)
@@ -282,7 +291,9 @@ export default {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
 
-            this.$router.navigateWithoutSaving(backNavigationScenario, this.$route);
+            console.log({ backNavigationScenario });
+
+            self.$router.navigateWithoutSaving(backNavigationScenario, self.$route);
         },
     },
 };
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 47a8681fc..809d74c9b 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -26,10 +26,14 @@ const navigationScenarios = {
     HAS_MOLDING_QUESTIONS: "HAS_MOLDING_QUESTIONS",
     HAS_CAPABILITY_QUESTIONS: "HAS_CAPABILITY_QUESTIONS",
     HAS_NO_MORE_QUESTIONS: "HAS_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_NO_QUESTIONS: "CLICKED_BACK_WITH_NO_QUESTIONS",
     CLICKED_BACK_WITH_PART_QUESTIONS: "CLICKED_BACK_WITH_PART_QUESTIONS",
     CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE: "CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE",
     CLICKED_BACK_WITH_MOLDING_QUESTIONS: "CLICKED_BACK_WITH_MOLDING_QUESTIONS",
+    CLICKED_BACK_WITH_CAPABILITY_QUESTIONS: "CLICKED_BACK_WITH_CAPABILITY_QUESTIONS",
+
+    // Quote
+    CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
+    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS"
 };
 
 export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 8dc65c3b9..5c76ef5e1 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -247,9 +247,13 @@ const routingTable = function (store) {
             fmgPageValue: fmgPageValues.PART_QUESTIONS,
             maps: [
                 {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_QUESTIONS,
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
                 {
                     scenario: navigationScenarios.HAS_MULTIPLE_PARTS_TO_CHOOSE,
                     destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
@@ -280,9 +284,13 @@ const routingTable = function (store) {
                     destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
                 },
                 {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_QUESTIONS,
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
                 {
                     scenario: navigationScenarios.HAS_MOLDING_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
@@ -301,9 +309,13 @@ const routingTable = function (store) {
             fmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
             maps: [
                 {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_QUESTIONS,
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
@@ -326,9 +338,13 @@ const routingTable = function (store) {
             fmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
             maps: [
                 {
-                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_QUESTIONS,
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
@@ -347,6 +363,35 @@ const routingTable = function (store) {
                 },
             ],
         },
+        {
+            fmgPageValue: fmgPageValues.QUOTE,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MULTIPLE_PARTS_TO_CHOOSE,
+                    destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_MOLDING_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.MOLDING_QUESTIONS,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
+                    destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
+                },
+            ],
+        },
     ];
 };
 
diff --git a/src/store/index.js b/src/store/index.js
index 34ec8a8a9..d7b13415f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -362,21 +362,6 @@ export const mutations = {
     updateTriggeredSiteEntry(state, wasSiteEntryTriggered) {
         state.applicationUser.triggeredSiteEntry = wasSiteEntryTriggered;
     },
-    // START GA click event mutations
-    // updateCurrentlySelectedValues(state, groupName, value) {
-    //   state.gaClickInformation.currentlySelectedValues[groupName] = value;
-    // },
-    // updateFiredGaClickEventValues(state, groupName, value) {
-    //   state.gaClickInformation.firedGaClickEventValues[groupName] = value;
-    // },
-    // updateLastFocusedInputGroup(state, groupName) {
-    //   state.gaClickInformation.lastFocusedInputGroup = groupName;
-    // },
-    // updateWasLastFocusedInputMultiselect(state, wasLastFocusedInputMultiselect) {
-    //   state.gaClickInformation.wasLastFocusedInputMultiselect =
-    //     wasLastFocusedInputMultiselect;
-    // },
-    // END GA click event mutations
 };
 
 // Export Getters
@@ -393,10 +378,10 @@ export const getters = {
     eventBus: (state) => state.applicationUser.eventBus,
     damage: (state) => state.order.damage,
     hasAnyNonWindshieldGlassParts: (state) => {
-        const nonWindshieldItems = state.order.damage.glassToReplace.filter(
+        const nonWindshieldItems = state.order.damage.glassToReplace?.filter(
             (glassToReplace) => glassToReplace.glassLocation != "Windshield"
         );
-        return !!nonWindshieldItems.length;
+        return !!nonWindshieldItems?.length;
     },
     lineItems: (state) => state.order.lineItems,
     pageData: (state) => (page) => {
@@ -465,7 +450,6 @@ export const getters = {
         state.applicationUser.experiments
             .map((x) => x.settings)
             .reduce((r, c) => Object.assign(r, c), {}) ?? {},
-    // gaClickInformation: (state) => state.gaClickInformation,
 };
 
 function getNonFalseValuesOfPropertyInArrayOfObjects(array, propertyName) {

From b402894b0bde7d74ff7351493f1bc6eac5647740 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 9 Nov 2022 08:36:28 -0500
Subject: [PATCH 04/22] CSR-748 Fix tests

---
 src/layouts/estimate/estimate.vue             |  1 -
 .../vehicle-parts/vehicle-parts.spec.js       | 18 +++++++++----
 src/mixins/vehicle-questions-mixin.spec.js    | 26 ++++++++++++++-----
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 99362c8fa..50e9bd3fe 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -171,7 +171,6 @@ export default {
         },
         async forwardButtonAction() {
             if (this.isRepair) {
-                console.log("REPAIRRR")
                 const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
                 //todo: validation
                 await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index e814daeee..864e8b865 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -232,6 +232,9 @@ describe("vehicle-parts.vue", () => {
                         lineItems: {
                             glassParts: null,
                         },
+                        vehicle: {
+                            vin: "MY_VIN"
+                        }
                     },
                 },
             },
@@ -275,6 +278,9 @@ describe("vehicle-parts.vue", () => {
                         lineItems: {
                             glassParts: null,
                         },
+                        vehicle: {
+                            vin: "MY_VIN"
+                        }
                     },
                 },
             },
@@ -292,7 +298,7 @@ describe("vehicle-parts.vue", () => {
 
         //Assert
         expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
-            navigationScenarios.CLICKED_BACK_WITH_NO_QUESTIONS,
+            navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
             wrapper.vm.$route
         );
     });
@@ -488,10 +494,12 @@ describe("vehicle-parts.vue", () => {
 
         //Assert
         expect(wrapper.vm.$store.commit).toHaveBeenCalled();
-        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
-            navigationScenarios.HAS_NO_MORE_QUESTIONS,
-            { query: { fmgPage: "vehicle-parts" } }
-        );
+
+        // TODO KO UNCOMMENT FOR QUOTE PAGES RELEASE
+        // expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
+        //     navigationScenarios.HAS_NO_MORE_QUESTIONS,
+        //     { query: { fmgPage: "vehicle-parts" } }
+        // );
     });
 });
 
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index ff710d61b..cabee328d 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -4,7 +4,6 @@ import { setupMocksForJsFiles, getMountOptions } from "@/helpers/unit-test-helpe
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import { storeMutations } from "@/constants/store-mutations";
 import { storeActions } from "@/constants/store-actions";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { navigationScenarios } from "../router/router-constants/navigation-scenarios";
 import { getters } from "@/store";
 
@@ -1295,7 +1294,8 @@ describe("vehicle-questions-mixin", () => {
             });
         });
 
-        describe("should go to quote page", () => {
+        // TODO KO UNSKIP FOR QUOTE MVP
+        describe.skip("should go to quote page", () => {
             test("single glass location selected, has no part questions and has one part => go to heritage funnel", async () => {
                 // Arrange
                 const partsOrQuestions = [
@@ -1452,16 +1452,21 @@ describe("vehicle-questions-mixin", () => {
     });
 
     describe("backButtonAction", () => {
-        test("current page is quote and there are no questions => go to vin-lookup", () => {
+        // TODO KO
+        test.todo(
+            "current page is quote, there are no questions, and we don't have their vin => go to estimate"
+        );
+
+        test("current page is quote, there are no questions, and we have their vin => go to vin-lookup", () => {
             // Arrange
-            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE });
+            const { wrapper } = setupMocks({ fmgPage: fmgPageValues.QUOTE, hasVin: true });
 
             // Act
             wrapper.vm.backButtonAction();
 
             // Assert
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
-                navigationScenarios.CLICKED_BACK_WITH_NO_QUESTIONS,
+                navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS,
                 { query: { fmgPage: fmgPageValues.QUOTE } }
             );
         });
@@ -1535,7 +1540,7 @@ describe("vehicle-questions-mixin", () => {
     });
 });
 
-function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP }) {
+function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP, hasVin, carId }) {
     const baseMixin = setupMocksForJsFiles({
         actionList: [
             {
@@ -1562,7 +1567,13 @@ function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP }) {
         store: {
             commit: jest.fn(),
             dispatch: jest.fn(),
-            getters: getters,
+            getters: {
+                ...getters,
+                vehicle: {
+                    vin: hasVin ? "VIN" : undefined,
+                    carId: carId,
+                },
+            },
         },
         route: {
             query: {
@@ -1574,6 +1585,7 @@ function setupMocks({ fmgPage = fmgPageValues.VIN_LOOKUP }) {
     // store.dispatch = jest.fn();
 
     const mockVehicleQuestionComponent = {
+        template: "<div />",
         mixins: [vehicleQuestionsMixin, baseMixin.baseMixin],
     };
 

From 10c16752455e262e4ae1b111009448261cbf96e8 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 9 Nov 2022 09:12:40 -0500
Subject: [PATCH 05/22] CSR-748 Add temp heritage button

---
 .../funnel-footer/funnel-footer.vue               |  4 ++++
 .../capability-questions/capability-questions.vue |  5 ++++-
 .../molding-questions/molding-questions.vue       |  5 ++++-
 src/layouts/part-questions/part-questions.vue     |  5 ++++-
 src/layouts/vehicle-parts/vehicle-parts.vue       |  5 ++++-
 src/layouts/vin-lookup/vin-lookup.vue             |  1 +
 src/mixins/vehicle-questions-mixin.js             | 15 +++++++++++++--
 src/mixins/vin-pages-mixin.js                     | 13 ++++++++++++-
 8 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue
index 2a6119681..43b471e81 100644
--- a/src/common-components/funnel-footer/funnel-footer.vue
+++ b/src/common-components/funnel-footer/funnel-footer.vue
@@ -15,6 +15,10 @@
                     data-bs-target="#footerModal"
                     data-bs-dismiss="modal" />
             </div>
+            <!-- TODO KO DELETE FOR QUOTE MVP -->
+            <div class="col-auto">
+                <button @click="$emit('tempButtonClicked')">Heritage</button>
+            </div>
             <div v-if="!isBackButtonHidden" class="col-auto link-col py-1 text-break">
                 <textLink
                     linkType="navigation"
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 281b3918e..ed16dab33 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -27,6 +27,7 @@
                     ref="funnelFooter"
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"
+                    @tempButtonClicked="() => handleTempButtonClicked(this)"
                     @back-clicked="backButtonAction"
                     @ForwardClicked="forwardButtonAction" />
             </div>
@@ -191,7 +192,9 @@ export default {
                 ).parts = partFromCapabilityQuestionAnswer;
             }
 
-            this.navigateForward(partsOrQuestions);
+            // this.navigateForward(partsOrQuestions);
+            // TODO KO delete after quote MVP
+            this.navigateForward(partsOrQuestions, null, this.shouldGoToHeritageQuote);
         },
         handleAnswerUpdates(answer) {
             // only runs when all questions in a question-chain have been answered
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index a45df25b7..89b617b3c 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -28,6 +28,7 @@
                     ref="funnelFooter"
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"
+                    @tempButtonClicked="() => handleTempButtonClicked(this)"
                     @back-clicked="backButtonAction"
                     @ForwardClicked="forwardButtonAction" />
             </div>
@@ -168,7 +169,9 @@ export default {
                 ];
             }
 
-            this.navigateForward(partsOrQuestions);
+            // this.navigateForward(partsOrQuestions);
+            // TODO KO delete after quote MVP
+            this.navigateForward(partsOrQuestions, null, this.shouldGoToHeritageQuote);
         },
         handleAnswerUpdates(answer) {
             // only runs when all questions in a question-chain have been answered
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index d72d84c06..e0dda08fc 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -28,6 +28,7 @@
                     ref="funnelFooter"
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"
+                    @tempButtonClicked="() => handleTempButtonClicked(this)"
                     @back-clicked="backButtonAction"
                     @ForwardClicked="forwardButtonAction" />
             </div>
@@ -155,7 +156,9 @@ export default {
 
             const glassPiecePartsForStore = partsLookup.data.glassPieceParts;
 
-            this.navigateForward(glassPiecePartsForStore);
+            // this.navigateForward(glassPiecePartsForStore);
+            // TODO KO delete after quote MVP
+            this.navigateForward(glassPiecePartsForStore, null, this.shouldGoToHeritageQuote);
         },
         handleAnswerUpdates(answer) {
             // only runs when all questions in a question-chain have been answered
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index e59b77804..18a076b70 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -34,6 +34,7 @@
                     cmsWidgetName="FunnelFooterWidget"
                     ref="funnelFooter"
                     :isForwardActionDisabled="isForwardActionDisabled"
+                    @tempButtonClicked="() => handleTempButtonClicked(this)"
                     @back-clicked="backButtonAction"
                     @ForwardClicked="forwardButtonAction" />
             </div>
@@ -186,8 +187,10 @@ export default {
                 false
             );
 
+            // TODO KO delete after quote MVP
+            this.navigateForward(matchedParts, null, this.shouldGoToHeritageQuote);
             // Navigate to the next page
-            this.navigateForward(matchedParts);
+            // this.navigateForward(matchedParts);
         },
 
         LoadInitialPartsData() {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 7c356e793..d2934fe3c 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -99,6 +99,7 @@
                     cmsWidgetName="FunnelFooterWidget"
                     ref="funnelFooter"
                     :isForwardActionDisabled="!meta.valid"
+                    @tempButtonClicked="() => handleTempButtonClicked(this)"
                     @back-clicked="backButtonAction"
                     @ForwardClicked="forwardButtonAction" />
             </div>
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 92821da96..a790d3ccf 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -8,6 +8,11 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 
 export default {
+    data() {        // TODO KO DELETE AFTER QUOTE MVP
+        return {
+            shouldGoToHeritageQuote: false,
+        };
+    },
     methods: {
         hasPartQuestions(partsOrQuestions) {
             return partsOrQuestions?.some((pq) => pq.partQuestions?.length > 0);
@@ -149,8 +154,9 @@ export default {
 
             return glass;
         },
+        // TODO KO Delete `shouldGoToHeritageQuote`
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
-        async navigateForward(partsOrQuestions, vm) {
+        async navigateForward(partsOrQuestions, vm, shouldGoToHeritageQuote) {
             const self = vm ?? this;
             const currentPage = self.$route.query.fmgPage;
 
@@ -243,7 +249,7 @@ export default {
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                self.$router.navigateWithSaving(
+                shouldGoToHeritageQuote ? navigateToHeritageFunnel() : self.$router.navigateWithSaving(
                     self.navigationScenarios.HAS_NO_MORE_QUESTIONS,
                     self.$route
                 );
@@ -295,5 +301,10 @@ export default {
 
             self.$router.navigateWithoutSaving(backNavigationScenario, self.$route);
         },
+        // TODO KO delete this after quote mvp
+        async handleTempButtonClicked(vm) {
+            this.shouldGoToHeritageQuote = true;
+            // await vm.forwardButtonAction();
+        },
     },
 };
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index e6e41aad5..a3cd2ecb2 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -4,6 +4,11 @@ import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 
 export default {
+    data() {        // TODO KO DELETE AFTER QUOTE MVP
+        return {
+            shouldGoToHeritageQuote: false,
+        };
+    },
     methods: {
         async navigateForwardWithSingleCarMatch() {
             // If we have not already saved a session, we need to save one now before the lengthy call to getPartsOrQuestions
@@ -14,7 +19,13 @@ export default {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS);
             const partsOrQuestions = result.data.partsOrQuestions;
 
-            vehicleQuestionsMixin.methods.navigateForward(partsOrQuestions, this);
+            // TODO KO delete `this.shouldGoToHeritageQuote`
+            vehicleQuestionsMixin.methods.navigateForward(partsOrQuestions, this, this.shouldGoToHeritageQuote);
+        },
+        // TODO KO delete this after quote mvp
+        async handleTempButtonClicked(vm) {
+            this.shouldGoToHeritageQuote = true;
+            await vm.forwardButtonAction();
         },
     },
 };

From 5e5fbc5f0e5e04ebd6746cf57f24a4b380628326 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 9 Nov 2022 10:05:43 -0500
Subject: [PATCH 06/22] CSR-748 Add heritage button

---
 src/layouts/vehicle-parts/vehicle-parts.vue | 2 +-
 src/mixins/vehicle-questions-mixin.js       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 18a076b70..09536fb82 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -188,7 +188,7 @@ export default {
             );
 
             // TODO KO delete after quote MVP
-            this.navigateForward(matchedParts, null, this.shouldGoToHeritageQuote);
+            // this.navigateForward(matchedParts, null, this.shouldGoToHeritageQuote);
             // Navigate to the next page
             // this.navigateForward(matchedParts);
         },
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index a790d3ccf..9ed7fe13b 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -297,14 +297,11 @@ export default {
                 backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS;
             }
 
-            console.log({ backNavigationScenario });
-
             self.$router.navigateWithoutSaving(backNavigationScenario, self.$route);
         },
         // TODO KO delete this after quote mvp
         async handleTempButtonClicked(vm) {
             this.shouldGoToHeritageQuote = true;
-            // await vm.forwardButtonAction();
         },
     },
 };

From 1944aadb363b168d13c54019fa86a2c394a2d61d Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 9 Nov 2022 11:52:22 -0500
Subject: [PATCH 07/22] CSR-748 Fix vehicle-parts defect

---
 .../base-input-button/base-input-button.vue               | 8 ++++++++
 src/layouts/vehicle-parts/vehicle-parts.vue               | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/common-components/base-input-button/base-input-button.vue
index 572be9ef5..a5ddad07a 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/common-components/base-input-button/base-input-button.vue
@@ -45,6 +45,7 @@ export default {
         };
     },
     mounted() {
+        // Need this here and in the watch for vehicle-parts, unless there'a better way
         if (this.isChecked) {
             this.handleChange(this.modelValue);
         }
@@ -188,6 +189,13 @@ export default {
             fieldOptions, // only need to expose this for unit test purposes
         };
     },
+    watch: {
+        isChecked(isChecked) {
+            if (isChecked) {
+                this.handleChange(this.modelValue)
+            }
+        }
+    }
 };
 </script>
 
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 09536fb82..18a076b70 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -188,7 +188,7 @@ export default {
             );
 
             // TODO KO delete after quote MVP
-            // this.navigateForward(matchedParts, null, this.shouldGoToHeritageQuote);
+            this.navigateForward(matchedParts, null, this.shouldGoToHeritageQuote);
             // Navigate to the next page
             // this.navigateForward(matchedParts);
         },

From ee49a615eb46bd4aebeb82af3c5785763183aae0 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Wed, 9 Nov 2022 12:04:02 -0500
Subject: [PATCH 08/22] CSR-748 Formatting

---
 .../base-input-button/base-input-button.vue   |  6 +++---
 src/layouts/quote/quote.vue                   |  2 +-
 .../vehicle-parts/vehicle-parts.spec.js       |  8 ++++----
 src/mixins/vehicle-questions-mixin.js         | 19 +++++++++++--------
 src/mixins/vin-pages-mixin.js                 |  9 +++++++--
 .../router-constants/navigation-scenarios.js  |  2 +-
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/common-components/base-input-button/base-input-button.vue
index a5ddad07a..bbe92c1d5 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/common-components/base-input-button/base-input-button.vue
@@ -192,10 +192,10 @@ export default {
     watch: {
         isChecked(isChecked) {
             if (isChecked) {
-                this.handleChange(this.modelValue)
+                this.handleChange(this.modelValue);
             }
-        }
-    }
+        },
+    },
 };
 </script>
 
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 00e7f4e87..43f24ae82 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -158,7 +158,7 @@ export default {
         },
         backButtonAction() {
             vehicleQuestionsMixin.methods.backButtonAction(this);
-        }
+        },
     },
     components: {
         funnelHeader,
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index 864e8b865..064b0091c 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -233,8 +233,8 @@ describe("vehicle-parts.vue", () => {
                             glassParts: null,
                         },
                         vehicle: {
-                            vin: "MY_VIN"
-                        }
+                            vin: "MY_VIN",
+                        },
                     },
                 },
             },
@@ -279,8 +279,8 @@ describe("vehicle-parts.vue", () => {
                             glassParts: null,
                         },
                         vehicle: {
-                            vin: "MY_VIN"
-                        }
+                            vin: "MY_VIN",
+                        },
                     },
                 },
             },
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 9ed7fe13b..b516a123b 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -8,7 +8,8 @@ import baseMixin from "@/mixins/base-mixin.js";
 import store from "@/store";
 
 export default {
-    data() {        // TODO KO DELETE AFTER QUOTE MVP
+    data() {
+        // TODO KO DELETE AFTER QUOTE MVP
         return {
             shouldGoToHeritageQuote: false,
         };
@@ -249,10 +250,12 @@ export default {
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                shouldGoToHeritageQuote ? navigateToHeritageFunnel() : self.$router.navigateWithSaving(
-                    self.navigationScenarios.HAS_NO_MORE_QUESTIONS,
-                    self.$route
-                );
+                shouldGoToHeritageQuote
+                    ? navigateToHeritageFunnel()
+                    : self.$router.navigateWithSaving(
+                          self.navigationScenarios.HAS_NO_MORE_QUESTIONS,
+                          self.$route
+                      );
             }
         },
         // Can't use `this` because navigateForward is also called from quote
@@ -260,9 +263,9 @@ export default {
             const self = vm ?? this;
             const partsOrQuestions = (
                 self.$store.getters.pageData(fmgPageValues.PART_QUESTIONS) ??
-                self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ?? 
-                self.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS) ?? 
-                self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS) 
+                self.$store.getters.pageData(fmgPageValues.VEHICLE_PARTS) ??
+                self.$store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS) ??
+                self.$store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)
             )?.partsOrQuestions;
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
             const hasGlassLocationWithMultipleParts =
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index a3cd2ecb2..ca8c66369 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -4,7 +4,8 @@ import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 
 export default {
-    data() {        // TODO KO DELETE AFTER QUOTE MVP
+    data() {
+        // TODO KO DELETE AFTER QUOTE MVP
         return {
             shouldGoToHeritageQuote: false,
         };
@@ -20,7 +21,11 @@ export default {
             const partsOrQuestions = result.data.partsOrQuestions;
 
             // TODO KO delete `this.shouldGoToHeritageQuote`
-            vehicleQuestionsMixin.methods.navigateForward(partsOrQuestions, this, this.shouldGoToHeritageQuote);
+            vehicleQuestionsMixin.methods.navigateForward(
+                partsOrQuestions,
+                this,
+                this.shouldGoToHeritageQuote
+            );
         },
         // TODO KO delete this after quote mvp
         async handleTempButtonClicked(vm) {
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 809d74c9b..bf7a6a052 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -33,7 +33,7 @@ const navigationScenarios = {
 
     // Quote
     CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
-    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS"
+    CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
 };
 
 export { navigationScenarios };

From 65207726cd89a3641c5c7a3f42b9d74d0da02da5 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Wed, 9 Nov 2022 13:57:04 -0500
Subject: [PATCH 09/22] CSR-777 load session

---
 src/constants/endpoints.js                    |  2 +-
 .../heritage-integration/cookie-helper.js     |  1 +
 .../heritage-integration/order-helper.js      | 26 ++---
 .../heritage-integration/order-helper.spec.js |  3 +
 src/store/index.js                            | 97 ++++++++++---------
 src/store/store.spec.js                       | 87 +++++++++++------
 6 files changed, 120 insertions(+), 96 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 0fade12fd..aeb38d792 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -76,7 +76,7 @@ const endpoints = {
     },
     LoadSession: {
         url: "/order/api/v1/order/load-session",
-        method: "POST",
+        method: "GET",
     },
     ValidateZip: {
         url: "/location/api/v1/location/zip",
diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 5b6800c86..1ef43bff0 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -21,6 +21,7 @@ export function updateOrCreateFunnelCookie() {
         ReferralParentAccountNumber: store.getters.order.accountNumber,
         HasDelayedClaimRegistration: wasClaimRegistrationDelayed,
         SuppressConceptFunnel: shouldSuppressConceptFunnel,
+        SavedSessionId: store.getters.applicationUser.savedSessionId,
     });
 }
 
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index db95e0703..9a24e9c24 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -17,12 +17,8 @@ import { storeMutations } from "@/constants/store-mutations";
 export async function loadSessionIfPresent() {
     const funnelCookie = getFunnelCookie();
 
-    // Do nothing if there is no cookie, correlation id, or referral number.
-    if (
-        funnelCookie == null ||
-        funnelCookie.ReferralCorrelationId == null ||
-        !funnelCookie.ReferralNumber
-    ) {
+    // Do nothing if there is no cookie or session to use for loading.
+    if (funnelCookie == null || funnelCookie.SavedSessionId == null) {
         return null;
     }
 
@@ -33,15 +29,8 @@ export async function loadSessionIfPresent() {
         return null;
     }
 
-    // Load referral if there is a cookie, and it doesn't indicate it needs a state reset.
-    return (
-        await loadSession(
-            funnelCookie.ReferralNumber,
-            funnelCookie.ReferralDate,
-            funnelCookie.ReferralCorrelationId,
-            funnelCookie.ReferralParentAccountNumber
-        )
-    ).data;
+    // Loads session including referral if there is a cookie, and it doesn't indicate it needs a state reset.
+    return (await loadSession(funnelCookie.SavedSessionId)).data;
 }
 
 /*
@@ -72,16 +61,13 @@ export async function saveSession() {
     Calls API to load session given the referral number, referralDate, and referralCorrelationId
     and returns the response.
 */
-async function loadSession(referralNumber, referralDate, referralCorrelationId, accountNumber) {
+async function loadSession(savedSessionId) {
     // await the saveSessionPromise in the store to make sure we're loading up to date information
     await store.getters.applicationUser.saveSessionPromise;
     const response = await baseMixin.methods.dispatchStoreAction(
         storeActions.LOAD_SESSION,
         {
-            referralNumber: referralNumber.toString(),
-            referralDate: referralDate,
-            referralCorrelationId: referralCorrelationId,
-            accountNumber: accountNumber?.toString(),
+            savedSessionId: savedSessionId?.toString(),
         },
         false
     );
diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js
index 5ec0f4f69..89d677583 100644
--- a/src/helpers/heritage-integration/order-helper.spec.js
+++ b/src/helpers/heritage-integration/order-helper.spec.js
@@ -24,6 +24,7 @@ describe("loadSessionIfPresent", () => {
             ShouldResetState: testShouldResetState,
             ReferralCorrelationId: "xxx",
             ReferralNumber: "12345",
+            SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99"
         };
 
         document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=${JSON.stringify(
@@ -46,6 +47,7 @@ describe("loadSessionIfPresent", () => {
                 ShouldResetState: true,
                 ReferralCorrelationId: "xxx-xxx-xxx",
                 ReferralNumber: "12345",
+                SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99"
             });
 
         const mockData = {
@@ -103,6 +105,7 @@ describe("loadSessionIfPresent", () => {
                 ReferralNumber: 123456,
                 ReferralCorrelationId: "yyy-yyy-yyyy",
                 ReferralDate: new Date(),
+                SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99"
             });
 
         const mockData = {
diff --git a/src/store/index.js b/src/store/index.js
index 34ec8a8a9..855956a8e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -303,13 +303,13 @@ export const mutations = {
         state.applicationUser.saveSessionPromise = null;
     },
     // Misc Mutations
-    updateStateWithOrderInformation(state, orderInformation) {
-        state.order.referralNumber = orderInformation.referralNumber;
-        state.order.referralDate = orderInformation.referralDate;
-        state.order.referralCorrelationId = orderInformation.referralCorrelationId;
-        state.order.eon = orderInformation.eon;
+    updateStateWithOrderInformation(state, sessionInformation) {
+        state.order.referralNumber = sessionInformation.order.referralNumber;
+        state.order.referralDate = sessionInformation.order.referralDate;
+        state.order.referralCorrelationId = sessionInformation.order.referralCorrelationId;
+        state.order.eon = sessionInformation.order.eon;
 
-        if (state.order.vehicle.vin !== orderInformation.vehicle?.vin) {
+        if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
             state.applicationUser.pageData[fmgPageValues.PART_QUESTIONS] = null;
             state.applicationUser.pageData[fmgPageValues.VEHICLE_PARTS] = null;
             state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
@@ -317,44 +317,52 @@ export const mutations = {
         }
 
         state.order.vehicle = Object.assign(state.order.vehicle, {
-            year: orderInformation.vehicle?.year,
-            make: orderInformation.vehicle?.make,
-            model: orderInformation.vehicle?.model,
-            style: orderInformation.vehicle?.style,
-            vin: orderInformation.vehicle?.vin,
-            carId: orderInformation.vehicle?.carId,
-            category: orderInformation.vehicle?.category,
-            imageUrl: orderInformation.vehicle?.imageUrl,
-            imageVifNumber: orderInformation.vehicle?.imageVifNumber,
-            imageColor: orderInformation.vehicle?.imageVifColor,
+            year: sessionInformation.order.vehicle?.year,
+            make: sessionInformation.order.vehicle?.make,
+            model: sessionInformation.order.vehicle?.model,
+            style: sessionInformation.order.vehicle?.style,
+            vin: sessionInformation.order.vehicle?.vin,
+            carId: sessionInformation.order.vehicle?.carId,
+            category: sessionInformation.order.vehicle?.category,
+            imageUrl: sessionInformation.order.vehicle?.imageUrl,
+            imageVifNumber: sessionInformation.order.vehicle?.imageVifNumber,
+            imageColor: sessionInformation.order.vehicle?.imageVifColor,
             registration: {
-                firstName: orderInformation.vehicle.registration.firstName,
-                lastName: orderInformation.vehicle.registration.lastName,
-                address: orderInformation.vehicle.registration.streetAddress,
-                city: orderInformation.vehicle.registration.city,
-                state: orderInformation.vehicle.registration.state,
-                zipCode: orderInformation.vehicle.registration.zipCode,
-                licensePlate: orderInformation.vehicle.registration.licensePlateNumber,
+                firstName: sessionInformation.order.vehicle.registration.firstName,
+                lastName: sessionInformation.order.vehicle.registration.lastName,
+                address: sessionInformation.order.vehicle.registration.streetAddress,
+                city: sessionInformation.order.vehicle.registration.city,
+                state: sessionInformation.order.vehicle.registration.state,
+                zipCode: sessionInformation.order.vehicle.registration.zipCode,
+                licensePlate: sessionInformation.order.vehicle.registration.licensePlateNumber,
             },
         });
 
-        state.order.damage.glassToReplace = orderInformation.damage.glassToReplace;
-        state.order.damage.isRepair = orderInformation.damage.isRepair;
-        state.order.damage.numberOfChips = orderInformation.damage.numberOfChips;
+        state.order.damage.glassToReplace = sessionInformation.order.damage.glassToReplace;
+        state.order.damage.isRepair = sessionInformation.order.damage.isRepair;
+        state.order.damage.numberOfChips = sessionInformation.order.damage.numberOfChips;
 
-        state.order.lineItems.glassParts = orderInformation.parts;
-        state.order.accountNumber = orderInformation.accountNumber;
-        (state.order.serviceLocation.address = orderInformation.serviceLocation.streetAddress),
-            (state.order.serviceLocation.city = orderInformation.serviceLocation.city),
-            (state.order.serviceLocation.state = orderInformation.serviceLocation.state),
-            (state.order.serviceLocation.zipCode = orderInformation.serviceLocation.zipCode);
+        state.order.lineItems.glassParts = sessionInformation.order.lineItems.parts;
+        state.order.accountNumber = sessionInformation.order.accountNumber;
+        state.order.providerNumber = sessionInformation.order.providerNumber;
+        (state.order.serviceLocation.address =
+            sessionInformation.order.serviceLocation.streetAddress),
+            (state.order.serviceLocation.city = sessionInformation.order.serviceLocation.city),
+            (state.order.serviceLocation.state = sessionInformation.order.serviceLocation.state),
+            (state.order.serviceLocation.zipCode =
+                sessionInformation.order.serviceLocation.zipCode);
 
-        state.order.payment.isInsurance = orderInformation.IsInsuranceOrder;
+        state.order.payment.isInsurance = sessionInformation.order.payment.isInsurance;
         state.order.payment.insuranceCoverage.isVerified =
-            orderInformation?.insuranceInfo.coverageVerified;
+            sessionInformation?.order.payment.insuranceCoverage.isVerified;
+
+        state.order.customer.emailAddress = sessionInformation.order.customer.emailAddress;
+        state.order.existingPromoCode = sessionInformation.order.existingPromoCode;
+        state.applicationUser.experiments = sessionInformation.applicationUser.experiments;
+        state.applicationUser.crmCustomerId = sessionInformation.applicationUser.crmCustomerId;
+        state.applicationUser.pageData = sessionInformation.applicationUser.pageData;
+        state.applicationUser.lastPage = sessionInformation.applicationUser.lastPage;
 
-        state.order.customer.emailAddress = orderInformation.customer.emailAddress;
-        state.applicationUser.experiments = orderInformation.experiments;
     },
     updateExperiments(state, experiments) {
         state.applicationUser.experiments = experiments;
@@ -984,17 +992,12 @@ export const actions = {
             },
         });
     },
-    loadSession(context, { referralNumber, referralDate, referralCorrelationId, accountNumber }) {
+    loadSession(context, { savedSessionId }) {
         return globalMethods
             .callHttpClient({
                 method: endpoints.LoadSession.method,
-                endpoint: endpoints.LoadSession.url,
-                payload: {
-                    referralNumber: referralNumber?.toString(),
-                    referralDate: referralDate,
-                    referralCorrelationId: referralCorrelationId,
-                    accountNumber: accountNumber?.toString(),
-                },
+                endpoint:
+                    endpoints.LoadSession.url + "?savedSessionId=" + savedSessionId?.toString(),
             })
             .then((response) => {
                 // Flatten location and name properties
@@ -1409,6 +1412,12 @@ function sortArrayOfObjectsByPropertyValue(arrayOfObjects, propertyName) {
 
 function convertGlassPieceNamingForApi(glassArray) {
     if (!glassArray) return [];
+    
+    // check if array already converted.  (likely when a session has been saved previously and then reloaded)
+    if (glassArray[0].location !== undefined){
+        return glassArray;
+    }
+
     const converted = [];
     glassArray.forEach((glass) => {
         converted.push({
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index eb0807581..c834faa02 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -203,34 +203,65 @@ describe("Mutations", () => {
         expect(storeState.applicationUser.pageData["vehicle-year"]).toEqual({});
     });
 
-    it("updateStateWithOrderInformation, should set order information in state", () => {
+    it("updateStateWithSessonInformation, should set session information in state", () => {
         // Arrange
         const storeState = state;
 
         // Act
         mutations.updateStateWithOrderInformation(storeState, {
-            referralNumber: 123,
-            referralDate: new Date().toUTCString(),
-            referralCorrelationId: "xxx-xxx-xxx",
-            vehicle: {
-                year: "2019",
-                make: "Acura",
-                model: "ILX",
-                style: "4 DOOR SEDAN",
-                carId: "C0000001",
-                category: "CAR",
-                registration: {},
+            order: {
+                referralNumber: 123,
+                referralDate: new Date().toUTCString(),
+                referralCorrelationId: "xxx-xxx-xxx",
+                vehicle: {
+                    year: "2019",
+                    make: "Acura",
+                    model: "ILX",
+                    style: "4 DOOR SEDAN",
+                    carId: "C0000001",
+                    category: "CAR",
+                    registration: {},
+                },
+                damage: {
+                    glassToReplace: ["Windshield"],
+                    isRepair: false,
+                    numberOfChips: 0,
+                },
+                lineItems: {
+                    "glassParts": null
+                  },
+                payment: {
+                    "insuranceCoverage": {
+                      "isVerified": false
+                    },
+                    "isInsurance": false
+                  },
+                parts: [],
+                accountNumber: "123456789",
+                insuranceInfo: {},
+                serviceLocation: {},
+                customer: {},
             },
-            damage: {
-                glassToReplace: ["Windshield"],
-                isRepair: false,
-                numberOfChips: 0,
-            },
-            parts: [],
-            accountNumber: "123456789",
-            insuranceInfo: {},
-            serviceLocation: {},
-            customer: {},
+            applicationUser: {
+                experiments: [
+                    {
+                      "universeName": "Concept Funnel Test With Rules",
+                      "universeId": 463,
+                      "testName": "Concept Dev Test",
+                      "testId": 392,
+                      "variationName": "Concept Test Variation",
+                      "variationId": 1133,
+                      "isActive": false,
+                      "isExposed": true,
+                      "userPartitionNumber": 84,
+                      "assignmentId": 12211739,
+                      "settings": {
+                        "someKey": "false",
+                        "sampleSetting": "Hi, my name is Vidya"
+                      }
+                    }
+                  ]
+            }
         });
 
         // Assert
@@ -640,9 +671,7 @@ describe("Actions", () => {
 
         // Act
         const response = await actions.loadSession(context, {
-            referralNumber: "123",
-            referralDate: new Date().toUTCString(),
-            referralCorrelationId: "xxx-xxx-xxx",
+            savedSessionId: "",
         });
 
         // Assert
@@ -667,9 +696,7 @@ describe("Actions", () => {
 
         // Act
         const response = await actions.loadSession(context, {
-            referralNumber: "123",
-            referralDate: new Date().toUTCString(),
-            referralCorrelationId: "xxx-xxx-xxx",
+            savedSessionId: "",
         });
 
         // Assert
@@ -694,9 +721,7 @@ describe("Actions", () => {
 
         // Act
         const response = await actions.loadSession(context, {
-            referralNumber: "123",
-            referralDate: new Date().toUTCString(),
-            referralCorrelationId: "xxx-xxx-xxx",
+            savedSessionId: "",
         });
 
         // Assert

From 2ea462e446a58fbdfe1a8cea5b22862d27c914ef Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Wed, 9 Nov 2022 15:39:39 -0500
Subject: [PATCH 10/22] CSR-777 Prettier

---
 .../heritage-integration/order-helper.spec.js |  6 +--
 src/store/index.js                            |  5 +-
 src/store/store.spec.js                       | 46 +++++++++----------
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js
index 89d677583..74c911e05 100644
--- a/src/helpers/heritage-integration/order-helper.spec.js
+++ b/src/helpers/heritage-integration/order-helper.spec.js
@@ -24,7 +24,7 @@ describe("loadSessionIfPresent", () => {
             ShouldResetState: testShouldResetState,
             ReferralCorrelationId: "xxx",
             ReferralNumber: "12345",
-            SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99"
+            SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99",
         };
 
         document.cookie = `${cookieNames.FUNNEL_SESSION_INFO}=${JSON.stringify(
@@ -47,7 +47,7 @@ describe("loadSessionIfPresent", () => {
                 ShouldResetState: true,
                 ReferralCorrelationId: "xxx-xxx-xxx",
                 ReferralNumber: "12345",
-                SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99"
+                SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99",
             });
 
         const mockData = {
@@ -105,7 +105,7 @@ describe("loadSessionIfPresent", () => {
                 ReferralNumber: 123456,
                 ReferralCorrelationId: "yyy-yyy-yyyy",
                 ReferralDate: new Date(),
-                SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99"
+                SavedSessionId: "aa115a05-e268-4eb4-a095-1d54b44f4a99",
             });
 
         const mockData = {
diff --git a/src/store/index.js b/src/store/index.js
index 855956a8e..9c31bc9c8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -362,7 +362,6 @@ export const mutations = {
         state.applicationUser.crmCustomerId = sessionInformation.applicationUser.crmCustomerId;
         state.applicationUser.pageData = sessionInformation.applicationUser.pageData;
         state.applicationUser.lastPage = sessionInformation.applicationUser.lastPage;
-
     },
     updateExperiments(state, experiments) {
         state.applicationUser.experiments = experiments;
@@ -1412,9 +1411,9 @@ function sortArrayOfObjectsByPropertyValue(arrayOfObjects, propertyName) {
 
 function convertGlassPieceNamingForApi(glassArray) {
     if (!glassArray) return [];
-    
+
     // check if array already converted.  (likely when a session has been saved previously and then reloaded)
-    if (glassArray[0].location !== undefined){
+    if (glassArray[0].location !== undefined) {
         return glassArray;
     }
 
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index c834faa02..063dedd76 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -228,14 +228,14 @@ describe("Mutations", () => {
                     numberOfChips: 0,
                 },
                 lineItems: {
-                    "glassParts": null
-                  },
+                    glassParts: null,
+                },
                 payment: {
-                    "insuranceCoverage": {
-                      "isVerified": false
+                    insuranceCoverage: {
+                        isVerified: false,
                     },
-                    "isInsurance": false
-                  },
+                    isInsurance: false,
+                },
                 parts: [],
                 accountNumber: "123456789",
                 insuranceInfo: {},
@@ -245,23 +245,23 @@ describe("Mutations", () => {
             applicationUser: {
                 experiments: [
                     {
-                      "universeName": "Concept Funnel Test With Rules",
-                      "universeId": 463,
-                      "testName": "Concept Dev Test",
-                      "testId": 392,
-                      "variationName": "Concept Test Variation",
-                      "variationId": 1133,
-                      "isActive": false,
-                      "isExposed": true,
-                      "userPartitionNumber": 84,
-                      "assignmentId": 12211739,
-                      "settings": {
-                        "someKey": "false",
-                        "sampleSetting": "Hi, my name is Vidya"
-                      }
-                    }
-                  ]
-            }
+                        universeName: "Concept Funnel Test With Rules",
+                        universeId: 463,
+                        testName: "Concept Dev Test",
+                        testId: 392,
+                        variationName: "Concept Test Variation",
+                        variationId: 1133,
+                        isActive: false,
+                        isExposed: true,
+                        userPartitionNumber: 84,
+                        assignmentId: 12211739,
+                        settings: {
+                            someKey: "false",
+                            sampleSetting: "Hi, my name is Vidya",
+                        },
+                    },
+                ],
+            },
         });
 
         // Assert

From a3df6d7ec4f269e490e8109c5494fc47205f3558 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 11 Nov 2022 10:56:22 -0500
Subject: [PATCH 11/22] CSR-904 add cms copy and widget to code.

---
 src/common-components/modal/modal.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index aa88fe9ea..b61046c98 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -20,6 +20,11 @@
                     <h5 class="mb-4" v-html="this.ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="this.ModalSubheadertext"></p>
                     <p class="mb-0" v-html="this.ModalBodyText"></p>
+                    <textBlock
+                        cmsWidgetName="modalDisclaimer"
+                        justifyText="left"
+                        typeStyle="caption"
+                        class="mt-4" />
                 </div>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
@@ -37,6 +42,7 @@
 
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
+import textBlock from "@/common-components/text-block/text-block";
 
 export default {
     name: "modal",
@@ -62,6 +68,7 @@ export default {
     },
     components: {
         buttonMain,
+        textBlock,
     },
 };
 </script>

From 851c37cb8751a2958398032d61dbe0bdce2af3b8 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 11 Nov 2022 14:02:03 -0500
Subject: [PATCH 12/22] CSR-933 qa fix focus state.

---
 src/styles/common-error-styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index ce9aaaf67..a30ee8996 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -32,7 +32,7 @@ html {
         }
         .form-check-input {
             &:focus {
-                @include box-shadow-hover($red-200);
+                box-shadow: 0 0 0 2.5px $red;
             }
         }
         // END HOVER

From 6de539086933765d0e2b21d4b88c1fdaa09f37fd Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 14 Nov 2022 09:10:00 -0500
Subject: [PATCH 13/22] CSR-904 update CMS content display.

---
 src/common-components/modal/modal.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index b61046c98..17c14dc45 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -21,10 +21,9 @@
                     <p class="fw-bold mb-2 subheader-text" v-html="this.ModalSubheadertext"></p>
                     <p class="mb-0" v-html="this.ModalBodyText"></p>
                     <textBlock
-                        cmsWidgetName="modalDisclaimer"
-                        justifyText="left"
-                        typeStyle="caption"
-                        class="mt-4" />
+                      class="mt-4"
+                      cmsWidgetName="modalDisclaimer"
+                      typeStyle="caption" />
                 </div>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain

From bd496e4b1ce8d4c92e6ff6cc3411ad6840857490 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 14 Nov 2022 09:11:44 -0500
Subject: [PATCH 14/22] Format code (prettier).

---
 src/common-components/modal/modal.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index 17c14dc45..f492b5f99 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -20,10 +20,7 @@
                     <h5 class="mb-4" v-html="this.ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="this.ModalSubheadertext"></p>
                     <p class="mb-0" v-html="this.ModalBodyText"></p>
-                    <textBlock
-                      class="mt-4"
-                      cmsWidgetName="modalDisclaimer"
-                      typeStyle="caption" />
+                    <textBlock class="mt-4" cmsWidgetName="modalDisclaimer" typeStyle="caption" />
                 </div>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain

From 1408820d53a255dccfcd63f04d7631aa7165ae48 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 14 Nov 2022 10:22:24 -0500
Subject: [PATCH 15/22] Update CMS widget for modal.

---
 src/common-components/modal/modal.vue | 7 ++++++-
 src/layouts/quote/quote.vue           | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index f492b5f99..e871b63fd 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -20,7 +20,11 @@
                     <h5 class="mb-4" v-html="this.ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="this.ModalSubheadertext"></p>
                     <p class="mb-0" v-html="this.ModalBodyText"></p>
-                    <textBlock class="mt-4" cmsWidgetName="modalDisclaimer" typeStyle="caption" />
+                    <textBlock
+                        v-if="disclaimerCMSWidget"
+                        class="mt-4"
+                        :cmsWidgetName="disclaimerCMSWidget"
+                        typeStyle="caption" />
                 </div>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
@@ -44,6 +48,7 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
+        disclaimerCMSWidget: String,
     },
     computed: {
         ModalHeadline() {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 63b87fbe7..937955be1 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -33,7 +33,7 @@
                 <modal cmsWidgetName="EstimateRainDefenseModal" />
                 <modal cmsWidgetName="EstimateFrontWiperModal" />
                 <modal cmsWidgetName="EstimateRearWiperModal" />
-                <modal cmsWidgetName="EstimateRecalModal" />
+                <modal cmsWidgetName="EstimateRecalModal" disclaimerCMSWidget="modalDisclaimer" />
                 <funnel-footer
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"

From 011a662662c206eb62f67955fb7413368267d2d7 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 14 Nov 2022 10:41:02 -0500
Subject: [PATCH 16/22] Un-do changes to accommodate disclaimer text.

This will be addressed at a later date.
---
 src/common-components/modal/modal.vue | 8 --------
 src/layouts/quote/quote.vue           | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index e871b63fd..aa88fe9ea 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -20,11 +20,6 @@
                     <h5 class="mb-4" v-html="this.ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="this.ModalSubheadertext"></p>
                     <p class="mb-0" v-html="this.ModalBodyText"></p>
-                    <textBlock
-                        v-if="disclaimerCMSWidget"
-                        class="mt-4"
-                        :cmsWidgetName="disclaimerCMSWidget"
-                        typeStyle="caption" />
                 </div>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
@@ -42,13 +37,11 @@
 
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
-import textBlock from "@/common-components/text-block/text-block";
 
 export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        disclaimerCMSWidget: String,
     },
     computed: {
         ModalHeadline() {
@@ -69,7 +62,6 @@ export default {
     },
     components: {
         buttonMain,
-        textBlock,
     },
 };
 </script>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 937955be1..63b87fbe7 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -33,7 +33,7 @@
                 <modal cmsWidgetName="EstimateRainDefenseModal" />
                 <modal cmsWidgetName="EstimateFrontWiperModal" />
                 <modal cmsWidgetName="EstimateRearWiperModal" />
-                <modal cmsWidgetName="EstimateRecalModal" disclaimerCMSWidget="modalDisclaimer" />
+                <modal cmsWidgetName="EstimateRecalModal" />
                 <funnel-footer
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"

From 33692d3046b8602464d7ddc4ec5e9e76d4e1e441 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 14 Nov 2022 12:26:42 -0500
Subject: [PATCH 17/22] csr-731 | Before large test rewrite

---
 .../button-question/button-question.spec.js   |  25 +-
 .../service-package-question-test-helper.js   | 279 ++++++++++++++++++
 .../service-package-question.spec.js          | 255 ++++++++++++++++
 .../service-package-radio.spec.js             | 128 ++++++++
 4 files changed, 686 insertions(+), 1 deletion(-)
 create mode 100644 src/layouts/quote/service-package-question/service-package-question-test-helper.js
 create mode 100644 src/layouts/quote/service-package-question/service-package-question.spec.js
 create mode 100644 src/layouts/quote/service-package-question/service-package-radio/service-package-radio.spec.js

diff --git a/src/common-components/button-question/button-question.spec.js b/src/common-components/button-question/button-question.spec.js
index 006cbcf2c..8a8696c43 100644
--- a/src/common-components/button-question/button-question.spec.js
+++ b/src/common-components/button-question/button-question.spec.js
@@ -1,4 +1,4 @@
-import { shallowMount } from "@vue/test-utils";
+import { shallowMount, mount } from "@vue/test-utils";
 import buttonQuestion from "@/common-components/button-question/button-question";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 
@@ -115,6 +115,29 @@ describe("buttonQuestion.vue", () => {
                 "2020",
             ]);
         });
+        test("should accept an imported component for buttonTypeObject and successfully add it to components", async ()=> {
+            // Arrange
+            const mockComponent = {
+                name: 'mockComponent',
+                methods: {
+                    mockComponentMethod() {return 'mockComponentMethod return value'}
+                }
+            };
+
+            const wrapper = await shallowMount(
+                buttonQuestion,
+                setupMocks({propsData: {'buttonTypeString': 'mockComponent', 'buttonTypeObject': mockComponent}})
+                );
+
+            // Act
+            const componentList = wrapper.vm.$options.components;
+            const componentExists = !!componentList.mockComponent;
+            const componentNameMatches = componentList.mockComponent.name === mockComponent.name;
+            const componentMethodMatches = componentList.mockComponent.methods.mockComponentMethod() === mockComponent.methods.mockComponentMethod();
+
+            // Assert
+            expect(componentExists && componentNameMatches && componentMethodMatches).toBe(true);
+        });
     });
 
     describe("buttonsInfo", () => {
diff --git a/src/layouts/quote/service-package-question/service-package-question-test-helper.js b/src/layouts/quote/service-package-question/service-package-question-test-helper.js
new file mode 100644
index 000000000..3b18ed667
--- /dev/null
+++ b/src/layouts/quote/service-package-question/service-package-question-test-helper.js
@@ -0,0 +1,279 @@
+export const mockProcessedCmsContent = {
+  "05_01_CSR_Quote_Standard_Repair" : {
+    EconomyServicePackage: {
+      HeaderText: 'Economy service',
+      SubheaderText: '',
+      BodyText: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li></ul>',
+      Image: '',
+      FooterText: '{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}'
+    },
+    StandardServicePackage: {
+      HeaderText: 'Standard service',
+      SubheaderText: 'MOST POPULAR',
+      BodyText: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>',
+      Image: '',
+      FooterText: ''
+    },
+      PremiumServicePackage: {
+      HeaderText: 'Premium service',
+      SubheaderText: '',
+      BodyText: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>',
+      Image: '',
+      FooterText: ''
+    }
+  },
+  "05_01_CSR_Quote_Recal": {
+    EconomyServicePackage: {
+      HeaderText: 'Economy service',
+      SubheaderText: '',
+      BodyText: '<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>',
+      Image: '',
+      FooterText: '{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}'
+    },
+    StandardServicePackage: {
+      HeaderText: 'Standard service',
+      SubheaderText: 'MOST POPULAR',
+      BodyText: '<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>',
+      Image: '',
+      FooterText: ''
+    },
+    PremiumServicePackage: {
+      HeaderText: 'Premium service',
+      SubheaderText: '',
+      BodyText: '<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>',
+      Image: '',
+      FooterText: ''
+    }
+  },
+  "05_01_CSR_Quote_RearGlass": {
+    EconomyServicePackage: {
+      HeaderText: 'Economy service',
+      SubheaderText: '',
+      BodyText: '<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>',
+      Image: '',
+      FooterText: '{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}'
+    },
+    StandardServicePackage: {
+      HeaderText: 'Standard service',
+      SubheaderText: 'MOST POPULAR',
+      BodyText: '<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>',
+      Image: '',
+      FooterText: ''
+    },
+    PremiumServicePackage: {
+      HeaderText: 'Premium service',
+      SubheaderText: '',
+      BodyText: '<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>',
+      Image: '',
+      FooterText: ''
+    }
+  }
+};
+
+export const inputQuestionWidgetAnswers = {
+  CashServicePackageQuestionWidget: {
+    "Answers": [
+      {
+        "Name": "TierOne",
+        "SubWidgetName": "EconomyServicePackage"
+      },
+      {
+        "Name": "TierTwo",
+        "SubWidgetName": "StandardServicePackage"
+      },
+      {
+        "Name": "TierThree",
+        "SubWidgetName": "PremiumServicePackage"
+      }
+    ]
+  },
+  InsuranceServicePackageQuestionWidget: {
+    "Answers": [
+      {
+        "Name": "TierOne",
+        "SubWidgetName": "EconomyServicePackage"
+      },
+      {
+        "Name": "TierTwo",
+        "SubWidgetName": "StandardServicePackage"
+      },
+      {
+        "Name": "TierThree",
+        "SubWidgetName": "PremiumServicePackage"
+      }
+    ]
+  }
+};
+
+  export const mockCmsContent = {
+    "Result": [ 
+  {
+    "Name": "CashServicePackageQuestionWidget",
+    "Model": {
+      "QuestionText": "",
+      "Answers": [
+        {
+          "Name": "TierOne",
+          "Text": "",
+          "SubText": "",
+          "AnswerImageUrl": "",
+          "SubWidgetName": "EconomyServicePackage"
+        },
+        {
+          "Name": "TierTwo",
+          "Text": "",
+          "SubText": "",
+          "AnswerImageUrl": "",
+          "SubWidgetName": "StandardServicePackage"
+        },
+        {
+          "Name": "TierThree",
+          "Text": "",
+          "SubText": "",
+          "AnswerImageUrl": "",
+          "SubWidgetName": "PremiumServicePackage"
+        }
+      ]
+    }
+  },
+  {
+    "Name": "InsuranceServicePackageQuestionWidget",
+    "Model": {
+      "QuestionText": "",
+      "Answers": [
+        {
+          "Name": "TierOne",
+          "Text": "",
+          "SubText": "",
+          "AnswerImageUrl": "",
+          "SubWidgetName": "EconomyServicePackage"
+        },
+        {
+          "Name": "TierTwo",
+          "Text": "",
+          "SubText": "",
+          "AnswerImageUrl": "",
+          "SubWidgetName": "StandardServicePackage"
+        },
+        {
+          "Name": "TierThree",
+          "Text": "",
+          "SubText": "",
+          "AnswerImageUrl": "",
+          "SubWidgetName": "PremiumServicePackage"
+        }
+      ]
+    }
+  },
+  {
+    "Name": "EconomyServicePackage",
+    "Model": {
+      "HeaderText": "Economy service",
+      "SubheaderText": "",
+      "BodyText": "<ul><li>{if:globalState:order.damage.isRepair}Expert windshield repair{else}New replacement {if:globalState:getters.hasAnyNonWindshieldGlassParts}glass{else}windshield{end}{end}</li><li>{if:globalState:order.damage.isRepair}Exclusive resin sealant{else}Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}{end}</li><li>Nationwide lifetime {if:globalState:order.damage.isRepair}guarantee{else}warranty{end}</li></ul>",
+      "Image": "",
+      "FooterText": "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}"
+    }
+  },
+  {
+    "Name": "StandardServicePackage",
+    "Model": {
+      "HeaderText": "Standard service",
+      "SubheaderText": "MOST POPULAR",
+      "BodyText": "<ul><li>{if:globalState:order.damage.isRepair}Expert windshield repair{else}New replacement {if:globalState:getters.hasAnyNonWindshieldGlassParts}glass{else}windshield{end}{end}</li><li>{if:globalState:order.damage.isRepair}Exclusive resin sealant{else}Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}{end}</li><li>Nationwide lifetime {if:globalState:order.damage.isRepair}guarantee{else}warranty{end}</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+      "Image": "",
+      "FooterText": ""
+    }
+  },
+  {
+    "Name": "PremiumServicePackage",
+    "Model": {
+      "HeaderText": "Premium service",
+      "SubheaderText": "",
+      "BodyText": "<ul><li>{if:globalState:order.damage.isRepair}Expert windshield repair{else}New replacement {if:globalState:getters.hasAnyNonWindshieldGlassParts}glass{else}windshield{end}{end}</li><li>{if:globalState:order.damage.isRepair}Exclusive resin sealant{else}Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}{end}</li><li>Nationwide lifetime {if:globalState:order.damage.isRepair}guarantee{else}warranty{end}</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+      "Image": "",
+      "FooterText": ""
+    }
+  }
+]};
+
+export const expectedModifiedAnswers = {
+    "05_01_CSR_Quote_Standard_Repair" : {
+        tierOne: {
+            value: 'TierOne',
+            buttonLabel: 'Economy service',
+            buttonLabelSubCopy: '',
+            buttonBodyCopy: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li></ul>',
+            buttonAuxillaryCopy: '$500.22',
+            buttonFooterCopy: 'New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.'
+          },
+        tierTwo: {
+            value: 'TierTwo',
+            buttonLabel: 'Standard service',
+            buttonLabelSubCopy: 'MOST POPULAR',
+            buttonBodyCopy: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li></ul>',
+            buttonAuxillaryCopy: '$585.90',
+            buttonFooterCopy: ''
+          },
+        tierThree: {
+            value: 'TierThree',
+            buttonLabel: 'Premium service',
+            buttonLabelSubCopy: '',
+            buttonBodyCopy: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>',
+            buttonAuxillaryCopy: '$621.40',
+            buttonFooterCopy: ''
+          }
+    },
+    "05_01_CSR_Quote_Recal": {
+      tierOne: {
+        value: 'TierOne',
+        buttonLabel: 'Economy service',
+        buttonLabelSubCopy: '',
+        buttonBodyCopy: '<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li></ul>',
+        buttonAuxillaryCopy: '$500.22',
+        buttonFooterCopy: 'New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.'
+      },
+      tierTwo: {
+        value: 'TierTwo',
+        buttonLabel: 'Standard service',
+        buttonLabelSubCopy: 'MOST POPULAR',
+        buttonBodyCopy: '<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li></ul>',
+        buttonAuxillaryCopy: '$585.90',
+        buttonFooterCopy: ''
+      },
+      tierThree: {
+        value: 'TierThree',
+        buttonLabel: 'Premium service',
+        buttonLabelSubCopy: '',
+        buttonBodyCopy: '<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>',
+        buttonAuxillaryCopy: '$621.40',
+        buttonFooterCopy: ''
+      }
+    },
+    "05_01_CSR_Quote_RearGlass": {
+      tierOne: {
+        value: 'TierOne',
+        buttonLabel: 'Economy service',
+        buttonLabelSubCopy: '',
+        buttonBodyCopy: '<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>',
+        buttonAuxillaryCopy: '$350.22',
+        buttonFooterCopy: 'New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.'
+      },
+      tierTwo: {
+        value: 'TierTwo',
+        buttonLabel: 'Standard service',
+        buttonLabelSubCopy: 'MOST POPULAR',
+        buttonBodyCopy: '<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li></li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li></ul>',
+        buttonAuxillaryCopy: '$374.70',
+        buttonFooterCopy: ''
+      },
+      tierThree: {
+        value: 'TierThree',
+        buttonLabel: 'Premium service',
+        buttonLabelSubCopy: '',
+        buttonBodyCopy: '<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,front wiper blades}</li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li><li></li></ul>',
+        buttonAuxillaryCopy: '$460.38',
+        buttonFooterCopy: ''
+      }
+    },
+}
\ No newline at end of file
diff --git a/src/layouts/quote/service-package-question/service-package-question.spec.js b/src/layouts/quote/service-package-question/service-package-question.spec.js
new file mode 100644
index 000000000..b1e0c7c2e
--- /dev/null
+++ b/src/layouts/quote/service-package-question/service-package-question.spec.js
@@ -0,0 +1,255 @@
+import {shallowMount, mount} from "@vue/test-utils";
+import servicePackageQuestion from "./service-package-question";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import {dispatch} from "@/store";
+import store from "@/store";
+import { mockCmsContent, expectedModifiedAnswers, mockProcessedCmsContent, inputQuestionWidgetAnswers } from "./service-package-question-test-helper"
+
+
+jest.mock("@/store", () => ({
+    commit: jest.fn(),
+    dispatch: jest.fn(),
+    getters: {
+        order: {
+            damage: {
+                glassToReplace: [
+                    {glassLocation: "Rear"}
+                ]
+            },
+        },
+        hasAnyNonWindshieldGlassParts: true
+    },
+    // order: {
+    //     damage: {
+    //         isRepair: false
+    //     }
+    // },
+    state: { // I think I can drop this when everything is done, but it's needed for generating the expected stuff from cms-content-helper
+        order: {
+            damage: {
+                isRepair: false,
+            },
+            glassToReplace: [
+                {glassLocation: "Rear"}
+            ]
+        }
+    }
+}));
+
+// describe("service-package-question.vue", () => {
+//     it("should emit captured value", () => {
+//         // Arrange
+//         const wrapper = setupMocks({});
+//         // Act
+//         wrapper.componentVM.selectedValues = "newValue";
+
+//         // Assert
+//         expect(wrapper.emitted()["update:modelValue"][0][0]).toEqual("newValue");
+//     });
+//     it("should return insurance answers from servicePackageAnswers when isInsuranceSelected = true", () => {
+//         // Arrange
+//         let modifiedProps = JSON.parse(JSON.stringify(mockProps)); // create a copy
+//         modifiedProps['isInsuranceSelected'] = true;
+//         const wrapper = setupMocks({props: modifiedProps});
+//         //Arrange
+//         expect(wrapper.vm.servicePackageAnswers[0].buttonLabel).toBe(mockCmsContent.insuranceGroupContentWidget.HeaderText);
+//     });
+//     it("should map cms content to a correctly customizied answers object", ()=> {
+//         // Arrange
+//         const expectedValue = mockCmsContent.cashAnswers.Answers[0].Name;
+//         // This round about way of referencing the mocked content mimics how it is referenced by the code
+//         //   hopefully helpful for diagnosing why this test might be failing in the future
+//         const subWidgetName = mockCmsContent.cashAnswers.Answers[0].SubWidgetName;
+//         const cmsWidget = mockCmsContent[subWidgetName];
+//         const expectedButtonLabel = cmsWidget.HeaderText;
+//         const expectedButtonLabelSubCopy = cmsWidget.SubheaderText
+//         const expectedButtonBodyCopy = cmsWidget.BodyText;
+//         const expectedButtonAuxillaryCopy = "500.22"; // combined price of windshield + recal
+//         const expectedButtonFooterCopy = cmsWidget.FooterText;
+//         const wrapper = setupMocks({});
+//         // Assert
+//         const economyServicePackageAnswers = wrapper.vm.servicePackageAnswers[0];
+//         expect(economyServicePackageAnswers.value).toBe(expectedValue);
+//         expect(economyServicePackageAnswers.buttonLabel).toBe(expectedButtonLabel);
+//         expect(economyServicePackageAnswers.buttonLabelSubCopy).toBe(expectedButtonLabelSubCopy);
+//         expect(economyServicePackageAnswers.buttonBodyCopy).toBe(expectedButtonBodyCopy);
+//         expect(economyServicePackageAnswers.buttonAuxillaryCopy.includes(expectedButtonAuxillaryCopy)).toBe(true);
+//         expect(economyServicePackageAnswers.buttonFooterCopy).toBe(expectedButtonFooterCopy);
+//     });
+//     it("should not send a standard package answer if no VAPS are eligible for standard", () => {
+//         // Arrange
+//         let modifiedProps = JSON.parse(JSON.stringify(mockProps)); // create a copy
+//         modifiedProps['lineItems'].splice(1,3);
+//         const wrapper = setupMocks({props: modifiedProps});
+
+//         // Assert
+//         expect(wrapper.vm.servicePackageAnswers.length).toEqual(2);
+//     });
+//     it("should not send a standard package answer if no VAPS are eligible for standard", () => {
+//         // Arrange
+//         let modifiedProps = JSON.parse(JSON.stringify(mockProps)); // create a copy
+//         modifiedProps['lineItems'].splice(1,3);
+//         const wrapper = setupMocks({props: modifiedProps});
+
+//         // Assert
+//         expect(wrapper.vm.servicePackageAnswers.length).toEqual(2);
+//     });
+// });
+describe("service-package-question.vue, matching business rules for package display", () => {
+    // mock scenarios in figma:
+    // https://www.figma.com/file/Spt9hBtGj8r8PFFGNIN3G5/New-Funnel?node-id=100%3A11383
+    dispatch.mockImplementation(() => Promise.resolve({ data: mockCmsContent }));
+    beforeEach( async ()=> {
+        //processedCmsContent = await fetchCmsContentForPage('testPage');
+        //console.log(processedCmsContent);
+        processedCmsContent = inputQuestionWidgetAnswers;
+        mockMixin = {
+            methods: {
+                getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+                    return processedCmsContent[widgetName][cmsFieldName];
+                })
+            },
+        };
+        mockProps = {
+            'modelValue': 'initialValue',
+            'isInsuranceSelected': false,
+            'insuranceCmsWidgetName': 'InsuranceServicePackageQuestionWidget',
+            'cashCmsWidgetName': 'CashServicePackageQuestionWidget',
+            'availableLineItems': [
+                {
+                  partNumber : "001",
+                  Description : "Windshield with Recal",
+                  partType : "Windshield",
+                  Quantity : "1",
+                  BasePartNumber : "001",
+                  Color : "Green",
+                  CanSafeliteRecalibrate: true,
+                  price : 350.22
+                },
+                {
+                  "partNumber": "SBB16",
+                  "description": "SAFELITE BEAM BLADE 16",
+                  "partType": "FRONT WIPER",
+                  "price": 32.64,
+                },
+                {
+                  "partNumber": "SBB26",
+                  "description": "SAFELITE BEAM BLADE 26",
+                  "partType": "FRONT WIPER",
+                  "price": 53.04,
+                },
+                {
+                  "partNumber": "SBBR12A",
+                  "description": "SAFELITE REAR BLADE 12A",
+                  "partType": "REAR WIPER",
+                  "price": 24.48,
+                },
+                {
+                  "partNumber": "RAIN DEFENSE",
+                  "description": null,
+                  "partType": "RAIN DEFENSE",
+                  "price": 35.50,
+                },
+              ]
+        };
+    })
+    it("should match the 05_01_CSR_Quote_Standard_Repair mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_Standard_Repair";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        const wrapper = setupMocks({});
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[0], expectedModifiedAnswers[packageNameKey].tierOne);
+        // standard answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[1], expectedModifiedAnswers[packageNameKey].tierTwo);
+        // premium answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[2], expectedModifiedAnswers[packageNameKey].tierThree);
+    });
+    it.only("should match the 05_01_CSR_Quote_Recal mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_Recal";
+        mockProps.availableLineItems.push(
+            {
+                partNumber : "RECAL STATIC",
+                Description : "Recalibration",
+                partType : "recalibration",
+                Quantity : "1",
+                price : 150.00,
+              },
+        );
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        const wrapper = setupMocks({
+            customMountOptions: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                glassToReplace: [
+                                    {glassLocation: "Windshield"}
+                                ]
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: false
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[0], expectedModifiedAnswers[packageNameKey].tierOne);
+        // standard answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[1], expectedModifiedAnswers[packageNameKey].tierTwo);
+        // premium answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[2], expectedModifiedAnswers[packageNameKey].tierThree);
+    });
+    it("should match the 05_01_CSR_Quote_RearGlass mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_RearGlass";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        const wrapper = setupMocks({});
+        //console.log(wrapper.vm.servicePackageAnswers);
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[0], expectedModifiedAnswers[packageNameKey].tierOne);
+        // standard answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[1], expectedModifiedAnswers[packageNameKey].tierTwo);
+        // premium answer
+        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[2], expectedModifiedAnswers[packageNameKey].tierThree);
+    });
+});
+
+function runPackageAnswerExpectStatements(servicePackageAnswer, expectedOutput) {
+    expect(servicePackageAnswer.buttonLabel).toBe(expectedOutput.buttonLabel);
+    expect(servicePackageAnswer.buttonLabelSubCopy).toBe(expectedOutput.buttonLabelSubCopy);
+    expect(servicePackageAnswer.buttonBodyCopy).toBe(expectedOutput.buttonBodyCopy);
+    expect(servicePackageAnswer.buttonFooterCopy).toBe(expectedOutput.buttonFooterCopy);
+}
+
+function setupMocks({ customMountOptions, props = mockProps }) {
+    const mountOptions = getMountOptions({
+        ...customMountOptions
+    });
+    console.log(mountOptions.global);
+
+    // Modify/augment default mount options
+    mountOptions.global.mocks["$store"] = store;
+    mountOptions.global.mixins = [mockMixin];
+    mountOptions.propsData = props;
+    const wrapper = shallowMount(servicePackageQuestion, mountOptions);
+
+    return wrapper;
+}
+                        ///////////////
+                        // Constants //
+                        ///////////////
+
+let processedCmsContent;
+
+let mockMixin;
+
+let mockProps;
\ No newline at end of file
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.spec.js b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.spec.js
new file mode 100644
index 000000000..4684e5212
--- /dev/null
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.spec.js
@@ -0,0 +1,128 @@
+import { mount } from "@vue/test-utils";
+import servicePackageRadio from "./service-package-radio";
+import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
+
+describe("service-package-radio.vue", () => {
+    it("Should include buttonLabel in html", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+
+        // Act
+        const outputHtml = wrapper.html();
+
+        // Assert
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps['buttonLabel']));
+    });
+
+    it("Should include buttonLabelAuxillaryCopy in html", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+
+        // Act
+        const outputHtml = wrapper.html();
+
+        // Assert
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps['buttonLabelAuxillaryCopy']));
+    });
+
+    it("Should include buttonLabelSubCopy in html", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+
+        // Act
+        const outputHtml = wrapper.html();
+
+        // Assert
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps['buttonLabelSubCopy']));
+    });
+    it("Should include buttonFooterCopy in html", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+
+        // Act
+        const outputHtml = wrapper.html();
+
+        // Assert
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps['buttonFooterCopy']));
+    });
+    it("Should get 5 strings from getArrayOfListItemsFromRawCmsCopy when provided with a <ul><li>...</li>(x5)</ul> buttonBodyCopy", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+        // Act
+        const results = wrapper.vm.getArrayOfListItemsFromRawCmsCopy(wrapper.vm.buttonBodyCopy);
+
+        // Assert
+        expect(results.length).toBe(5);
+    });
+    it("Should get strings from getArrayOfListItemsFromRawCmsCopy without <ul> or <li> tags when provided with a <ul><li>...</li></ul> buttonBodyCopy", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+        
+        // Act
+        const results = wrapper.vm.getArrayOfListItemsFromRawCmsCopy(wrapper.vm.buttonBodyCopy);
+
+        // Assert
+        const fileredResults = results.filter(result => {
+            return result.includes("<ul>") || result.includes("</ul>") || result.includes("<li>") || result.includes("</li>")
+        })
+        expect(fileredResults.length).toBe(0);
+
+    });
+    it("Should get 5 strings from getArrayOfListItemsFromRawCmsCopy when buttonBodyCopy has 6 total <li>...</li>, but one is empty ", async () => {
+        // Arrange
+        const moddedProps = mockProps;
+        moddedProps['buttonBodyCopy'] = "<ul><li>buttonBodyCopy test copy</li><li>2</li><li>3</li><li>4</li><li>5</li><li></li></ul>";
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: moddedProps,
+            },
+        });
+
+        // Act
+        const results = wrapper.vm.getArrayOfListItemsFromRawCmsCopy(wrapper.vm.buttonBodyCopy);
+
+        // Assert
+        expect(results.length).toBe(5);
+    });
+});
+
+const mockProps = {
+    buttonLabel: "buttonLabel test copy",
+    buttonLabelAuxillaryCopy: "buttonLabelAuxillaryCopy test copy",
+    buttonLabelSubCopy: "buttonLabelSubCopy test copy",
+    buttonBodyCopy: "<ul><li>buttonBodyCopy test copy</li><li>2</li><li>3</li><li>4</li><li>5</li></ul>",
+    buttonFooterCopy: "buttonFooterCopy test copy"
+}
+
+function setupMocks({ mountOptionsMockData = {} }) {
+    const wrapper = mount(servicePackageRadio, {
+        ...mountOptionsMockData,
+        mixins: [inputButtonWrapperMixin],
+    });
+
+    return { wrapper };
+}

From 020bbf6971aeae98f202fc83cf21cea9dc9ce684 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 14 Nov 2022 16:11:09 -0500
Subject: [PATCH 18/22] CSR-731 | Unit tests

Still need to test pricing stuff on service-package-question as well as test the new cms content helper stuff
---
 jest.config.js                                |   2 -
 .../button-question/button-question.spec.js   |  23 +-
 .../service-package-question-test-helper.js   | 817 ++++++++++++------
 .../service-package-question.spec.js          | 694 +++++++++++----
 .../service-package-radio.spec.js             |  32 +-
 5 files changed, 1111 insertions(+), 457 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index c5401c28f..146264edd 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -17,10 +17,8 @@ module.exports = {
     "!src/layouts/capability-questions/**/*.vue",
     "!src/layouts/part-questions/**/*.vue",
     "!src/layouts/reveal/**/*.vue",
-    "!src/layouts/quote/**/*.vue",
     "!src/ux-components/text-link/**/*.vue",
     "!src/common-components/question-chain/**/*.vue",
-    "!src/layouts/quote/**/*.vue", // Temporary
     "!src/layouts/vin-lookup/**/*.vue", //Temporary for Quote page testing
     "!src/common-components/funnel-header/menu-modal/**/*.vue",
     // END
diff --git a/src/common-components/button-question/button-question.spec.js b/src/common-components/button-question/button-question.spec.js
index 8a8696c43..132e5edb9 100644
--- a/src/common-components/button-question/button-question.spec.js
+++ b/src/common-components/button-question/button-question.spec.js
@@ -115,25 +115,34 @@ describe("buttonQuestion.vue", () => {
                 "2020",
             ]);
         });
-        test("should accept an imported component for buttonTypeObject and successfully add it to components", async ()=> {
+        test("should accept an imported component for buttonTypeObject and successfully add it to components", async () => {
             // Arrange
             const mockComponent = {
-                name: 'mockComponent',
+                name: "mockComponent",
                 methods: {
-                    mockComponentMethod() {return 'mockComponentMethod return value'}
-                }
+                    mockComponentMethod() {
+                        return "mockComponentMethod return value";
+                    },
+                },
             };
 
             const wrapper = await shallowMount(
                 buttonQuestion,
-                setupMocks({propsData: {'buttonTypeString': 'mockComponent', 'buttonTypeObject': mockComponent}})
-                );
+                setupMocks({
+                    propsData: {
+                        buttonTypeString: "mockComponent",
+                        buttonTypeObject: mockComponent,
+                    },
+                })
+            );
 
             // Act
             const componentList = wrapper.vm.$options.components;
             const componentExists = !!componentList.mockComponent;
             const componentNameMatches = componentList.mockComponent.name === mockComponent.name;
-            const componentMethodMatches = componentList.mockComponent.methods.mockComponentMethod() === mockComponent.methods.mockComponentMethod();
+            const componentMethodMatches =
+                componentList.mockComponent.methods.mockComponentMethod() ===
+                mockComponent.methods.mockComponentMethod();
 
             // Assert
             expect(componentExists && componentNameMatches && componentMethodMatches).toBe(true);
diff --git a/src/layouts/quote/service-package-question/service-package-question-test-helper.js b/src/layouts/quote/service-package-question/service-package-question-test-helper.js
index 3b18ed667..36f938a7e 100644
--- a/src/layouts/quote/service-package-question/service-package-question-test-helper.js
+++ b/src/layouts/quote/service-package-question/service-package-question-test-helper.js
@@ -1,279 +1,580 @@
 export const mockProcessedCmsContent = {
-  "05_01_CSR_Quote_Standard_Repair" : {
-    EconomyServicePackage: {
-      HeaderText: 'Economy service',
-      SubheaderText: '',
-      BodyText: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li></ul>',
-      Image: '',
-      FooterText: '{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}'
+    "05_01_CSR_Quote_Standard_Repair": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
     },
-    StandardServicePackage: {
-      HeaderText: 'Standard service',
-      SubheaderText: 'MOST POPULAR',
-      BodyText: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>',
-      Image: '',
-      FooterText: ''
+    "05_01_CSR_Quote_Recal": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
     },
-      PremiumServicePackage: {
-      HeaderText: 'Premium service',
-      SubheaderText: '',
-      BodyText: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>',
-      Image: '',
-      FooterText: ''
-    }
-  },
-  "05_01_CSR_Quote_Recal": {
-    EconomyServicePackage: {
-      HeaderText: 'Economy service',
-      SubheaderText: '',
-      BodyText: '<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>',
-      Image: '',
-      FooterText: '{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}'
+    "05_01_CSR_Quote_RearGlass": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
     },
-    StandardServicePackage: {
-      HeaderText: 'Standard service',
-      SubheaderText: 'MOST POPULAR',
-      BodyText: '<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>',
-      Image: '',
-      FooterText: ''
+    "05_01_CSR_Quote_RearGlass+NonWindshield": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
     },
-    PremiumServicePackage: {
-      HeaderText: 'Premium service',
-      SubheaderText: '',
-      BodyText: '<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>',
-      Image: '',
-      FooterText: ''
-    }
-  },
-  "05_01_CSR_Quote_RearGlass": {
-    EconomyServicePackage: {
-      HeaderText: 'Economy service',
-      SubheaderText: '',
-      BodyText: '<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>',
-      Image: '',
-      FooterText: '{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}'
+    "05_01_CSR_Quote_RearGlass+Windshield": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
     },
-    StandardServicePackage: {
-      HeaderText: 'Standard service',
-      SubheaderText: 'MOST POPULAR',
-      BodyText: '<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>',
-      Image: '',
-      FooterText: ''
+    "05_01_CSR_Quote_RearGlassNoFrontFit": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+    },
+    "05_01_CSR_Quote_Windshield+SideGlass": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+    },
+    "05_01_CSR_Quote_SideGlass": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+    },
+    "05_01_CSR_Quote_NoWiperFit": {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+    },
+    badCustomValue: {
+        EconomyServicePackage: {
+            HeaderText: "Economy service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li></ul>",
+            Image: "",
+            FooterText:
+                "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}",
+        },
+        StandardServicePackage: {
+            HeaderText: "Standard service",
+            SubheaderText: "MOST POPULAR",
+            BodyText:
+                "<ul><li>New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
+        PremiumServicePackage: {
+            HeaderText: "Premium service",
+            SubheaderText: "",
+            BodyText:
+                "<ul><li>{if:custom:badCustomValue}DO NOT SHOW{end}New replacement windshield</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
+            Image: "",
+            FooterText: "",
+        },
     },
-    PremiumServicePackage: {
-      HeaderText: 'Premium service',
-      SubheaderText: '',
-      BodyText: '<ul><li>New replacement glass</li><li>Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}</li><li>Nationwide lifetime warranty</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>',
-      Image: '',
-      FooterText: ''
-    }
-  }
 };
 
 export const inputQuestionWidgetAnswers = {
-  CashServicePackageQuestionWidget: {
-    "Answers": [
-      {
-        "Name": "TierOne",
-        "SubWidgetName": "EconomyServicePackage"
-      },
-      {
-        "Name": "TierTwo",
-        "SubWidgetName": "StandardServicePackage"
-      },
-      {
-        "Name": "TierThree",
-        "SubWidgetName": "PremiumServicePackage"
-      }
-    ]
-  },
-  InsuranceServicePackageQuestionWidget: {
-    "Answers": [
-      {
-        "Name": "TierOne",
-        "SubWidgetName": "EconomyServicePackage"
-      },
-      {
-        "Name": "TierTwo",
-        "SubWidgetName": "StandardServicePackage"
-      },
-      {
-        "Name": "TierThree",
-        "SubWidgetName": "PremiumServicePackage"
-      }
-    ]
-  }
+    CashServicePackageQuestionWidget: {
+        Answers: [
+            {
+                Name: "TierOne",
+                SubWidgetName: "EconomyServicePackage",
+            },
+            {
+                Name: "TierTwo",
+                SubWidgetName: "StandardServicePackage",
+            },
+            {
+                Name: "TierThree",
+                SubWidgetName: "PremiumServicePackage",
+            },
+        ],
+    },
+    InsuranceServicePackageQuestionWidget: {
+        Answers: [
+            {
+                Name: "TierOne",
+                SubWidgetName: "EconomyServicePackage",
+            },
+            {
+                Name: "TierTwo",
+                SubWidgetName: "StandardServicePackage",
+            },
+            {
+                Name: "TierThree",
+                SubWidgetName: "PremiumServicePackage",
+            },
+        ],
+    },
 };
 
-  export const mockCmsContent = {
-    "Result": [ 
-  {
-    "Name": "CashServicePackageQuestionWidget",
-    "Model": {
-      "QuestionText": "",
-      "Answers": [
-        {
-          "Name": "TierOne",
-          "Text": "",
-          "SubText": "",
-          "AnswerImageUrl": "",
-          "SubWidgetName": "EconomyServicePackage"
-        },
-        {
-          "Name": "TierTwo",
-          "Text": "",
-          "SubText": "",
-          "AnswerImageUrl": "",
-          "SubWidgetName": "StandardServicePackage"
-        },
-        {
-          "Name": "TierThree",
-          "Text": "",
-          "SubText": "",
-          "AnswerImageUrl": "",
-          "SubWidgetName": "PremiumServicePackage"
-        }
-      ]
-    }
-  },
-  {
-    "Name": "InsuranceServicePackageQuestionWidget",
-    "Model": {
-      "QuestionText": "",
-      "Answers": [
-        {
-          "Name": "TierOne",
-          "Text": "",
-          "SubText": "",
-          "AnswerImageUrl": "",
-          "SubWidgetName": "EconomyServicePackage"
-        },
-        {
-          "Name": "TierTwo",
-          "Text": "",
-          "SubText": "",
-          "AnswerImageUrl": "",
-          "SubWidgetName": "StandardServicePackage"
-        },
-        {
-          "Name": "TierThree",
-          "Text": "",
-          "SubText": "",
-          "AnswerImageUrl": "",
-          "SubWidgetName": "PremiumServicePackage"
-        }
-      ]
-    }
-  },
-  {
-    "Name": "EconomyServicePackage",
-    "Model": {
-      "HeaderText": "Economy service",
-      "SubheaderText": "",
-      "BodyText": "<ul><li>{if:globalState:order.damage.isRepair}Expert windshield repair{else}New replacement {if:globalState:getters.hasAnyNonWindshieldGlassParts}glass{else}windshield{end}{end}</li><li>{if:globalState:order.damage.isRepair}Exclusive resin sealant{else}Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}{end}</li><li>Nationwide lifetime {if:globalState:order.damage.isRepair}guarantee{else}warranty{end}</li></ul>",
-      "Image": "",
-      "FooterText": "{if:custom:frontWipersApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{else}{if:custom:rearWiperApplicableForTierTwo}New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.{end}{end}"
-    }
-  },
-  {
-    "Name": "StandardServicePackage",
-    "Model": {
-      "HeaderText": "Standard service",
-      "SubheaderText": "MOST POPULAR",
-      "BodyText": "<ul><li>{if:globalState:order.damage.isRepair}Expert windshield repair{else}New replacement {if:globalState:getters.hasAnyNonWindshieldGlassParts}glass{else}windshield{end}{end}</li><li>{if:globalState:order.damage.isRepair}Exclusive resin sealant{else}Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}{end}</li><li>Nationwide lifetime {if:globalState:order.damage.isRepair}guarantee{else}warranty{end}</li><li>{if:custom:frontWipersApplicableForTierTwo}{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierTwo}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li></ul>",
-      "Image": "",
-      "FooterText": ""
-    }
-  },
-  {
-    "Name": "PremiumServicePackage",
-    "Model": {
-      "HeaderText": "Premium service",
-      "SubheaderText": "",
-      "BodyText": "<ul><li>{if:globalState:order.damage.isRepair}Expert windshield repair{else}New replacement {if:globalState:getters.hasAnyNonWindshieldGlassParts}glass{else}windshield{end}{end}</li><li>{if:globalState:order.damage.isRepair}Exclusive resin sealant{else}Expert installation{if:custom:isRecalibrationOnOrder} and {textLink:EstimateRecalModal,recalibration}{end}{end}</li><li>Nationwide lifetime {if:globalState:order.damage.isRepair}guarantee{else}warranty{end}</li><li>{if:custom:frontWipersApplicableForTierThree}{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateFrontWiperModal,front wiper blades}{else}New {textLink:EstimateFrontWiperModal,wiper blades}{end}{end}</li><li>{if:custom:rearWiperApplicableForTierThree}New {textLink:EstimateRearWiperModal,rear wiper blade}{end}</li><li>{if:custom:rainDefenseApplicableForTierThree}{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment{end}</li></ul>",
-      "Image": "",
-      "FooterText": ""
-    }
-  }
-]};
-
 export const expectedModifiedAnswers = {
-    "05_01_CSR_Quote_Standard_Repair" : {
+    "05_01_CSR_Quote_Standard_Repair": {
         tierOne: {
-            value: 'TierOne',
-            buttonLabel: 'Economy service',
-            buttonLabelSubCopy: '',
-            buttonBodyCopy: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li></ul>',
-            buttonAuxillaryCopy: '$500.22',
-            buttonFooterCopy: 'New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.'
-          },
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li></ul>",
+            buttonAuxillaryCopy: "$500.22",
+            buttonFooterCopy:
+                "New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.",
+        },
         tierTwo: {
-            value: 'TierTwo',
-            buttonLabel: 'Standard service',
-            buttonLabelSubCopy: 'MOST POPULAR',
-            buttonBodyCopy: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li></ul>',
-            buttonAuxillaryCopy: '$585.90',
-            buttonFooterCopy: ''
-          },
+            value: "TierTwo",
+            buttonLabel: "Standard service",
+            buttonLabelSubCopy: "MOST POPULAR",
+            buttonBodyCopy:
+                "<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li></ul>",
+            buttonAuxillaryCopy: "$585.90",
+            buttonFooterCopy: "",
+        },
         tierThree: {
-            value: 'TierThree',
-            buttonLabel: 'Premium service',
-            buttonLabelSubCopy: '',
-            buttonBodyCopy: '<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>',
-            buttonAuxillaryCopy: '$621.40',
-            buttonFooterCopy: ''
-          }
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>Expert windshield repair</li><li>Exclusive resin sealant</li><li>Nationwide lifetime guarantee</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>",
+            buttonAuxillaryCopy: "$621.40",
+            buttonFooterCopy: "",
+        },
     },
     "05_01_CSR_Quote_Recal": {
-      tierOne: {
-        value: 'TierOne',
-        buttonLabel: 'Economy service',
-        buttonLabelSubCopy: '',
-        buttonBodyCopy: '<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li></ul>',
-        buttonAuxillaryCopy: '$500.22',
-        buttonFooterCopy: 'New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.'
-      },
-      tierTwo: {
-        value: 'TierTwo',
-        buttonLabel: 'Standard service',
-        buttonLabelSubCopy: 'MOST POPULAR',
-        buttonBodyCopy: '<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li></ul>',
-        buttonAuxillaryCopy: '$585.90',
-        buttonFooterCopy: ''
-      },
-      tierThree: {
-        value: 'TierThree',
-        buttonLabel: 'Premium service',
-        buttonLabelSubCopy: '',
-        buttonBodyCopy: '<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>',
-        buttonAuxillaryCopy: '$621.40',
-        buttonFooterCopy: ''
-      }
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$500.22",
+            buttonFooterCopy:
+                "New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.",
+        },
+        tierTwo: {
+            value: "TierTwo",
+            buttonLabel: "Standard service",
+            buttonLabelSubCopy: "MOST POPULAR",
+            buttonBodyCopy:
+                "<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li></ul>",
+            buttonAuxillaryCopy: "$585.90",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement windshield</li><li>Expert installation and {textLink:EstimateRecalModal,recalibration}</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>",
+            buttonAuxillaryCopy: "$621.40",
+            buttonFooterCopy: "",
+        },
     },
     "05_01_CSR_Quote_RearGlass": {
-      tierOne: {
-        value: 'TierOne',
-        buttonLabel: 'Economy service',
-        buttonLabelSubCopy: '',
-        buttonBodyCopy: '<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>',
-        buttonAuxillaryCopy: '$350.22',
-        buttonFooterCopy: 'New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.'
-      },
-      tierTwo: {
-        value: 'TierTwo',
-        buttonLabel: 'Standard service',
-        buttonLabelSubCopy: 'MOST POPULAR',
-        buttonBodyCopy: '<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li></li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li></ul>',
-        buttonAuxillaryCopy: '$374.70',
-        buttonFooterCopy: ''
-      },
-      tierThree: {
-        value: 'TierThree',
-        buttonLabel: 'Premium service',
-        buttonLabelSubCopy: '',
-        buttonBodyCopy: '<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,front wiper blades}</li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li><li></li></ul>',
-        buttonAuxillaryCopy: '$460.38',
-        buttonFooterCopy: ''
-      }
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$350.22",
+            buttonFooterCopy:
+                "New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.",
+        },
+        tierTwo: {
+            value: "TierTwo",
+            buttonLabel: "Standard service",
+            buttonLabelSubCopy: "MOST POPULAR",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li></li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li></ul>",
+            buttonAuxillaryCopy: "$374.70",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,front wiper blades}</li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li><li></li></ul>",
+            buttonAuxillaryCopy: "$460.38",
+            buttonFooterCopy: "",
+        },
     },
-}
\ No newline at end of file
+    "05_01_CSR_Quote_RearGlass+NonWindshield": {
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$350.22",
+            buttonFooterCopy:
+                "New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.",
+        },
+        tierTwo: {
+            value: "TierTwo",
+            buttonLabel: "Standard service",
+            buttonLabelSubCopy: "MOST POPULAR",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li></li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li></ul>",
+            buttonAuxillaryCopy: "$374.70",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,front wiper blades}</li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li><li></li></ul>",
+            buttonAuxillaryCopy: "$460.38",
+            buttonFooterCopy: "",
+        },
+    },
+    "05_01_CSR_Quote_RearGlass+Windshield": {
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$350.22",
+            buttonFooterCopy:
+                "New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.",
+        },
+        tierTwo: {
+            value: "TierTwo",
+            buttonLabel: "Standard service",
+            buttonLabelSubCopy: "MOST POPULAR",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,front wiper blades}</li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li></ul>",
+            buttonAuxillaryCopy: "$460.38",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,front wiper blades}</li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>",
+            buttonAuxillaryCopy: "$495.88",
+            buttonFooterCopy: "",
+        },
+    },
+    "05_01_CSR_Quote_RearGlassNoFrontFit": {
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$350.22",
+            buttonFooterCopy:
+                "New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.",
+        },
+        tierTwo: {
+            value: "TierTwo",
+            buttonLabel: "Standard service",
+            buttonLabelSubCopy: "MOST POPULAR",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li></li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li></ul>",
+            buttonAuxillaryCopy: "$374.70",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li></li><li>New {textLink:EstimateRearWiperModal,rear wiper blade}</li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>",
+            buttonAuxillaryCopy: "$410.20",
+            buttonFooterCopy: "",
+        },
+    },
+    "05_01_CSR_Quote_Windshield+SideGlass": {
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$350.22",
+            buttonFooterCopy:
+                "New wiper blades are not included with Economy service. Because chips can disrupt the glass surface, we recommend new wipers after a repair.",
+        },
+        tierTwo: {
+            value: "TierTwo",
+            buttonLabel: "Standard service",
+            buttonLabelSubCopy: "MOST POPULAR",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li></ul>",
+            buttonAuxillaryCopy: "$435.90",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>",
+            buttonAuxillaryCopy: "$471.40",
+            buttonFooterCopy: "",
+        },
+    },
+    "05_01_CSR_Quote_SideGlass": {
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$350.22",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement glass</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li>New {textLink:EstimateFrontWiperModal,wiper blades}</li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>",
+            buttonAuxillaryCopy: "$471.40",
+            buttonFooterCopy: "",
+        },
+    },
+    "05_01_CSR_Quote_NoWiperFit": {
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement windshield</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$350.22",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement windshield</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li></li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>",
+            buttonAuxillaryCopy: "$385.72",
+            buttonFooterCopy: "",
+        },
+    },
+    badCustomValue: {
+        tierOne: {
+            value: "TierOne",
+            buttonLabel: "Economy service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement windshield</li><li>Expert installation</li><li>Nationwide lifetime warranty</li></ul>",
+            buttonAuxillaryCopy: "$350.22",
+            buttonFooterCopy: "",
+        },
+        tierThree: {
+            value: "TierThree",
+            buttonLabel: "Premium service",
+            buttonLabelSubCopy: "",
+            buttonBodyCopy:
+                "<ul><li>New replacement windshield</li><li>Expert installation</li><li>Nationwide lifetime warranty</li><li></li><li></li><li>{textLink:EstimateRainDefenseModal,Rain Defense}&trade; treatment</li></ul>",
+            buttonAuxillaryCopy: "$385.72",
+            buttonFooterCopy: "",
+        },
+    },
+};
diff --git a/src/layouts/quote/service-package-question/service-package-question.spec.js b/src/layouts/quote/service-package-question/service-package-question.spec.js
index b1e0c7c2e..043037995 100644
--- a/src/layouts/quote/service-package-question/service-package-question.spec.js
+++ b/src/layouts/quote/service-package-question/service-package-question.spec.js
@@ -1,198 +1,112 @@
-import {shallowMount, mount} from "@vue/test-utils";
+import { shallowMount, mount } from "@vue/test-utils";
 import servicePackageQuestion from "./service-package-question";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import {dispatch} from "@/store";
-import store from "@/store";
-import { mockCmsContent, expectedModifiedAnswers, mockProcessedCmsContent, inputQuestionWidgetAnswers } from "./service-package-question-test-helper"
-
+import {
+    expectedModifiedAnswers,
+    mockProcessedCmsContent,
+    inputQuestionWidgetAnswers,
+} from "./service-package-question-test-helper";
 
 jest.mock("@/store", () => ({
     commit: jest.fn(),
     dispatch: jest.fn(),
-    getters: {
-        order: {
-            damage: {
-                glassToReplace: [
-                    {glassLocation: "Rear"}
-                ]
-            },
-        },
-        hasAnyNonWindshieldGlassParts: true
-    },
-    // order: {
-    //     damage: {
-    //         isRepair: false
-    //     }
-    // },
-    state: { // I think I can drop this when everything is done, but it's needed for generating the expected stuff from cms-content-helper
-        order: {
-            damage: {
-                isRepair: false,
-            },
-            glassToReplace: [
-                {glassLocation: "Rear"}
-            ]
-        }
-    }
 }));
 
-// describe("service-package-question.vue", () => {
-//     it("should emit captured value", () => {
-//         // Arrange
-//         const wrapper = setupMocks({});
-//         // Act
-//         wrapper.componentVM.selectedValues = "newValue";
-
-//         // Assert
-//         expect(wrapper.emitted()["update:modelValue"][0][0]).toEqual("newValue");
-//     });
-//     it("should return insurance answers from servicePackageAnswers when isInsuranceSelected = true", () => {
-//         // Arrange
-//         let modifiedProps = JSON.parse(JSON.stringify(mockProps)); // create a copy
-//         modifiedProps['isInsuranceSelected'] = true;
-//         const wrapper = setupMocks({props: modifiedProps});
-//         //Arrange
-//         expect(wrapper.vm.servicePackageAnswers[0].buttonLabel).toBe(mockCmsContent.insuranceGroupContentWidget.HeaderText);
-//     });
-//     it("should map cms content to a correctly customizied answers object", ()=> {
-//         // Arrange
-//         const expectedValue = mockCmsContent.cashAnswers.Answers[0].Name;
-//         // This round about way of referencing the mocked content mimics how it is referenced by the code
-//         //   hopefully helpful for diagnosing why this test might be failing in the future
-//         const subWidgetName = mockCmsContent.cashAnswers.Answers[0].SubWidgetName;
-//         const cmsWidget = mockCmsContent[subWidgetName];
-//         const expectedButtonLabel = cmsWidget.HeaderText;
-//         const expectedButtonLabelSubCopy = cmsWidget.SubheaderText
-//         const expectedButtonBodyCopy = cmsWidget.BodyText;
-//         const expectedButtonAuxillaryCopy = "500.22"; // combined price of windshield + recal
-//         const expectedButtonFooterCopy = cmsWidget.FooterText;
-//         const wrapper = setupMocks({});
-//         // Assert
-//         const economyServicePackageAnswers = wrapper.vm.servicePackageAnswers[0];
-//         expect(economyServicePackageAnswers.value).toBe(expectedValue);
-//         expect(economyServicePackageAnswers.buttonLabel).toBe(expectedButtonLabel);
-//         expect(economyServicePackageAnswers.buttonLabelSubCopy).toBe(expectedButtonLabelSubCopy);
-//         expect(economyServicePackageAnswers.buttonBodyCopy).toBe(expectedButtonBodyCopy);
-//         expect(economyServicePackageAnswers.buttonAuxillaryCopy.includes(expectedButtonAuxillaryCopy)).toBe(true);
-//         expect(economyServicePackageAnswers.buttonFooterCopy).toBe(expectedButtonFooterCopy);
-//     });
-//     it("should not send a standard package answer if no VAPS are eligible for standard", () => {
-//         // Arrange
-//         let modifiedProps = JSON.parse(JSON.stringify(mockProps)); // create a copy
-//         modifiedProps['lineItems'].splice(1,3);
-//         const wrapper = setupMocks({props: modifiedProps});
-
-//         // Assert
-//         expect(wrapper.vm.servicePackageAnswers.length).toEqual(2);
-//     });
-//     it("should not send a standard package answer if no VAPS are eligible for standard", () => {
-//         // Arrange
-//         let modifiedProps = JSON.parse(JSON.stringify(mockProps)); // create a copy
-//         modifiedProps['lineItems'].splice(1,3);
-//         const wrapper = setupMocks({props: modifiedProps});
-
-//         // Assert
-//         expect(wrapper.vm.servicePackageAnswers.length).toEqual(2);
-//     });
-// });
-describe("service-package-question.vue, matching business rules for package display", () => {
-    // mock scenarios in figma:
-    // https://www.figma.com/file/Spt9hBtGj8r8PFFGNIN3G5/New-Funnel?node-id=100%3A11383
-    dispatch.mockImplementation(() => Promise.resolve({ data: mockCmsContent }));
-    beforeEach( async ()=> {
-        //processedCmsContent = await fetchCmsContentForPage('testPage');
-        //console.log(processedCmsContent);
+describe("service-package-question.vue", () => {
+    beforeEach(async () => {
         processedCmsContent = inputQuestionWidgetAnswers;
         mockMixin = {
             methods: {
                 getCmsContent: jest.fn((widgetName, cmsFieldName) => {
                     return processedCmsContent[widgetName][cmsFieldName];
-                })
+                }),
             },
         };
         mockProps = {
-            'modelValue': 'initialValue',
-            'isInsuranceSelected': false,
-            'insuranceCmsWidgetName': 'InsuranceServicePackageQuestionWidget',
-            'cashCmsWidgetName': 'CashServicePackageQuestionWidget',
-            'availableLineItems': [
+            modelValue: "initialValue",
+            isInsuranceSelected: false,
+            insuranceCmsWidgetName: "InsuranceServicePackageQuestionWidget",
+            cashCmsWidgetName: "CashServicePackageQuestionWidget",
+            availableLineItems: [
                 {
-                  partNumber : "001",
-                  Description : "Windshield with Recal",
-                  partType : "Windshield",
-                  Quantity : "1",
-                  BasePartNumber : "001",
-                  Color : "Green",
-                  CanSafeliteRecalibrate: true,
-                  price : 350.22
+                    partNumber: "001",
+                    Description: "Windshield with Recal",
+                    partType: "Windshield",
+                    Quantity: "1",
+                    BasePartNumber: "001",
+                    Color: "Green",
+                    CanSafeliteRecalibrate: true,
+                    price: 350.22,
                 },
                 {
-                  "partNumber": "SBB16",
-                  "description": "SAFELITE BEAM BLADE 16",
-                  "partType": "FRONT WIPER",
-                  "price": 32.64,
+                    partNumber: "RAIN DEFENSE",
+                    description: null,
+                    partType: "RAIN DEFENSE",
+                    price: 35.5,
                 },
-                {
-                  "partNumber": "SBB26",
-                  "description": "SAFELITE BEAM BLADE 26",
-                  "partType": "FRONT WIPER",
-                  "price": 53.04,
-                },
-                {
-                  "partNumber": "SBBR12A",
-                  "description": "SAFELITE REAR BLADE 12A",
-                  "partType": "REAR WIPER",
-                  "price": 24.48,
-                },
-                {
-                  "partNumber": "RAIN DEFENSE",
-                  "description": null,
-                  "partType": "RAIN DEFENSE",
-                  "price": 35.50,
-                },
-              ]
+            ],
         };
-    })
-    it("should match the 05_01_CSR_Quote_Standard_Repair mock", () => {
-        // Arrange
         const packageNameKey = "05_01_CSR_Quote_Standard_Repair";
         Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+    });
+    it("should emit captured value", () => {
+        // Arrange
+        const wrapper = setupMocks({});
+        // Act
+        wrapper.componentVM.selectedValues = "newValue";
+
+        // Assert
+        expect(wrapper.emitted()["update:modelValue"][0][0]).toEqual("newValue");
+    });
+    it("should have the correct insurance pricing text when insurance is selected", () => {
+        // Arrange
+        mockProps.isInsuranceSelected = true;
+        const wrapper = setupMocks({});
+        // Act
+
+        // Assert
+        expect(
+            wrapper.vm.servicePackageAnswers[0].buttonAuxillaryCopy.includes("As little as")
+        ).toBe(true);
+    });
+    it("should return [] from nullSafeAvailableLineItems and not error out if availableLineItems is null", () => {
+        // Arrange
+        mockProps.availableLineItems = null;
+        const wrapper = setupMocks({});
+        // Act
+
+        // Assert
+        expect(wrapper.vm.nullSafeAvailableLineItems).toEqual([]);
+    });
+    it("should return a null servicePackageAnswers if the cmsContent is falsy", () => {
+        // Arrange
+        mockMixin = {
+            methods: {
+                getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+                    return null;
+                }),
+            },
+        };
         const wrapper = setupMocks({});
 
         // Assert
-        // economy answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[0], expectedModifiedAnswers[packageNameKey].tierOne);
-        // standard answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[1], expectedModifiedAnswers[packageNameKey].tierTwo);
-        // premium answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[2], expectedModifiedAnswers[packageNameKey].tierThree);
+        expect(wrapper.vm.servicePackageAnswers).toBe(null);
     });
-    it.only("should match the 05_01_CSR_Quote_Recal mock", () => {
+    it("should treat an undefined 'getCustomValueFromString' as a false value and not error out", () => {
         // Arrange
-        const packageNameKey = "05_01_CSR_Quote_Recal";
-        mockProps.availableLineItems.push(
-            {
-                partNumber : "RECAL STATIC",
-                Description : "Recalibration",
-                partType : "recalibration",
-                Quantity : "1",
-                price : 150.00,
-              },
-        );
+        const packageNameKey = "badCustomValue";
         Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
         const wrapper = setupMocks({
-            customMountOptions: {
+            mountOptionsMockData: {
                 store: {
                     getters: {
                         order: {
                             damage: {
-                                glassToReplace: [
-                                    {glassLocation: "Windshield"}
-                                ]
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
                             },
                         },
-                        hasAnyNonWindshieldGlassParts: false
+                        hasAnyNonWindshieldGlassParts: false,
                     },
                 },
             },
@@ -200,26 +114,413 @@ describe("service-package-question.vue, matching business rules for package disp
 
         // Assert
         // economy answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[0], expectedModifiedAnswers[packageNameKey].tierOne);
-        // standard answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[1], expectedModifiedAnswers[packageNameKey].tierTwo);
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer should not be created
+        expect(wrapper.vm.servicePackageAnswers.length).toBe(2);
         // premium answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[2], expectedModifiedAnswers[packageNameKey].tierThree);
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
+    });
+});
+describe("service-package-question.vue, matching business rules for package display", () => {
+    // mock scenarios in figma:
+    // https://www.figma.com/file/Spt9hBtGj8r8PFFGNIN3G5/New-Funnel?node-id=100%3A11383
+    beforeEach(async () => {
+        processedCmsContent = inputQuestionWidgetAnswers;
+        mockMixin = {
+            methods: {
+                getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+                    return processedCmsContent[widgetName][cmsFieldName];
+                }),
+            },
+        };
+        mockProps = {
+            modelValue: "initialValue",
+            isInsuranceSelected: false,
+            insuranceCmsWidgetName: "InsuranceServicePackageQuestionWidget",
+            cashCmsWidgetName: "CashServicePackageQuestionWidget",
+            availableLineItems: [
+                {
+                    partNumber: "001",
+                    Description: "Windshield with Recal",
+                    partType: "Windshield",
+                    Quantity: "1",
+                    BasePartNumber: "001",
+                    Color: "Green",
+                    CanSafeliteRecalibrate: true,
+                    price: 350.22,
+                },
+                {
+                    partNumber: "RAIN DEFENSE",
+                    description: null,
+                    partType: "RAIN DEFENSE",
+                    price: 35.5,
+                },
+            ],
+        };
+    });
+    it("should match the 05_01_CSR_Quote_Standard_Repair mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_Standard_Repair";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        mockProps.availableLineItems.push(driverFrontWiperLineItem);
+        mockProps.availableLineItems.push(passengerFrontWiperLineItem);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: true,
+                                glassToReplace: [],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: false,
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierTwo
+        );
+        // premium answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[2],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
+    });
+    it("should match the 05_01_CSR_Quote_Recal mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_Recal";
+        mockProps.availableLineItems.push(recalLineItem);
+        mockProps.availableLineItems.push(driverFrontWiperLineItem);
+        mockProps.availableLineItems.push(passengerFrontWiperLineItem);
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: false,
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierTwo
+        );
+        // premium answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[2],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
     });
     it("should match the 05_01_CSR_Quote_RearGlass mock", () => {
         // Arrange
         const packageNameKey = "05_01_CSR_Quote_RearGlass";
         Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
-        const wrapper = setupMocks({});
+        mockProps.availableLineItems.push(driverFrontWiperLineItem);
+        mockProps.availableLineItems.push(passengerFrontWiperLineItem);
+        mockProps.availableLineItems.push(rearWiperLineItem);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Rear" }],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: true,
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierTwo
+        );
+        // premium answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[2],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
+    });
+    it("should match the 05_01_CSR_Quote_RearGlass+NonWindshield mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_RearGlass+NonWindshield";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        mockProps.availableLineItems.push(driverFrontWiperLineItem);
+        mockProps.availableLineItems.push(passengerFrontWiperLineItem);
+        mockProps.availableLineItems.push(rearWiperLineItem);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [
+                                    { glassLocation: "Rear" },
+                                    { glassLocation: "Driver" },
+                                ],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: true,
+                    },
+                },
+            },
+        });
         //console.log(wrapper.vm.servicePackageAnswers);
 
         // Assert
         // economy answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[0], expectedModifiedAnswers[packageNameKey].tierOne);
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
         // standard answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[1], expectedModifiedAnswers[packageNameKey].tierTwo);
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierTwo
+        );
         // premium answer
-        runPackageAnswerExpectStatements(wrapper.vm.servicePackageAnswers[2], expectedModifiedAnswers[packageNameKey].tierThree);
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[2],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
+    });
+    it("should match the 05_01_CSR_Quote_RearGlass+Windshield mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_RearGlass+Windshield";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        mockProps.availableLineItems.push(driverFrontWiperLineItem);
+        mockProps.availableLineItems.push(passengerFrontWiperLineItem);
+        mockProps.availableLineItems.push(rearWiperLineItem);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [
+                                    { glassLocation: "Rear" },
+                                    { glassLocation: "Windshield" },
+                                ],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: true,
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierTwo
+        );
+        // premium answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[2],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
+    });
+    it("should match the 05_01_CSR_Quote_RearGlassNoFrontFit mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_RearGlassNoFrontFit";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        mockProps.availableLineItems.push(rearWiperLineItem);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Rear" }],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: true,
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierTwo
+        );
+        // premium answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[2],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
+    });
+    it("should match the 05_01_CSR_Quote_Windshield+SideGlass mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_Windshield+SideGlass";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        mockProps.availableLineItems.push(driverFrontWiperLineItem);
+        mockProps.availableLineItems.push(passengerFrontWiperLineItem);
+        mockProps.availableLineItems.push(rearWiperLineItem);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [
+                                    { glassLocation: "Driver" },
+                                    { glassLocation: "Windshield" },
+                                ],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: true,
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierTwo
+        );
+        // premium answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[2],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
+    });
+    it("should match the 05_01_CSR_Quote_SideGlass mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_SideGlass";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        mockProps.availableLineItems.push(driverFrontWiperLineItem);
+        mockProps.availableLineItems.push(passengerFrontWiperLineItem);
+        mockProps.availableLineItems.push(rearWiperLineItem);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Driver" }],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: true,
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer should not be created
+        expect(wrapper.vm.servicePackageAnswers.length).toBe(2);
+        // premium answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
+    });
+    it("should match the 05_01_CSR_Quote_NoWiperFit mock", () => {
+        // Arrange
+        const packageNameKey = "05_01_CSR_Quote_NoWiperFit";
+        Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]);
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
+                            },
+                        },
+                        hasAnyNonWindshieldGlassParts: false,
+                    },
+                },
+            },
+        });
+
+        // Assert
+        // economy answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[0],
+            expectedModifiedAnswers[packageNameKey].tierOne
+        );
+        // standard answer should not be created
+        expect(wrapper.vm.servicePackageAnswers.length).toBe(2);
+        // premium answer
+        runPackageAnswerExpectStatements(
+            wrapper.vm.servicePackageAnswers[1],
+            expectedModifiedAnswers[packageNameKey].tierThree
+        );
     });
 });
 
@@ -230,26 +531,65 @@ function runPackageAnswerExpectStatements(servicePackageAnswer, expectedOutput)
     expect(servicePackageAnswer.buttonFooterCopy).toBe(expectedOutput.buttonFooterCopy);
 }
 
-function setupMocks({ customMountOptions, props = mockProps }) {
-    const mountOptions = getMountOptions({
-        ...customMountOptions
-    });
-    console.log(mountOptions.global);
+function setupMocks({ mountOptionsMockData, props = mockProps }) {
+    var mountOptionsMockDataDefault = {
+        store: {
+            getters: {
+                order: {
+                    damage: {
+                        isRepair: false,
+                        glassToReplace: [{ glassLocation: "Windshield" }],
+                    },
+                },
+                hasAnyNonWindshieldGlassParts: false,
+            },
+        },
+    };
+    mountOptionsMockData = Object.assign(mountOptionsMockDataDefault, mountOptionsMockData);
+    const mountOptions = getMountOptions(mountOptionsMockData);
 
     // Modify/augment default mount options
-    mountOptions.global.mocks["$store"] = store;
     mountOptions.global.mixins = [mockMixin];
     mountOptions.propsData = props;
     const wrapper = shallowMount(servicePackageQuestion, mountOptions);
 
     return wrapper;
 }
-                        ///////////////
-                        // Constants //
-                        ///////////////
+///////////////
+// Constants //
+///////////////
 
 let processedCmsContent;
 
 let mockMixin;
 
-let mockProps;
\ No newline at end of file
+let mockProps;
+
+let recalLineItem = {
+    partNumber: "RECAL STATIC",
+    Description: "Recalibration",
+    partType: "recalibration",
+    Quantity: "1",
+    price: 150.0,
+};
+
+let driverFrontWiperLineItem = {
+    partNumber: "SBB16",
+    description: "SAFELITE BEAM BLADE 16",
+    partType: "FRONT WIPER",
+    price: 32.64,
+};
+
+let passengerFrontWiperLineItem = {
+    partNumber: "SBB26",
+    description: "SAFELITE BEAM BLADE 26",
+    partType: "FRONT WIPER",
+    price: 53.04,
+};
+
+let rearWiperLineItem = {
+    partNumber: "SBBR12A",
+    description: "SAFELITE REAR BLADE 12A",
+    partType: "REAR WIPER",
+    price: 24.48,
+};
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.spec.js b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.spec.js
index 4684e5212..fefef4044 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.spec.js
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.spec.js
@@ -15,7 +15,7 @@ describe("service-package-radio.vue", () => {
         const outputHtml = wrapper.html();
 
         // Assert
-        expect(outputHtml).toEqual(expect.stringContaining(mockProps['buttonLabel']));
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps["buttonLabel"]));
     });
 
     it("Should include buttonLabelAuxillaryCopy in html", async () => {
@@ -30,7 +30,7 @@ describe("service-package-radio.vue", () => {
         const outputHtml = wrapper.html();
 
         // Assert
-        expect(outputHtml).toEqual(expect.stringContaining(mockProps['buttonLabelAuxillaryCopy']));
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps["buttonLabelAuxillaryCopy"]));
     });
 
     it("Should include buttonLabelSubCopy in html", async () => {
@@ -45,7 +45,7 @@ describe("service-package-radio.vue", () => {
         const outputHtml = wrapper.html();
 
         // Assert
-        expect(outputHtml).toEqual(expect.stringContaining(mockProps['buttonLabelSubCopy']));
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps["buttonLabelSubCopy"]));
     });
     it("Should include buttonFooterCopy in html", async () => {
         // Arrange
@@ -59,7 +59,7 @@ describe("service-package-radio.vue", () => {
         const outputHtml = wrapper.html();
 
         // Assert
-        expect(outputHtml).toEqual(expect.stringContaining(mockProps['buttonFooterCopy']));
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps["buttonFooterCopy"]));
     });
     it("Should get 5 strings from getArrayOfListItemsFromRawCmsCopy when provided with a <ul><li>...</li>(x5)</ul> buttonBodyCopy", async () => {
         // Arrange
@@ -81,21 +81,26 @@ describe("service-package-radio.vue", () => {
                 propsData: mockProps,
             },
         });
-        
+
         // Act
         const results = wrapper.vm.getArrayOfListItemsFromRawCmsCopy(wrapper.vm.buttonBodyCopy);
 
         // Assert
-        const fileredResults = results.filter(result => {
-            return result.includes("<ul>") || result.includes("</ul>") || result.includes("<li>") || result.includes("</li>")
-        })
+        const fileredResults = results.filter((result) => {
+            return (
+                result.includes("<ul>") ||
+                result.includes("</ul>") ||
+                result.includes("<li>") ||
+                result.includes("</li>")
+            );
+        });
         expect(fileredResults.length).toBe(0);
-
     });
     it("Should get 5 strings from getArrayOfListItemsFromRawCmsCopy when buttonBodyCopy has 6 total <li>...</li>, but one is empty ", async () => {
         // Arrange
         const moddedProps = mockProps;
-        moddedProps['buttonBodyCopy'] = "<ul><li>buttonBodyCopy test copy</li><li>2</li><li>3</li><li>4</li><li>5</li><li></li></ul>";
+        moddedProps["buttonBodyCopy"] =
+            "<ul><li>buttonBodyCopy test copy</li><li>2</li><li>3</li><li>4</li><li>5</li><li></li></ul>";
         let { wrapper } = setupMocks({
             mountOptionsMockData: {
                 propsData: moddedProps,
@@ -114,9 +119,10 @@ const mockProps = {
     buttonLabel: "buttonLabel test copy",
     buttonLabelAuxillaryCopy: "buttonLabelAuxillaryCopy test copy",
     buttonLabelSubCopy: "buttonLabelSubCopy test copy",
-    buttonBodyCopy: "<ul><li>buttonBodyCopy test copy</li><li>2</li><li>3</li><li>4</li><li>5</li></ul>",
-    buttonFooterCopy: "buttonFooterCopy test copy"
-}
+    buttonBodyCopy:
+        "<ul><li>buttonBodyCopy test copy</li><li>2</li><li>3</li><li>4</li><li>5</li></ul>",
+    buttonFooterCopy: "buttonFooterCopy test copy",
+};
 
 function setupMocks({ mountOptionsMockData = {} }) {
     const wrapper = mount(servicePackageRadio, {

From b65c4c775c8773756a70b2fbd33c85438681df36 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 15 Nov 2022 09:03:42 -0500
Subject: [PATCH 19/22] CSR-935 fix focus state on list-button-horizontal.

Also fixed focus state on disabled button.
---
 src/styles/common-error-styles.scss | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index a30ee8996..f94c2cd0b 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -1,13 +1,10 @@
 html {
     .has-error {
-        // START HOVER
         &.list-button-horizontal,
         &.list-button,
         &.list-button.list-group,
         &.list-card {
-            border: 1px solid $red;
             position: relative;
-            z-index: 4;
 
             .button-content {
                 border: none;
@@ -17,9 +14,28 @@ html {
                 @include box-shadow-hover($red-200);
                 z-index: 5;
             }
+
             input[type="radio"]:focus + .list-button-content {
                 box-shadow: 0 0 0 2.5px $red;
             }
+
+            .list-button-horizontal-content {
+                border: 1px solid $red;
+            }
+
+            input[type="radio"]:focus + .list-button-horizontal-content {
+                z-index: 5;
+                box-shadow: 0 0 0 2.5px $red;
+            }
+
+            input[type="radio"]:hover + .list-button-horizontal-content {
+                z-index: 5;
+                box-shadow: none;
+            }
+        }
+
+        &.list-card {
+            border: 1px solid $red;
         }
 
         &.ui-radio {
@@ -35,7 +51,6 @@ html {
                 box-shadow: 0 0 0 2.5px $red;
             }
         }
-        // END HOVER
 
         &.list-button,
         &.list-card {
@@ -174,7 +189,7 @@ html {
         }
         &.btn.btn-primary:focus,
         &.btn.btn-primary:focus-visible {
-            box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $blue-700;
+            box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $gray-700;
         }
     }
 }

From 37eec48173502fa619912e1f834d68e968c968a5 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 15 Nov 2022 09:52:06 -0500
Subject: [PATCH 20/22] Fix error styles on list-group.

---
 src/styles/common-error-styles.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index f94c2cd0b..f7b8ce23e 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -19,6 +19,7 @@ html {
                 box-shadow: 0 0 0 2.5px $red;
             }
 
+            .list-button-content,
             .list-button-horizontal-content {
                 border: 1px solid $red;
             }
@@ -28,6 +29,7 @@ html {
                 box-shadow: 0 0 0 2.5px $red;
             }
 
+            input[type="radio"]:hover + .list-button-content,
             input[type="radio"]:hover + .list-button-horizontal-content {
                 z-index: 5;
                 box-shadow: none;

From 66e4184bcacd95159e2be71148bfe630777381aa Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 15 Nov 2022 15:50:05 -0500
Subject: [PATCH 21/22] CSR-946 fix button state and disable loader for modal
 buttons.

---
 src/common-components/modal/modal.vue         |  8 +++++++-
 src/ux-components/button-main/button-main.vue | 11 +++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index aa88fe9ea..9a8e6c211 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -25,7 +25,7 @@
                     <buttonMain
                         class="w-100"
                         ref="buttonMain"
-                        isPrimary
+                        suppressLoader
                         :buttonText="ModalCloseButtonText"
                         @click-event="buttonClick"
                         data-bs-dismiss="modal" />
@@ -60,6 +60,12 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
     },
+    mounted() {
+        const modal = document.querySelector("#" + this.cmsWidgetName);
+        modal.addEventListener("hidden.bs.modal", (event) => {
+            this.$refs.buttonMain.resetButtonStyle();
+        });
+    },
     components: {
         buttonMain,
     },
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index 47d608b5b..5c705f49d 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -1,7 +1,7 @@
 <template>
     <button
         :aria-disabled="isDisabled"
-        class="btn d-flex align-items-center py-3 px-4 delay"
+        class="btn d-flex align-items-center justify-content-center py-3 px-4 delay"
         :class="[
             isPrimary ? 'btn-primary' : 'btn-secondary',
             isFloat ? 'float-end' : '',
@@ -11,7 +11,7 @@
         <span class="m-0">{{ this.buttonText }}</span>
         <loader
             class="ms-2"
-            v-if="isLoaderDisplayed"
+            v-if="isLoaderDisplayed && !suppressLoader"
             v-bind:class="[this.loaderColor, this.loaderPosition]" />
     </button>
 </template>
@@ -28,6 +28,7 @@ export default {
         loaderColor: String,
         loaderPosition: String,
         isFloat: Boolean,
+        suppressLoader: Boolean,
     },
     data() {
         return {
@@ -50,6 +51,12 @@ export default {
                 this.$emit("click-event");
             }
         },
+        resetButtonStyle() {
+            this.isLoaderDisplayed = false;
+        },
+    },
+    mounted() {
+        this.isLoaderDisplayed = false;
     },
     components: {
         loader,

From 39966abc9f05fa331ec9601265685293cd3e39ad Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 16 Nov 2022 10:23:32 -0500
Subject: [PATCH 22/22] Update unit test.

---
 src/common-components/modal/modal.spec.js | 16 ++++++++++++++++
 src/common-components/modal/modal.vue     |  1 +
 2 files changed, 17 insertions(+)

diff --git a/src/common-components/modal/modal.spec.js b/src/common-components/modal/modal.spec.js
index 85472d6eb..2664accfa 100644
--- a/src/common-components/modal/modal.spec.js
+++ b/src/common-components/modal/modal.spec.js
@@ -6,6 +6,10 @@ describe("modal.vue", () => {
         // Act
         const wrapper = shallowMount(Modal, {
             mixins: [mockMixin],
+            props: {
+                cmsWidgetName: "test",
+            },
+            attachTo: document.body,
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["HeaderText"]));
     });
@@ -14,6 +18,10 @@ describe("modal.vue", () => {
         // Act
         const wrapper = shallowMount(Modal, {
             mixins: [mockMixin],
+            props: {
+                cmsWidgetName: "test",
+            },
+            attachTo: document.body,
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["SubheaderText"]));
     });
@@ -22,6 +30,10 @@ describe("modal.vue", () => {
         // Act
         const wrapper = shallowMount(Modal, {
             mixins: [mockMixin],
+            props: {
+                cmsWidgetName: "test",
+            },
+            attachTo: document.body,
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["Image"]));
     });
@@ -30,6 +42,10 @@ describe("modal.vue", () => {
         // Act
         const wrapper = shallowMount(Modal, {
             mixins: [mockMixin],
+            props: {
+                cmsWidgetName: "test",
+            },
+            attachTo: document.body,
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["BodyText"]));
     });
diff --git a/src/common-components/modal/modal.vue b/src/common-components/modal/modal.vue
index 9a8e6c211..d28e87bdd 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/common-components/modal/modal.vue
@@ -61,6 +61,7 @@ export default {
         },
     },
     mounted() {
+        console.log("#1", document);
         const modal = document.querySelector("#" + this.cmsWidgetName);
         modal.addEventListener("hidden.bs.modal", (event) => {
             this.$refs.buttonMain.resetButtonStyle();