From 8c8a2d55fcc1a74328453104b8d743b2ca3f1972 Mon Sep 17 00:00:00 2001 From: Kroell Date: Tue, 21 Mar 2023 11:47:37 -0400 Subject: [PATCH 1/5] change typeStyle to match mocks --- src/layouts/welcome-page/welcome-page.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index c64f072f..8b1a4a92 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -36,7 +36,7 @@
- +
From b05e69ba2c59b0737cba1d7b6e3fa206fb9ccf58 Mon Sep 17 00:00:00 2001 From: Kroell Date: Tue, 21 Mar 2023 11:48:04 -0400 Subject: [PATCH 2/5] remove extra padding to match mocks --- src/layouts/welcome-page/welcome-page.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index 8b1a4a92..20dd894b 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -35,7 +35,7 @@
-
+
From 1d400fe55cf6584ddb9db574ab940898c9ff865c Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 22 Mar 2023 19:55:55 +0530 Subject: [PATCH 3/5] Update welcome-page.vue hide City and state fields based on client --- src/layouts/welcome-page/welcome-page.vue | 75 +++++++++++++---------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index c64f072f..36fced7b 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -30,7 +30,7 @@ disableAutoFill :max="new Date().toJSON().slice(0,10)" :min="'1972-12-01'" - validationRules="loss-date-required" + validationRules="loss-date-required" />
@@ -54,34 +54,7 @@ /> -
-
- -
-
-
-
- -
-
+
+
+
+ +
+
+
+
+ +
+
{ - vm.setCmsContent(resultMap.cmsContent); + vm.setCmsContent(resultMap.cmsContent); }); }, methods: @@ -320,6 +323,12 @@ }; }, }, + displayDamageCityQuestion(){ + return !!this.$root.cmsContentByWidget.DamageCityQuestion; + }, + displayDamageStateQuestion(){ + return !!this.$root.cmsContentByWidget.DamageStateQuestion; + }, }, components: { siteHeader, From 8589ad258361a6f172749cb9d31e236b1f071d03 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 22 Mar 2023 22:18:49 +0530 Subject: [PATCH 4/5] SSR-305 update welcome-vue and unit test case --- src/layouts/welcome-page/welcome-page.spec.js | 24 +++++++++++-------- src/layouts/welcome-page/welcome-page.vue | 6 ++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js index 3d7d7d26..89a2d57b 100644 --- a/src/layouts/welcome-page/welcome-page.spec.js +++ b/src/layouts/welcome-page/welcome-page.spec.js @@ -8,26 +8,28 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import baseMixin from "@/mixins/base-mixin.js"; import { getMountOptions } from "@/helpers/unit-test-helper.js"; import { applicationConfig } from "@/constants/application-config"; - // Mock our module for promises. jest.mock("@/helpers/layout-helper.js", () => ({ - settleAllPromises: jest.fn(), + settleAllPromises: jest.fn(), })); // Mock fetchCmsContentForPage jest.mock("@/helpers/cms-content-helper", () => ({ - fetchCmsContentForPage: jest.fn(), + fetchCmsContentForPage: jest.fn() })); describe("welcome-page.vue", () => { test("Should render welcomePage sub-components (policyNumber, policyZipCode, dateOfLoss, damageCause etc.)", async () => { - // Arrange - const { wrapper } = setupMocks({}); + // Arrange + + const { wrapper } = setupMocks({}); + + // Act const policyNumber = wrapper.findComponent({ ref: "policyNumber" }); const dateOfLoss = wrapper.findComponent({ ref: "dateOfLoss" }); - const damageCause = wrapper.findComponent({ ref: "damageCause" }); + const damageCause = wrapper.findComponent({ ref: "damageCause" }); const damageCity = wrapper.findComponent({ ref: "damageCity" }); const state = wrapper.findComponent({ ref: "state" }); const glassOnlyDamage = wrapper.findComponent({ ref: "glassOnlyDamage" }); @@ -39,8 +41,8 @@ describe("welcome-page.vue", () => { expect(policyNumber.exists()).toBe(true); expect(dateOfLoss.exists()).toBe(true); expect(damageCause.exists()).toBe(true); - expect(damageCity.exists()).toBe(true); - expect(state.exists()).toBe(true); + expect(damageCity.exists()).toBe(false); + expect(state.exists()).toBe(false); expect(glassOnlyDamage.exists()).toBe(true); expect(phoneNumber.exists()).toBe(true); expect(email.exists()).toBe(true); @@ -68,12 +70,14 @@ function setupMocks({ }, }; - + //const $root = 'some test value or jasmine spy' mountOptionsMockData = { ...mountOptionsMockData, router: { navigate: jest.fn(), }, + + }; const apiPromise = Promise.resolve(apiResponses); @@ -86,7 +90,7 @@ function setupMocks({ const wrapper = shallowMount(welcomePage, mountOptions); wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent; - + wrapper.vm.getCmsContent = jest.fn().mockImplementation(() => ""); return { wrapper, apiPromise }; } diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index 36fced7b..d139d297 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -324,10 +324,10 @@ }, }, displayDamageCityQuestion(){ - return !!this.$root.cmsContentByWidget.DamageCityQuestion; + return !!this.getCmsContent("DamageCityQuestion","QuestionText"); }, - displayDamageStateQuestion(){ - return !!this.$root.cmsContentByWidget.DamageStateQuestion; + displayDamageStateQuestion(){ + return !!this.getCmsContent("DamageStateQuestion","QuestionText"); }, }, components: { From 53f36d72bf3e49d2d78e335b7f8c65fedadc5e61 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 22 Mar 2023 22:20:38 +0530 Subject: [PATCH 5/5] Update welcome-page.spec.js --- src/layouts/welcome-page/welcome-page.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js index 89a2d57b..d54ce1f7 100644 --- a/src/layouts/welcome-page/welcome-page.spec.js +++ b/src/layouts/welcome-page/welcome-page.spec.js @@ -70,7 +70,7 @@ function setupMocks({ }, }; - //const $root = 'some test value or jasmine spy' + mountOptionsMockData = { ...mountOptionsMockData, router: {