From 84bda8f03a538f13bdeeda0f7c7b71e86dfc1e54 Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Tue, 15 Nov 2022 16:43:06 -0500 Subject: [PATCH 01/13] updated store reference in store.spec --- src/store/store.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/store.spec.js b/src/store/store.spec.js index 9f5db937..1592e86b 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -1,4 +1,4 @@ -import { useMainStore } from "./" +import { useMainStore } from '@/store'; import { createApp } from 'vue'; import { createPinia } from "pinia"; import App from '@/App.vue'; From 04aebdafdcd081d882572d50b1c5b8ac6a56739a Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 09:43:17 -0500 Subject: [PATCH 02/13] update testing to try to correct build errors --- src/ux-components/alert/alert.spec.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ux-components/alert/alert.spec.js b/src/ux-components/alert/alert.spec.js index 343323b9..fcccbf4f 100644 --- a/src/ux-components/alert/alert.spec.js +++ b/src/ux-components/alert/alert.spec.js @@ -12,6 +12,7 @@ describe("alert.vue", () => { isDismissible: true, manualHeadline: "testHeader", manualCopy: "testCopy", + cmsWidgetName: "alert", }, }) ); @@ -31,6 +32,7 @@ describe("alert.vue", () => { alertClass: "warning", manualHeadline: "testHeader", manualCopy: "testCopy", + cmsWidgetName: "alert", }, }) ); @@ -57,6 +59,7 @@ describe("alert.vue", () => { propsData: { manualHeadline: "testHeader", manualCopy: "testCopy with a {routerLink: testName, testLink} inside of it", + cmsWidgetName: "alert", }, stubs: ["router-link"], }) @@ -74,6 +77,7 @@ describe("alert.vue", () => { manualHeadline: "testHeader", manualCopy: "

testCopy with a {routerLink: testName, testLink} inside of it

and two paragraphs

", + cmsWidgetName: "alert", }, stubs: ["router-link"], }) From 04c5c291ab2a5c2f51c86730a27cc4f9d3f08f9c Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 10:00:25 -0500 Subject: [PATCH 03/13] update testing to clear some warning and try to get build to pass --- src/layouts/vehicle-make/vehicle-make.spec.js | 2 +- src/layouts/vehicle-model/vehicle-model.spec.js | 3 +-- src/layouts/vehicle-style/vehicle-style.spec.js | 3 +-- src/layouts/vehicle-year/vehicle-year.spec.js | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/layouts/vehicle-make/vehicle-make.spec.js b/src/layouts/vehicle-make/vehicle-make.spec.js index 48d995a6..ff018348 100644 --- a/src/layouts/vehicle-make/vehicle-make.spec.js +++ b/src/layouts/vehicle-make/vehicle-make.spec.js @@ -85,7 +85,7 @@ describe("vehicle-make.vue", () => { }); - test("Year set, arePagePrerequisitesValid should be true ", async () => { + test("Year set, arePagePrerequisitesValid should be true ", () => { //Arrange const { wrapper } = setupMocks({}); useMainStore().order.vehicle.year = 2001; diff --git a/src/layouts/vehicle-model/vehicle-model.spec.js b/src/layouts/vehicle-model/vehicle-model.spec.js index 2e47b7fb..8e5a9593 100644 --- a/src/layouts/vehicle-model/vehicle-model.spec.js +++ b/src/layouts/vehicle-model/vehicle-model.spec.js @@ -86,7 +86,7 @@ describe("vehicle-model.vue", () => { }); describe("vehicle-model.vue", () => { - test("Make set, arePagePrerequisitesValid should be true ", async () => { + test("Make set, arePagePrerequisitesValid should be true ", () => { //Arrange const { wrapper } = setupMocks({}); useMainStore().order.vehicle.make = "Honda"; @@ -100,7 +100,6 @@ describe("vehicle-model.vue", () => { ); let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); - await nextTick(); //Assert expect(arePagePrerequisitesValid).toBe(true); diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index 3b055afd..f44249a7 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -87,7 +87,7 @@ describe("vehicle-style.vue", () => { }); }); - test("Model set, arePagePrerequisitesValid should be true ", async () => { + test("Model set, arePagePrerequisitesValid should be true ", () => { //Arrange const { wrapper } = setupMocks({}); useMainStore().order.vehicle = { year: 2011, make: "ford", model: "mustang", style: null } @@ -101,7 +101,6 @@ describe("vehicle-style.vue", () => { ); let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); - await nextTick(); //Assert expect(arePagePrerequisitesValid).toBe(true); diff --git a/src/layouts/vehicle-year/vehicle-year.spec.js b/src/layouts/vehicle-year/vehicle-year.spec.js index 5db8c4ed..a590aaa5 100644 --- a/src/layouts/vehicle-year/vehicle-year.spec.js +++ b/src/layouts/vehicle-year/vehicle-year.spec.js @@ -51,7 +51,7 @@ describe("vehicle-year.vue", () => { }); describe("vehicle-year.vue", () => { - test("arePagePrerequisitesValid should be true ", async () => { + test("arePagePrerequisitesValid should be true ", () => { //Arrange const { wrapper } = setupMocks({}); @@ -64,7 +64,6 @@ describe("vehicle-year.vue", () => { ); let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); - await nextTick(); //Assert expect(arePagePrerequisitesValid).toBe(true); From 36f08d9a145b46c5c5212020c496b3003ee1d32b Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 10:12:52 -0500 Subject: [PATCH 04/13] another test --- src/layouts/vehicle-style/vehicle-style.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index f44249a7..3617f1bd 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -26,7 +26,7 @@ describe("vehicle-style.vue", () => { beforeEach(() => { jest.clearAllMocks(); }); - +/* test("Style question component is initized with api data", async () => { //Arrange const styleQuestionInitialData = ["2 Door", "4 Door"]; @@ -86,7 +86,7 @@ describe("vehicle-style.vue", () => { } }); }); - +*/ test("Model set, arePagePrerequisitesValid should be true ", () => { //Arrange const { wrapper } = setupMocks({}); From 4655f38dec54234c151c85f7a432c6f65482495d Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 10:17:48 -0500 Subject: [PATCH 05/13] isolating the test --- src/layouts/vehicle-style/vehicle-style.spec.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index 3617f1bd..ae0fac90 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -87,6 +87,7 @@ describe("vehicle-style.vue", () => { }); }); */ +/* test("Model set, arePagePrerequisitesValid should be true ", () => { //Arrange const { wrapper } = setupMocks({}); @@ -105,6 +106,7 @@ describe("vehicle-style.vue", () => { //Assert expect(arePagePrerequisitesValid).toBe(true); }); + */ }); function setupMocks({ From ee210a18c450eef595702e4c082d53ef34f4520c Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 10:22:18 -0500 Subject: [PATCH 06/13] forgot to add at least one test --- src/layouts/vehicle-style/vehicle-style.spec.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index ae0fac90..7f717fd2 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -107,6 +107,10 @@ describe("vehicle-style.vue", () => { expect(arePagePrerequisitesValid).toBe(true); }); */ + + test("test", () => { + expect(true).toBe(true); + }) }); function setupMocks({ From 3fc7c0bde760a4bec13815d0f4649fcd4ee4a4df Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 10:29:08 -0500 Subject: [PATCH 07/13] continue to isolate test --- src/layouts/vehicle-style/vehicle-style.spec.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index 7f717fd2..9ddb95fb 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -26,7 +26,7 @@ describe("vehicle-style.vue", () => { beforeEach(() => { jest.clearAllMocks(); }); -/* + test("Style question component is initized with api data", async () => { //Arrange const styleQuestionInitialData = ["2 Door", "4 Door"]; @@ -86,7 +86,7 @@ describe("vehicle-style.vue", () => { } }); }); -*/ + /* test("Model set, arePagePrerequisitesValid should be true ", () => { //Arrange @@ -108,9 +108,6 @@ describe("vehicle-style.vue", () => { }); */ - test("test", () => { - expect(true).toBe(true); - }) }); function setupMocks({ From aa4cd108c1c7af1b887d9b4e72a7e7911521cc9b Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 10:45:16 -0500 Subject: [PATCH 08/13] test --- src/layouts/vehicle-style/vehicle-style.spec.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index 9ddb95fb..3487e173 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -23,9 +23,6 @@ jest.mock("@/helpers/cms-content-helper", () => ({ })); describe("vehicle-style.vue", () => { - beforeEach(() => { - jest.clearAllMocks(); - }); test("Style question component is initized with api data", async () => { //Arrange @@ -87,26 +84,18 @@ describe("vehicle-style.vue", () => { }); }); -/* test("Model set, arePagePrerequisitesValid should be true ", () => { //Arrange const { wrapper } = setupMocks({}); useMainStore().order.vehicle = { year: 2011, make: "ford", model: "mustang", style: null } //Act - vehicleStyle.beforeRouteEnter.call( - wrapper.vm, - { query: { issPage: "vehicle-style" } }, - undefined, - (c) => c(wrapper.vm) - ); - - let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); + const arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); //Assert expect(arePagePrerequisitesValid).toBe(true); }); - */ + }); From 7815775463224f507e2684e05c1fdfaa64532bc9 Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 10:57:05 -0500 Subject: [PATCH 09/13] test --- src/layouts/vehicle-style/vehicle-style.spec.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index 3487e173..e2c440a1 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -23,7 +23,7 @@ jest.mock("@/helpers/cms-content-helper", () => ({ })); describe("vehicle-style.vue", () => { - +/* test("Style question component is initized with api data", async () => { //Arrange const styleQuestionInitialData = ["2 Door", "4 Door"]; @@ -96,7 +96,18 @@ describe("vehicle-style.vue", () => { expect(arePagePrerequisitesValid).toBe(true); }); + */ + test("Model set, arePagePrerequisitesValid should be true ", () => { + //Arrange + const { wrapper } = setupMocks({}); + //useMainStore().order.vehicle = { year: 2011, make: "ford", model: "mustang", style: null } + //Act + //const arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); + + //Assert + expect(true).toBe(true); + }); }); function setupMocks({ From f84ff4a26e887115b317d225042fc02d4877a616 Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 11:03:58 -0500 Subject: [PATCH 10/13] test --- src/layouts/vehicle-style/vehicle-style.spec.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index e2c440a1..0701da80 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -116,6 +116,8 @@ function setupMocks({ pageHeaderWidgetHeaderText = {}, mountOptionsMockData = {}, }) { + const wrapper = {}; + const apiPromise = {}; //Mock api responses const apiResponses = { cmsContent: { @@ -132,7 +134,7 @@ function setupMocks({ }, styleQuestionInitialData: styleQuestionInitialData, }; - +/* const apiPromise = Promise.resolve(apiResponses); settleAllPromises.mockImplementation(() => apiPromise); @@ -152,6 +154,6 @@ function setupMocks({ styleQuestion.methods.initializeComponent; wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent; - + */ return { wrapper, apiPromise }; } From 4122ec257dd4a8c9ab15635937e53abc6866dc3a Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 11:19:23 -0500 Subject: [PATCH 11/13] test --- 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 8653686c..4010c854 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -198,7 +198,7 @@ export const useMainStore = defineStore({ payload: {}, }) .then((response) => { - updateVehicle(response.vehicle); + this.updateVehicle(response.vehicle); return response; }); }, From c008ac3ff31f8a60568ef090ca8e2faa0b06cc8c Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 11:24:21 -0500 Subject: [PATCH 12/13] test fix --- .../vehicle-style/vehicle-style.spec.js | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index 0701da80..41cf7b06 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -23,7 +23,7 @@ jest.mock("@/helpers/cms-content-helper", () => ({ })); describe("vehicle-style.vue", () => { -/* + test("Style question component is initized with api data", async () => { //Arrange const styleQuestionInitialData = ["2 Door", "4 Door"]; @@ -95,19 +95,7 @@ describe("vehicle-style.vue", () => { //Assert expect(arePagePrerequisitesValid).toBe(true); }); - - */ - test("Model set, arePagePrerequisitesValid should be true ", () => { - //Arrange - const { wrapper } = setupMocks({}); - //useMainStore().order.vehicle = { year: 2011, make: "ford", model: "mustang", style: null } - //Act - //const arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid(); - - //Assert - expect(true).toBe(true); - }); }); function setupMocks({ @@ -116,8 +104,6 @@ function setupMocks({ pageHeaderWidgetHeaderText = {}, mountOptionsMockData = {}, }) { - const wrapper = {}; - const apiPromise = {}; //Mock api responses const apiResponses = { cmsContent: { @@ -134,7 +120,7 @@ function setupMocks({ }, styleQuestionInitialData: styleQuestionInitialData, }; -/* + const apiPromise = Promise.resolve(apiResponses); settleAllPromises.mockImplementation(() => apiPromise); @@ -154,6 +140,6 @@ function setupMocks({ styleQuestion.methods.initializeComponent; wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent; - */ + return { wrapper, apiPromise }; } From c186786b755291d8c4b8674360b7cfab7f4f4533 Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 16 Nov 2022 11:28:38 -0500 Subject: [PATCH 13/13] last fix --- 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 4010c854..8bb518fd 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -198,7 +198,7 @@ export const useMainStore = defineStore({ payload: {}, }) .then((response) => { - this.updateVehicle(response.vehicle); + this.updateVehicle(response.data); return response; }); },