From 54010aa81f4095f7f77f15a962dd955aec400800 Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Wed, 23 Aug 2023 10:12:41 -0400 Subject: [PATCH 1/5] Add prereq check --- src/layouts/review/review.vue | 63 ++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/src/layouts/review/review.vue b/src/layouts/review/review.vue index be0af585e..61538c8f3 100644 --- a/src/layouts/review/review.vue +++ b/src/layouts/review/review.vue @@ -111,8 +111,11 @@ import serviceLocationReview from "@/layouts/review/review-sections/service-loca import scheduleReview from "@/layouts/review/review-sections/schedule-review/schedule-review"; import customerReview from "@/layouts/review/review-sections/customer-review/customer-review"; +import { AppointmentTypeStrings } from "@/constants/schedule-constants"; + import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { settleAllPromises } from "@/helpers/layout-helper"; +import store from "@/store"; export default { name: "review", @@ -147,7 +150,65 @@ export default { }, methods: { arePagePrerequisitesValid() { - return true; + // Vehicle + const vehicle = store.getters.order.vehicle; + const vehicleReqs = vehicle.year && vehicle.make && vehicle.model && vehicle.style; + + // Damage + const damage = store.getters.order.damage; + const damageReqs = + (damage.isRepair && damage.numberOfChips) || damage.glassToReplace?.length; + + // Service Package + const lineItems = store.getters.order.lineItems; + // damageReqs handles checking for damage, even though it is also required for this section. + const packageReqs = (damage.isRepair || lineItems.glassParts) && lineItems.supportingItems && lineItems.vaps; + + // Service Location + const serviceLocation = store.getters.order.serviceLocation; + const mobileReqs = + serviceLocation.address && + serviceLocation.city && + serviceLocation.state && + serviceLocation.zipCode; + + const providerLocation = serviceLocation.provider.address; + const dropOffInshopReqs = + providerLocation.streetAddress && + providerLocation.city && + providerLocation.state && + providerLocation.zipCode; + + const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE; + + const serviceLocationReqs = + (isMobile && mobileReqs) || (!isMobile && dropOffInshopReqs); + + // Schedule + const schedule = store.getters.order.schedule; + const scheduleReqs = + schedule.date && + schedule.startTime && + schedule.endTime && + schedule.jobMaxMinutes && + schedule.jobMinMinutes; + + // Customer + const customer = store.getters.order.customer; + const customerReqs = + customer.firstName && + customer.lastName && + customer.phoneNumber && + customer.emailAddress; + + return ( + vehicleReqs && + damageReqs && + packageReqs && + serviceLocationReqs && + scheduleReqs && + customerReqs + ); }, backButtonAction() { this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route); From 076c48552e9c71bf0bc2f3aca1d713b92684d3ae Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Wed, 23 Aug 2023 14:14:52 -0400 Subject: [PATCH 2/5] Type Coerce --- src/layouts/review/review.vue | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/layouts/review/review.vue b/src/layouts/review/review.vue index 61538c8f3..6b2d26cff 100644 --- a/src/layouts/review/review.vue +++ b/src/layouts/review/review.vue @@ -152,32 +152,40 @@ export default { arePagePrerequisitesValid() { // Vehicle const vehicle = store.getters.order.vehicle; - const vehicleReqs = vehicle.year && vehicle.make && vehicle.model && vehicle.style; + const vehicleReqs = !!(vehicle.year && vehicle.make && vehicle.model && vehicle.style); // Damage const damage = store.getters.order.damage; - const damageReqs = - (damage.isRepair && damage.numberOfChips) || damage.glassToReplace?.length; + const damageReqs = !!( + (damage.isRepair && damage.numberOfChips) || + damage.glassToReplace?.length + ); // Service Package const lineItems = store.getters.order.lineItems; // damageReqs handles checking for damage, even though it is also required for this section. - const packageReqs = (damage.isRepair || lineItems.glassParts) && lineItems.supportingItems && lineItems.vaps; + const packageReqs = !!( + (damage.isRepair || lineItems.glassParts) && + lineItems.supportingItems && + lineItems.vaps + ); // Service Location const serviceLocation = store.getters.order.serviceLocation; - const mobileReqs = + const mobileReqs = !!( serviceLocation.address && serviceLocation.city && serviceLocation.state && - serviceLocation.zipCode; + serviceLocation.zipCode + ); const providerLocation = serviceLocation.provider.address; - const dropOffInshopReqs = + const dropOffInshopReqs = !!( providerLocation.streetAddress && providerLocation.city && providerLocation.state && - providerLocation.zipCode; + providerLocation.zipCode + ); const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE; @@ -186,20 +194,22 @@ export default { // Schedule const schedule = store.getters.order.schedule; - const scheduleReqs = + const scheduleReqs = !!( schedule.date && schedule.startTime && schedule.endTime && schedule.jobMaxMinutes && - schedule.jobMinMinutes; + schedule.jobMinMinutes + ); // Customer const customer = store.getters.order.customer; - const customerReqs = + const customerReqs = !!( customer.firstName && customer.lastName && customer.phoneNumber && - customer.emailAddress; + customer.emailAddress + ); return ( vehicleReqs && From 4d953cae649c68c3838393f8e35ca634a2032a79 Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Wed, 23 Aug 2023 14:35:01 -0400 Subject: [PATCH 3/5] Clarify damage requirements --- src/layouts/review/review.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/review/review.vue b/src/layouts/review/review.vue index 6b2d26cff..2fb033ea3 100644 --- a/src/layouts/review/review.vue +++ b/src/layouts/review/review.vue @@ -158,7 +158,7 @@ export default { const damage = store.getters.order.damage; const damageReqs = !!( (damage.isRepair && damage.numberOfChips) || - damage.glassToReplace?.length + (!damage.isRepair && damage.glassToReplace?.length) ); // Service Package From 06c095fcb1103369cbc6be3fc701bc06ca853ae7 Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Wed, 23 Aug 2023 14:54:28 -0400 Subject: [PATCH 4/5] Add tests --- src/layouts/review/review.spec.js | 361 +++++++++++++++++++++++++++++- 1 file changed, 360 insertions(+), 1 deletion(-) diff --git a/src/layouts/review/review.spec.js b/src/layouts/review/review.spec.js index 674dc71f7..bd1bfc5b6 100644 --- a/src/layouts/review/review.spec.js +++ b/src/layouts/review/review.spec.js @@ -1,3 +1,362 @@ +import { shallowMount } from "@vue/test-utils"; +import { getMountOptions } from "@/helpers/unit-test-helper.js"; +import store from "@/store"; + +import review from "@/layouts/review/review"; + +const testConstants = {}; + +jest.mock("@/store", () => ({ + commit: jest.fn(), + dispatch: jest.fn(), +})); + describe("Review Page", () => { - test.todo("Add more tests as specific functionality is added."); + beforeEach(() => { + store.getters = { + order: { + vehicle: { + year: "2020", + make: "Acura", + model: "MDX", + style: "4 door sedan", + }, + damage: { + isRepair: false, + numberOfChips: 2, + glassToReplace: ["dummy location value"], + }, + lineItems: { + glassParts: ["dummy part value"], + supportingItems: ["dummy supporting item"], + vaps: ["dummy vap"], + }, + serviceLocation: { + address: "address 1", + address2: "address 2", + city: "city", + state: "state", + zipCode: "zip code", + appointmentType: "Mobile", + provider: { + providerNumber: 1, + address: { + streetAddress: "provider address 1", + city: "provider city", + state: "provider state", + zipCode: "provider zip code", + }, + }, + }, + schedule: { + date: "date", + startTime: "start", + endTime: "end", + jobMinMinutes: "30", + jobMaxMinutes: "45", + }, + customer: { + firstName: "first name", + lastName: "last name", + emailAddress: "builddigitaltest@safelite.com", + phoneNumber: "555-555-5555", + isSmsOptIn: true, + }, + }, + }; + }); + describe("arePagePrerequisitesValid", () => { + test("Returns true for baseline valid state", () => { + // Arrange + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(true); + }); + test("Returns false for empty state", () => { + // Arrange + store.getters.order = { + vehicle: { + year: null, + make: null, + model: null, + style: null, + carId: null, + category: null, + vin: null, + imageUrl: null, + imageVifNumber: null, + imageColor: null, + registration: { + licensePlate: null, + }, + }, + serviceLocation: { + address: null, + address2: null, + city: null, + state: null, + zipCode: null, + zipCodeCtu: null, + appointmentType: null, + isVehicleProtected: null, + provider: { + providerNumber: null, + address: { + streetAddress: null, + city: null, + state: null, + zipCode: null, + zipCodeCtu: null, + }, + }, + techNotes: null, + }, + customer: { + firstName: null, + lastName: null, + emailAddress: null, + phoneNumber: null, + isSmsOptIn: null, + }, + damage: { + isRepair: null, + numberOfChips: null, + glassToReplace: null, + partQuestionAnswers: null, + moldingQuestionAnswers: null, + capabilityQuestionAnswers: null, + }, + lineItems: { + glassParts: null, + supportingItems: null, + vaps: null, + serverData: null, + }, + payment: { + isInsurance: null, + insuranceCoverage: { + isVerified: null, + coverageStatus: null, + }, + parentAccountNumber: 0, + }, + schedule: { + date: null, + startTime: null, + endTime: null, + routeCode: null, + jobMaxMinutes: null, + jobMinMinutes: null, + }, + referralNumber: null, + referralSequenceNumber: null, + referralDate: null, + referralCorrelationId: null, + eon: null, + }; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(false); + }); + describe("Damage requirements", () => { + test("Accepts null glassToReplace when is repair", () => { + // Arrange + store.getters.order.damage.isRepair = true; + store.getters.order.damage.glassToReplace = null; + store.getters.order.damage.numberOfChips = 1; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(true); + }); + test("Rejects 0 chips when repair", () => { + // Arrange + store.getters.order.damage.isRepair = true; + store.getters.order.damage.numberOfChips = 0; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(false); + }); + test("Rejects null chips when repair", () => { + // Arrange + store.getters.order.damage.isRepair = true; + store.getters.order.damage.numberOfChips = null; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(false); + }); + test("Accepts null chips when not repair", () => { + // Arrange + store.getters.order.damage.isRepair = false; + store.getters.order.damage.numberOfChips = null; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(true); + }); + test("Rejects empty glassToReplace when not repair", () => { + // Arrange + store.getters.order.damage.isRepair = false; + store.getters.order.damage.glassToReplace = null; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(false); + }); + test("Rejects null glassToReplace when not repair", () => { + // Arrange + store.getters.order.damage.isRepair = false; + store.getters.order.damage.glassToReplace = []; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(false); + }); + }); + describe("Package requirements", () => { + test("Accepts null glassParts when is repair", () => { + // Arrange + store.getters.order.damage.isRepair = true; + store.getters.order.lineItems.glassParts = null; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(true); + }); + test("Rejects null glassParts when not repair", () => { + // Arrange + store.getters.order.damage.isRepair = false; + store.getters.order.lineItems.glassParts = null; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(false); + }); + }); + describe("Service Location requirements", () => { + test("Accepts null provider address when mobile appointment", () => { + // Arrange + store.getters.order.serviceLocation.appointmentType = "Mobile"; + store.getters.order.serviceLocation.provider.address = {}; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(true); + }); + test("Reject null provider address when non-mobile appointment", () => { + // Arrange + store.getters.order.serviceLocation.appointmentType = "Inshop"; + store.getters.order.serviceLocation.provider.address = {}; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(false); + }); + test("Accepts null service location address when non-mobile appointment", () => { + // Arrange + store.getters.order.serviceLocation.appointmentType = "Inshop"; + store.getters.order.serviceLocation.address = null; + store.getters.order.serviceLocation.address2 = null; + store.getters.order.serviceLocation.zipCode = null; + store.getters.order.serviceLocation.city = null; + store.getters.order.serviceLocation.state = null; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(true); + }); + test("Rejects null service location address when mobile appointment", () => { + // Arrange + store.getters.order.serviceLocation.appointmentType = "Mobile"; + store.getters.order.serviceLocation.address = null; + store.getters.order.serviceLocation.address2 = null; + store.getters.order.serviceLocation.zipCode = null; + store.getters.order.serviceLocation.city = null; + store.getters.order.serviceLocation.state = null; + + const { wrapper } = setupMocks({}); + + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); + + // Assert + expect(isValid).toBe(false); + }); + }); + }); }); + +function setupMocks(customMountOptions) { + customMountOptions.store = store; + + const mountOptions = getMountOptions(customMountOptions); + + const mockMixin = { + methods: { + getCmsContent: jest.fn((widgetName, cmsFieldName) => { + return `${widgetName} ${cmsFieldName}`; + }), + }, + }; + + mountOptions.global.mixins = [mockMixin]; + + const wrapper = shallowMount(review, mountOptions); + wrapper.vm.setCmsContent = jest.fn(); + return { wrapper }; +} From 5d79f79c8834aa291dc094d699721367ad7b23d0 Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Wed, 23 Aug 2023 15:17:34 -0400 Subject: [PATCH 5/5] Formatting --- src/layouts/review/review.spec.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/layouts/review/review.spec.js b/src/layouts/review/review.spec.js index bd1bfc5b6..a4f82451d 100644 --- a/src/layouts/review/review.spec.js +++ b/src/layouts/review/review.spec.js @@ -235,17 +235,17 @@ describe("Review Page", () => { expect(isValid).toBe(false); }); test("Rejects null glassToReplace when not repair", () => { - // Arrange - store.getters.order.damage.isRepair = false; - store.getters.order.damage.glassToReplace = []; + // Arrange + store.getters.order.damage.isRepair = false; + store.getters.order.damage.glassToReplace = []; - const { wrapper } = setupMocks({}); + const { wrapper } = setupMocks({}); - // Act - const isValid = wrapper.vm.arePagePrerequisitesValid(); + // Act + const isValid = wrapper.vm.arePagePrerequisitesValid(); - // Assert - expect(isValid).toBe(false); + // Assert + expect(isValid).toBe(false); }); }); describe("Package requirements", () => {