From 11cc2672a6da3587455b18ee3bd3adffc41cb679 Mon Sep 17 00:00:00 2001 From: Katie Date: Wed, 7 Sep 2022 16:57:02 -0400 Subject: [PATCH 1/4] CSR-820 Add back usage of getHasRecalibrationPart --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 5a2a3ba1d..0a57a82a3 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -391,7 +391,7 @@ export const getters = { funnelServiceZipCode: state.order.serviceLocation.zipCode, funnelParentAccountNumber: state.order.accountNumber, funnelIsCoverageVerified: state.order.payment.insuranceCoverage.isVerified, - funnelHasRecalibrationPart: getAllValuesOfPropertyInArrayOfObjects(state.order.lineItems.glassParts, "requiresRecalibration")?.length > 0, + funnelHasRecalibrationPart: getHasRecalibrationPart(state), funnelSelectedMultiGlass: state.order.damage.glassToReplace?.length > 1, funnelSelectedWindshieldGlass: getAllValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace, "glassLocation").includes(damageLocationsSelected.WINDSHIELD), funnelSelectedBackGlass: getAllValuesOfPropertyInArrayOfObjects(state.order.damage.glassToReplace, "glassLocation").includes(damageLocationsSelected.REAR), From 89d114edb287fe4f7d893e8558598c984ef01c32 Mon Sep 17 00:00:00 2001 From: Katie Date: Thu, 8 Sep 2022 08:20:21 -0400 Subject: [PATCH 2/4] Revert "Commented out tests" This reverts commit 16bbd465af2d3ad1558af1a5ce1dd5a4e82bb1b9. --- src/layouts/vehicle-make/vehicle-make.spec.js | 141 +++++++++--------- 1 file changed, 68 insertions(+), 73 deletions(-) diff --git a/src/layouts/vehicle-make/vehicle-make.spec.js b/src/layouts/vehicle-make/vehicle-make.spec.js index 7f68c1b23..c5ec3cba9 100644 --- a/src/layouts/vehicle-make/vehicle-make.spec.js +++ b/src/layouts/vehicle-make/vehicle-make.spec.js @@ -5,7 +5,7 @@ import { settleAllPromises } from "@/helpers/layout-helper.js"; import { nextTick } from "vue"; import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import baseMixin from "@/mixins/base-mixin.js"; -import analyticsMixIn from "@/mixins/analytics-mixin.js"; + // Components import vehicleMake from "@/layouts/vehicle-make/vehicle-make.vue"; import makeQuestion from "@/layouts/vehicle-make/make-question/make-question"; @@ -30,88 +30,83 @@ jest.mock("@/helpers/layout-helper.js", () => ({ settleAllPromises: jest.fn(), })); -test.todo("Removed for merging") -// describe("vehicle-make.vue", () => { -// // test("Make question component is initized with api data", async (done) => { -// // //Arrange -// // const makeQuestionInitialData = ["honda", "ford", "dodge"]; -// // const { wrapper, apiPromise } = setupMocks({ -// // makeQuestionInitialData: makeQuestionInitialData, -// // }); +describe("vehicle-make.vue", () => { + test("Make question component is initized with api data", async (done) => { + //Arrange + const makeQuestionInitialData = ["honda", "ford", "dodge"]; + const { wrapper, apiPromise } = setupMocks({ + makeQuestionInitialData: makeQuestionInitialData, + }); -// // //Act -// // vehicleMake.beforeRouteEnter.call( -// // wrapper.vm, -// // { query: { fmgPage: "vehicle-make" } }, -// // undefined, -// // (c) => c(wrapper.vm) -// // ); + //Act + vehicleMake.beforeRouteEnter.call( + wrapper.vm, + { query: { fmgPage: "vehicle-make" } }, + undefined, + (c) => c(wrapper.vm) + ); -// // //Assert -// // apiPromise.finally(() => { -// // expect(makeQuestion.methods.initializeComponent).toHaveBeenCalledWith( -// // makeQuestionInitialData -// // ); -// // done(); -// // }); -// // }); -// }); + //Assert + apiPromise.finally(() => { + expect(makeQuestion.methods.initializeComponent).toHaveBeenCalledWith( + makeQuestionInitialData + ); + done(); + }); + }); +}); -// describe("vehicle-make.vue", () => { -// // test("BackButtonAction triggers a router.navigateWithoutSaving change", async (done) => { -// // //Arrange -// // const { wrapper, apiPromise } = setupMocks({ -// // pageHeaderWidgetHeaderText: "Select a make to get started", -// // mountOptionsMockData: { -// // router: { -// // navigate: jest.fn(), -// // navigateWithoutSaving: jest.fn(), -// // }, -// // }, -// // }); +describe("vehicle-make.vue", () => { + test("BackButtonAction triggers a router.navigateWithoutSaving change", async (done) => { + //Arrange + const { wrapper, apiPromise } = setupMocks({ + pageHeaderWidgetHeaderText: "Select a make to get started", + mountOptionsMockData: { + router: { + navigate: jest.fn(), + navigateWithoutSaving: jest.fn(), + }, + }, + }); -// // //Act -// // vehicleMake.beforeRouteEnter.call( -// // wrapper.vm, -// // { query: { fmgPage: "vehicle-make" } }, -// // undefined, -// // (c) => c(wrapper.vm) -// // ); -// // wrapper.vm.backButtonAction(); -// // await nextTick(); + //Act + vehicleMake.beforeRouteEnter.call( + wrapper.vm, + { query: { fmgPage: "vehicle-make" } }, + undefined, + (c) => c(wrapper.vm) + ); + wrapper.vm.backButtonAction(); + await nextTick(); -// // //Assert -// // apiPromise.finally(() => { -// // expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalled(); -// // done(); -// // }); -// // }); -// }); + //Assert + apiPromise.finally(() => { + expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalled(); + done(); + }); + }); +}); -// describe("vehicle-make.vue", () => { -// // test("Year set, arePagePrerequisitesValid should be true ", async () => { -// // //Arrange -// // const { wrapper } = setupMocks({ -// // mountOptionsMockData: { -// // mixins: analyticsMixIn -// // } -// // }); +describe("vehicle-make.vue", () => { + test("Year set, arePagePrerequisitesValid should be true ", async () => { + //Arrange + const { wrapper } = setupMocks({}); -// // //Act -// // vehicleMake.beforeRouteEnter.call( -// // wrapper.vm, -// // { query: { fmgPage: "vehicle-make" } }, -// // undefined, -// // (c) => c(wrapper.vm) -// // ); + //Act + vehicleMake.beforeRouteEnter.call( + wrapper.vm, + { query: { fmgPage: "vehicle-make" } }, + undefined, + (c) => c(wrapper.vm) + ); -// // let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); + let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); -// // //Assert -// // expect(arePagePrerequisitesValid).toBe(true); -// // }); -// }); + //Assert + expect(arePagePrerequisitesValid).toBe(true); + }); +}); function setupMocks({ From 50bddd897a1053b61a92fcaf44ee445d2a211f06 Mon Sep 17 00:00:00 2001 From: Katie Date: Thu, 8 Sep 2022 08:21:09 -0400 Subject: [PATCH 3/4] Revert "fix hard coded value" This reverts commit b569225eff0528320a55d381172710e6333ac0b4. --- src/helpers/heritage-integration/cookie-helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js index 3eed5950b..98e96fdb3 100644 --- a/src/helpers/heritage-integration/cookie-helper.js +++ b/src/helpers/heritage-integration/cookie-helper.js @@ -74,7 +74,7 @@ export function getDeviceIdValue(){ return cookieValueMatch[0].split('=')[1]; } - return '00000000-0000-0000-0000-000000000000'; + return 'cf1ec454-36a8-4137-8842-5207e86ca0be'; } /* From b350eaae933b69f616a0178f233bd542441a231d Mon Sep 17 00:00:00 2001 From: Katie Date: Thu, 8 Sep 2022 08:24:08 -0400 Subject: [PATCH 4/4] Revert commit 'CSR-743 experiment integration testing' and change hasSettingEqualTo to use loose equality --- .../heritage-integration/cookie-helper.js | 2 +- src/layouts/test-one.vue | 15 -- src/layouts/test-two.vue | 15 -- src/layouts/vehicle-make/vehicle-make.vue | 177 ++++++++---------- src/mixins/experiment-mixin.js | 3 - src/router/index.js | 19 +- src/router/router-constants/routing-table.js | 10 - 7 files changed, 76 insertions(+), 165 deletions(-) delete mode 100644 src/layouts/test-one.vue delete mode 100644 src/layouts/test-two.vue diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js index 98e96fdb3..3eed5950b 100644 --- a/src/helpers/heritage-integration/cookie-helper.js +++ b/src/helpers/heritage-integration/cookie-helper.js @@ -74,7 +74,7 @@ export function getDeviceIdValue(){ return cookieValueMatch[0].split('=')[1]; } - return 'cf1ec454-36a8-4137-8842-5207e86ca0be'; + return '00000000-0000-0000-0000-000000000000'; } /* diff --git a/src/layouts/test-one.vue b/src/layouts/test-one.vue deleted file mode 100644 index 5ba269f2a..000000000 --- a/src/layouts/test-one.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/layouts/test-two.vue b/src/layouts/test-two.vue deleted file mode 100644 index 2ea5fd624..000000000 --- a/src/layouts/test-two.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue index 0fc05ec75..f5a42eefe 100644 --- a/src/layouts/vehicle-make/vehicle-make.vue +++ b/src/layouts/vehicle-make/vehicle-make.vue @@ -1,23 +1,20 @@ diff --git a/src/mixins/experiment-mixin.js b/src/mixins/experiment-mixin.js index 5161c0764..2a6b10f34 100644 --- a/src/mixins/experiment-mixin.js +++ b/src/mixins/experiment-mixin.js @@ -3,9 +3,6 @@ import store from "@/store"; export default { methods: { hasSettingEqualTo(settingName, settingValue) { - console.log(store.getters.experimentSettings) - console.log(store.getters.experimentSettings[settingName]) - console.log(settingValue) return store.getters.experimentSettings[settingName] == settingValue; }, hasSetting(settingName) { diff --git a/src/router/index.js b/src/router/index.js index 7a5855a40..4d14f70de 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -20,23 +20,8 @@ import store from "@/store"; import analyticsMixin from "@/mixins/analytics-mixin"; import { experimentTriggers } from "../constants/experiments"; import { applicationConfig } from "../constants/application-config"; -import TestOne from "@/layouts/test-one"; -import TestTwo from "@/layouts/test-two"; + const routes = [ - { - path: "/test1", - name: "test1", - components: { - default: TestOne - } - }, - { - path: "/test2", - name: "test2", - components: { - default: TestTwo - } - }, { path: "/", name: "root", @@ -240,8 +225,6 @@ function navigateToUrl(url, optionalQuery = {}) { externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]); } - externalUrl.searchParams.append("experiments", "ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true"); - window.location.assign(externalUrl); } diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index f4b47bca9..d17530145 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -7,16 +7,6 @@ const routingTable = function(store) { { fmgPageValue: fmgPageValues.VEHICLE_YEAR, maps: [ - { - scenario: navigationScenarios.SELECTED_YEAR, - destinationFmgPageValue: "test1", - filter: store.getters.vehicle.year === 2010 - }, - { - scenario: navigationScenarios.SELECTED_YEAR, - destinationFmgPageValue: "test2", - filter: store.getters.vehicle.year < 1954 - }, { scenario: navigationScenarios.SELECTED_YEAR, destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,