diff --git a/src/constants/experiments.js b/src/constants/experiments.js index 18ca6387d..b702b11bb 100644 --- a/src/constants/experiments.js +++ b/src/constants/experiments.js @@ -8,7 +8,6 @@ const experimentSettings = { DISPLAY_AVAILABILITY_INDICATORS: "DisplayAvailabilityIndicators", PIA_EXPERIENCE: "PIA Experience", SUBMIT_ORDER_ENABLE_PIA: "SubmitOrder_Enable_PIA", - IS_EMAIL_OPTIONAL: "isEmailOptional", }; const experimentTriggers = { diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue index 2bc8071af..e30b7563e 100644 --- a/src/digital-components/textbox-question/textbox-question.vue +++ b/src/digital-components/textbox-question/textbox-question.vue @@ -125,10 +125,6 @@ export default { hideInput: Boolean, centerErrorMessage: Boolean, keyDownHandler: Function, - isEmailOptional: { - type: Boolean, - default: false, - }, }, setup(props) { const uuid = uuidv4(); @@ -206,9 +202,7 @@ export default { }, computed: { questionText() { - return this.isEmailOptional - ? this.getCmsContent(this.cmsWidgetName, "QuestionText") + " (optional)" - : this.getCmsContent(this.cmsWidgetName, "QuestionText"); + return this.getCmsContent(this.cmsWidgetName, "QuestionText"); }, value: { get: function () { diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js index 731e664dc..cce68d793 100644 --- a/src/layouts/address-lookup/address-lookup.spec.js +++ b/src/layouts/address-lookup/address-lookup.spec.js @@ -10,7 +10,6 @@ import { storeMutations } from "@/constants/store-mutations"; import { navigationScenarios } from "@/router/router-constants/navigation-scenarios"; import store from "@/store"; import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; -import { experimentSettings } from "@/constants/experiments"; jest.mock("@/helpers/damage-helper", () => ({ isGlassAvailableForCarId: jest.fn().mockImplementation(() => true), @@ -642,17 +641,6 @@ describe("address-lookup.vue", () => { }); }); -const mockMixin = { - methods: { - getSettingValue: jest.fn((settingName) => { - if (settingName === experimentSettings.IS_EMAIL_OPTIONAL) { - return "true"; - } - return "false"; - }), - }, -}; - function setupMocks({ isZipValid = true, isZipServiceable = true, @@ -721,7 +709,6 @@ function setupMocks({ }, }, }, - mixins: [mockMixin], }) ); diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 807bdc5ce..de0e8d5aa 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -20,11 +20,7 @@ - + + validationRules="email-address-required|email-address-format" />
@@ -81,7 +79,6 @@ export default { }), }, validationRules: String, - isEmailOptional: Boolean, }, computed: { customerModel: { diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js index 8ccc7446f..7d395e88d 100644 --- a/src/layouts/estimate/estimate.spec.js +++ b/src/layouts/estimate/estimate.spec.js @@ -11,7 +11,7 @@ import { settleAllPromises } from "@/helpers/layout-helper.js"; import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import baseMixin from "../../mixins/base-mixin"; import { vinLookupMethodSelections } from "@/constants/vin-lookup-method-selections.js"; -import { experimentSettings } from "@/constants/experiments"; + // Mock our module for promises. jest.mock("@/helpers/layout-helper.js", () => ({ settleAllPromises: jest.fn(), @@ -273,24 +273,12 @@ function setupMocks({ Answers: cmsAnswers, FunnelFooterWidget: FunnelFooterWidget, }; - const mockMixin = { - methods: { - getSettingValue: jest.fn((settingName) => { - if (settingName === experimentSettings.IS_EMAIL_OPTIONAL) { - return "true"; - } - return "false"; - }), - }, - }; + const apiPromise = Promise.resolve({ cmsContent }); settleAllPromises.mockImplementation(() => apiPromise); fetchCmsContentForPage.mockImplementation(() => Promise.resolve()); - const mountOptions = getMountOptions({ - ...mountOptionsMockData, - mixins: [baseMixin, mockMixin], - }); + const mountOptions = getMountOptions({ ...mountOptionsMockData, mixins: [baseMixin] }); mountOptions["attachTo"] = document.body; const wrapper = shallowMount(estimate, mountOptions); @@ -298,5 +286,6 @@ function setupMocks({ wrapper.vm.getZipCodeData = jest .fn() .mockReturnValue({ isValid: true, isServiceable: true, state: "OH" }); + return { wrapper, apiPromise }; } diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue index d2766f730..410c4d325 100644 --- a/src/layouts/estimate/estimate.vue +++ b/src/layouts/estimate/estimate.vue @@ -52,10 +52,9 @@ cmsWidgetName="EmailAddressQuestionWidget" v-model="emailAddress" inputId="emailAddress" - :isRequired="!IsEmailOptional" + isRequired disableAutoFill - :validationRules="EmailValidationRules" - :isEmailOptional="IsEmailOptional" /> + validationRules="email-address-required|email-address-format" /> "loader.gif"); jest.mock("@/assets/img/windshield.png", () => "windshield.png"); @@ -692,22 +691,12 @@ function setupMocks({ ], }; - const mockMixin = { - methods: { - getSettingValue: jest.fn((settingName) => { - if (settingName === experimentSettings.IS_EMAIL_OPTIONAL) { - return "true"; - } - return "false"; - }), - }, - }; const apiPromise = Promise.resolve(apiResponses); settleAllPromises.mockImplementation(() => apiPromise); fetchCmsContentForPage.mockImplementation(() => Promise.resolve()); - const mountOptions = getMountOptions({ ...mountOptionsMockData, mixins: [mockMixin] }); + const mountOptions = getMountOptions(mountOptionsMockData); mountOptions["attachTo"] = document.body; // append wrapper to document.body to test DOM methods const wrapper = shallowMount(licensePlateLookup, mountOptions); diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index 37d93cc8b..811dbea7b 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -34,9 +34,7 @@ cmsWidgetName="EmailAddressQuestionWidget" v-model="email" customInputId="email" - :isRequired="!IsEmailOptional" - :validationRules="EmailValidationRules" - :isEmailOptional="IsEmailOptional" /> + validationRules="email-address-required|email-address-format" /> diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js index 1d7d3f493..f25bc68db 100644 --- a/src/layouts/vin-lookup/vin-lookup.spec.js +++ b/src/layouts/vin-lookup/vin-lookup.spec.js @@ -3,7 +3,6 @@ import vinLookup from "./vin-lookup.vue"; import { getMountOptions } from "@/helpers/unit-test-helper.js"; import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js"; import { settleAllPromises } from "@/helpers/layout-helper.js"; -import { experimentSettings } from "@/constants/experiments"; import store from "@/store"; @@ -379,11 +378,5 @@ function mockOutStubFunctions(wrapper) { const mockMixin = { methods: { getCmsContent: jest.fn(() => "placeholder CMS content"), - getSettingValue: jest.fn((settingName) => { - if (settingName === experimentSettings.IS_EMAIL_OPTIONAL) { - return "true"; - } - return "false"; - }), }, }; diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index ae197aeb0..c809bae70 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -53,9 +53,8 @@ cmsWidgetName="EmailAddressQuestionWidget" v-model="emailAddress" customInputId="emailAddress" - :isRequired="!IsEmailOptional" - :validationRules="EmailValidationRules" - :isEmailOptional="IsEmailOptional" /> + isRequired + validationRules="email-address-required|email-address-format" /> diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js index e56b93e27..a0a435000 100644 --- a/src/mixins/vin-pages-mixin.js +++ b/src/mixins/vin-pages-mixin.js @@ -2,19 +2,8 @@ import { storeActions } from "@/constants/store-actions.js"; import store from "@/store"; import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin"; import { saveSession } from "@/helpers/heritage-integration/order-helper.js"; -import { experimentSettings } from "@/constants/experiments"; + export default { - computed: { - IsEmailOptional() { - const emailOptional = this.getSettingValue(experimentSettings.IS_EMAIL_OPTIONAL); - return emailOptional === "true"; - }, - EmailValidationRules() { - return this.IsEmailOptional - ? "email-address-format" - : "email-address-required|email-address-format"; - }, - }, methods: { async navigateForwardWithSingleCarMatch() { const pageName = this.$options?.name;