From 95fb49650f97ae2688804308b4aea0401116d549 Mon Sep 17 00:00:00 2001 From: Kulbhushan Kaushik Date: Thu, 12 Jan 2023 09:55:42 -0500 Subject: [PATCH 1/4] commit --- src/layouts/welcome-page/welcome-page.spec.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/layouts/welcome-page/welcome-page.spec.js diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js new file mode 100644 index 00000000..e69de29b From 375d91600f6976fc34672be14ce956670c66d1b9 Mon Sep 17 00:00:00 2001 From: Kulbhushan Kaushik Date: Thu, 12 Jan 2023 09:55:42 -0500 Subject: [PATCH 2/4] commit --- src/layouts/welcome-page/welcome-page.spec.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/layouts/welcome-page/welcome-page.spec.js diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js new file mode 100644 index 00000000..e69de29b From 9b587a37abfaaab31f46b41455525a5ac8c0d6d5 Mon Sep 17 00:00:00 2001 From: Kulbhushan Kaushik Date: Fri, 13 Jan 2023 12:27:29 -0500 Subject: [PATCH 3/4] commit --- src/layouts/welcome-page/welcome-page.spec.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js index e69de29b..d74519c8 100644 --- a/src/layouts/welcome-page/welcome-page.spec.js +++ b/src/layouts/welcome-page/welcome-page.spec.js @@ -0,0 +1,23 @@ +// Components +import welcomePage from "@/layouts/welcome-page/welcome-page.vue"; + +// Supporting files +import { shallowMount } from '@vue/test-utils'; +import { settleAllPromises } from "@/helpers/layout-helper.js"; +import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; +import baseMixin from "@/mixins/base-mixin.js"; +import { getMountOptions } from "@/helpers/unit-test-helper.js"; +import { nextTick } from "vue"; +import { useMainStore } from "@/store"; +import { applicationConfig } from "@/constants/application-config"; + + +// Mock our module for promises. +jest.mock("@/helpers/layout-helper.js", () => ({ + settleAllPromises: jest.fn(), +})); + +// Mock fetchCmsContentForPage +jest.mock("@/helpers/cms-content-helper", () => ({ + fetchCmsContentForPage: jest.fn(), +})); \ No newline at end of file From 4216ad524ee27a176a36b507035092be75140e51 Mon Sep 17 00:00:00 2001 From: Kulbhushan Kaushik Date: Mon, 16 Jan 2023 08:54:08 -0500 Subject: [PATCH 4/4] commit --- src/layouts/welcome-page/welcome-page.spec.js | 23 ------------------- src/layouts/welcome-page/welcome-page.vue | 4 ++-- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 src/layouts/welcome-page/welcome-page.spec.js diff --git a/src/layouts/welcome-page/welcome-page.spec.js b/src/layouts/welcome-page/welcome-page.spec.js deleted file mode 100644 index d74519c8..00000000 --- a/src/layouts/welcome-page/welcome-page.spec.js +++ /dev/null @@ -1,23 +0,0 @@ -// Components -import welcomePage from "@/layouts/welcome-page/welcome-page.vue"; - -// Supporting files -import { shallowMount } from '@vue/test-utils'; -import { settleAllPromises } from "@/helpers/layout-helper.js"; -import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; -import baseMixin from "@/mixins/base-mixin.js"; -import { getMountOptions } from "@/helpers/unit-test-helper.js"; -import { nextTick } from "vue"; -import { useMainStore } from "@/store"; -import { applicationConfig } from "@/constants/application-config"; - - -// Mock our module for promises. -jest.mock("@/helpers/layout-helper.js", () => ({ - settleAllPromises: jest.fn(), -})); - -// Mock fetchCmsContentForPage -jest.mock("@/helpers/cms-content-helper", () => ({ - fetchCmsContentForPage: jest.fn(), -})); \ No newline at end of file diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index 93f1c367..a727d734 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -91,7 +91,7 @@ inputId="phoneNumberField" cmsWidgetName="PhoneNumberQuestion" v-model="welcomePageModel.phoneNumber" - validationRules="phone-number-required" + validationRules="phone-number-required|phone-number-format" isRequired mask="###-###-####" disableAutoFill /> @@ -160,7 +160,7 @@ defineRule("phone-number-format", regex( - /\A[0-9]{3}-[0-9]{3}-[0-9]{4}\z/, + /^(\([0-9]{3}\)|[0-9]{3}) *[-.]? *[0-9]{3} *[-.]? *[0-9]{4}$/, errorMessages.PHONE_NUMBER_FORMAT ) );