diff --git a/jest.config.js b/jest.config.js index ec51cb6f7..5117c95e0 100644 --- a/jest.config.js +++ b/jest.config.js @@ -15,7 +15,7 @@ module.exports = { testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"], coverageThreshold: { global: { - statements: 60, + statements: 70, }, }, }; diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index da9d3b29f..e5826c81d 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -4,7 +4,6 @@ import store from "@/store"; export function fetchCmsContentForPage(fmgPage) { return store.dispatch(storeActions.GET_PAGE_DATA, { pageName: fmgPage }).then((response) => { - const pageDataFromCms = { isCmsContentReady: false }; diff --git a/src/helpers/cms-helper.spec.js b/src/helpers/cms-helper.spec.js new file mode 100644 index 000000000..bb0edafcb --- /dev/null +++ b/src/helpers/cms-helper.spec.js @@ -0,0 +1,53 @@ +import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; +import { dispatch } from "@/store"; + +jest.mock("@/store", () => ({ + dispatch: jest.fn() +})); + +it("cms-content-helper: Should return data from CMS", () => { + + // Arrange + const cmsMockData = { + Result: [ + { + Type: "VehicleBannerWidget", + Model: { + ImageId: "28452dcb-7762-4cc9-ab09-7643d0b89203", + GenericVehicleImage: "https://digitalconsumercms-dev.safelite.com/images/default-source/default-album/blurred-image.jpg?sfvrsn=a6ce3034_3", + GenericVehicleImageFilePath: "images/default-source/default-album/blurred-image.jpg" + } + }, + { + Type: "PageHeaderWidget", + Model: { + "HeaderText": "Select a year to get started" + } + }, + { + Type: "PageHeaderWidget", + Model: { + "HeaderText": "Select a model" + } + }, + { + Type: "RadioQuestionWidget", + Model: { + "QuestionText": "What year is your vehicle?" + } + } + ] + } + + dispatch.mockImplementation(() => Promise.resolve({ data: cmsMockData })); + + // Act + fetchCmsContentForPage('testPage').then((response) => { + + // Assert + expect(response.isCmsContentReady).toBe(true); + expect(response.PageHeaderWidget[0].HeaderText).toEqual('Select a year to get started'); + }); + +}); + diff --git a/src/helpers/layout-helper.js b/src/helpers/layout-helper.js index f3b4284dd..d62d4d59f 100644 --- a/src/helpers/layout-helper.js +++ b/src/helpers/layout-helper.js @@ -1,7 +1,7 @@ -export function settleAllPromises(layoutPromiseTable) { +export function settleAllPromises(promiseResultMap) { // Pull our keys out of the promise 'table' - const promiseNames = Object.entries(layoutPromiseTable); + const promiseNames = Object.entries(promiseResultMap); return Promise.allSettled(promiseNames.map(e => e[1]).map(n => n.promise)) .then(results => { @@ -11,8 +11,8 @@ export function settleAllPromises(layoutPromiseTable) { // Build a map of the results for (let i = 0; i < results.length; ++i) { - const promiseName = promiseNames[i][1].key; - + const promiseName = promiseNames[i][1].resultKey; + // Some Promises like the cms content call don't have a 'data' field // when returned, so other promises do. Map the results to the object // so that the object is the return data. diff --git a/src/helpers/layout-helper.spec.js b/src/helpers/layout-helper.spec.js new file mode 100644 index 000000000..f85667f64 --- /dev/null +++ b/src/helpers/layout-helper.spec.js @@ -0,0 +1,28 @@ +import { settleAllPromises } from "@/helpers/layout-helper"; + +it("layout-helper: Should settle all promises and return mapped promise results", () => { + + // Arrange + const mockPromiseOne = Promise.resolve({ data: "test-data" }); + const mockPromiseTwo = Promise.resolve({ data: "test-data-two" }); + + const promiseResultMap = [ + { + resultKey: "MockResultOne", + promise: mockPromiseOne, + }, + { + resultKey: "MockResultTwo", + promise: mockPromiseTwo, + }, + ]; + + // Act + settleAllPromises(promiseResultMap).then(results => { + + // Assert + expect(results.MockResultOne).toEqual('test-data'); + expect(results.MockResultTwo).toEqual('test-data-two'); + }); + +}) \ No newline at end of file diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index db2e75618..979b03139 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -23,30 +23,6 @@ export default { return this.$store.dispatch(type, payload); }, - GetContentFromCms() { - return this.dispatchNonBlockingStoreAction(this.storeActions.GET_PAGE_DATA,{ pageName: this.$route.query.fmgPage }).then((response) => { - - const pageDataFromCms = {}; - - response.data.Result.forEach((widget) => { - if (Object.values(this.widgetNames).includes(widget.Type)) { - // If we already have this widget, push it on the collection - if (widget.Type in pageDataFromCms) { - pageDataFromCms[widget.Type].push(widget.Model); - return; - } - - pageDataFromCms[widget.Type] = [widget.Model]; - - } - }); - - // Our 'Page' is ready because we have data now - this.isCmsContentReady = true; - - return pageDataFromCms; - }); - }, }, computed: { storeActions() { diff --git a/src/mixins/base-mixin.spec.js b/src/mixins/base-mixin.spec.js index 628a3ef2f..e3acbcbb7 100644 --- a/src/mixins/base-mixin.spec.js +++ b/src/mixins/base-mixin.spec.js @@ -1,7 +1,6 @@ import baseMixin from "@/mixins/base-mixin" import { storeActions } from "@/constants/store-actions.js"; import { widgetNames } from "@/constants/widget-names.js"; -import { flushPromises } from "@vue/test-utils"; describe("baseMixin.js", () => { test('dispatchNonblockingStoreAction: calls dispatch with type and payload', () => {