From 5d866d0d0471857136eef68aeda9d88a461ce2be Mon Sep 17 00:00:00 2001 From: CarlNation Date: Thu, 17 Feb 2022 08:05:05 -0500 Subject: [PATCH] CSR-269 --- .../button-question/button-question.vue | 2 +- .../replace-options-question.spec.js | 2 +- .../replace-options-question.vue | 7 +- src/layouts/vehicle-damage/vehicle-damage.vue | 5 - .../windshield-damage-type-question.vue | 99 ------------------- .../windshield-chip-count-question.spec.js | 71 +++++++++++++ .../windshield-chip-count-question.vue | 33 ++++--- .../windshield-damage-type-question.vue | 52 ++++++---- .../windshield-options/windshield-options.vue | 51 +++------- 9 files changed, 137 insertions(+), 185 deletions(-) delete mode 100644 src/layouts/vehicle-damage/windshield-damage-type-question/windshield-damage-type-question.vue create mode 100644 src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.spec.js diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue index 417230464..b7188d11a 100644 --- a/src/common-components/button-question/button-question.vue +++ b/src/common-components/button-question/button-question.vue @@ -121,7 +121,7 @@ export default { }, }, mounted(){ - if(Array.isArray(this.answers) && this.answers.length === 1) { + if(Array.isArray(this.answers) && this.answers.length === 1 && this.selectedValues != undefined) { const newSelectedValues = this.selectedValues; newSelectedValues.push(typeof(this.answers[0]) === 'object' ? this.answers[0].Name : this.answers[0]); this.selectedValues = newSelectedValues; diff --git a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.spec.js b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.spec.js index 103aecd4c..6098fc972 100644 --- a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.spec.js +++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.spec.js @@ -24,7 +24,7 @@ describe("replace-options-question.vue", () => { test("Answers to display filtered by data from api.", async () => { //Arrange - const { wrapper, cmsContent, replaceOptions } = setupMocks({ dataFromStoreApi: ["Windshield", "FrontDoor"]}); + const { wrapper, cmsContent, replaceOptions } = setupMocks({ dataFromStoreApi: ["Windshield", "FrontDoor"], filterByVehicleCategory}); //Act replaceOptionsQuestion.methods.initializeComponent.call(wrapper.vm, cmsContent, replaceOptions, "car-group"); diff --git a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue index 1a21573d1..558ced3f1 100644 --- a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue +++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue @@ -2,7 +2,7 @@
{ export default ({ name: "replaceOptionsQuestion", - updated() { - console.log("ro:modelValue=>" + this.modelValue); - }, data(){ return { questionText: String, @@ -51,7 +48,6 @@ export default ({ this.questionText = cmsContent.QuestionText; this.answersFromCms = cmsContent.Answers; this.replaceOptions = replaceOptions; - console.log("ro:" + this.questionText); }, }, computed: { @@ -60,7 +56,6 @@ export default ({ return this.modelValue; }, set: function(newValue) { - console.log("ro:newVal=>" + newValue); this.$emit("update:modelValue", newValue); } }, diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index 1b2ce8ce2..0c46b93a9 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -33,11 +33,6 @@ import baseMixin from "@/mixins/base-mixin"; export default { name: "vehicle-damage", - updated() { - console.log("vd:selectedWindshieldChipCount=>" + this.selectedWindshieldOptions.selectedWindshieldChipCount); - console.log("vd:selectedWindshieldDamageType=>" + this.selectedWindshieldOptions.selectedWindshieldDamageType); - console.log("vd:selectedWindshieldReplaceOptions=>" + this.selectedWindshieldOptions.selectedWindshieldReplaceOptions); - }, async beforeRouteEnter(to, from, next) { // Call APIs const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage); diff --git a/src/layouts/vehicle-damage/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-damage-type-question/windshield-damage-type-question.vue deleted file mode 100644 index 686f10de9..000000000 --- a/src/layouts/vehicle-damage/windshield-damage-type-question/windshield-damage-type-question.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - \ No newline at end of file diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.spec.js b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.spec.js new file mode 100644 index 000000000..5811bb1fa --- /dev/null +++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.spec.js @@ -0,0 +1,71 @@ +import { shallowMount } from "@vue/test-utils"; +import windshieldChipCountQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question"; +import { getMountOptions } from "@/helpers/unit-test-helper.js"; +import store from "@/store"; + +jest.mock("@/store", () => { return {}; }, {virtual: true}); + +describe("windshield-chip-count-question.vue", () => { + test("Selected chip count is emitted upon selection.", async () => { + //Arrange + const { wrapper } = setupMocks({ modelValueProp: "Two" }); + const chipCountToSelect = "Two"; + + //Act + wrapper.setValue({ modelValue: chipCountToSelect }); + await wrapper.vm.$nextTick(); + + //Assert + expect(wrapper.emitted()["update:modelValue"][0]).toEqual([{ modelValue: "Two" }]); + }); + }); + + describe("Windshield-chip-count-question.vue", () => { + test("Should display question and answers from api.", async () => { + + //Arrange + const { wrapper, cmsContent } = setupMocks({modelValueProp: "One"}); + + //Act + windshieldChipCountQuestion.methods.initializeComponent.call(wrapper.vm, cmsContent); + + //Assert + expect(wrapper.vm.questionText).toStrictEqual("How many chips are we repairing?"); + expect(wrapper.vm.answersFromCms).toStrictEqual([ { Name: 'One' }, { Name: 'Two' }, { Name: 'Three'} ]); + }); + }); + + function setupMocks({ + modelValueProp = ["Two"], + groupName = "WindshieldChipCountQuestion", + cmsQuestionText = "How many chips are we repairing?", + cmsAnswers = [{Name: "One"}, {Name: "Two"}, {Name: "Three"}], + dataFromStoreApi = [], + }) { + + //Mock store + store.dispatch = jest.fn(() => dataFromStoreApi); + store.getters = { vehicle: {year: 2019, make: 'honda', model: 'civc', style: '2 Door', category: 'CAR'} }; + const mountOptions = getMountOptions({ + store: { + dispatch: store.dispatch, + getters: store.getters, + }, + }); + + //Mock props + mountOptions.propsData = { + modelValue: modelValueProp + }; + + const wrapper = shallowMount(windshieldChipCountQuestion, mountOptions); + + //Mock CMS content + const cmsContent = { + groupName: groupName, + QuestionText: cmsQuestionText, + Answers: cmsAnswers, + }; + const damageOptions = dataFromStoreApi; + return { wrapper, cmsContent, damageOptions }; + } \ No newline at end of file diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue index fc3452dcb..41a3b872b 100644 --- a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue +++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue @@ -1,10 +1,11 @@