Cleaning up button emit changes and adjusting unit tests

2022-02-04 13:45:54 -05:00 · 2022-02-04 13:45:54 -05:00 · 17e05dcf66
commit 17e05dcf66
parent a3a3476d8f
18 changed files with 195 additions and 77 deletions
--- a/src/common-components/button-question/button-question.spec.js
+++ b/src/common-components/button-question/button-question.spec.js
@ -1,5 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import buttonQuestion from "@/common-components/button-question/button-question";
+import { nextTick } from "vue";

 describe("buttonQuestion.vue", () => {
  it("Should show overflow classes on fieldset if isOverflowScrollable is true", async () => {
@ -41,44 +42,32 @@ describe("buttonQuestion.vue", () => {
 });

 describe("buttonQuestion.vue", () => {
-  it("Should trigger event modelValue change on select", async () => {
+  it("Should trigger event modelValue change to new value on when radio button selected", async () => {
    // Act
    const wrapper = shallowMount(buttonQuestion);
-    await wrapper.setData({
-      modelValueAnswers: ["Windshield"],
-      chosenAnswer: "Windshield"
+    await wrapper.setProps({
+      answers: ["2022", "2021", "2020"],
+      isMultiSelect: false
    });
-    wrapper.setValue({ answer: wrapper.vm.chosenAnswer });
-    await wrapper.vm.$nextTick();
-    // Assert
-    expect(wrapper.emitted()["update:modelValue"][0]).toEqual([{answer: "Windshield"}]);
-  });
-});
-
-describe("buttonQuestion.vue", () => {
-  it("Should trigger event modelValue change with an array of string values on select if checked is true and multiple options are chosen", async () => {
-    // Act
-    const wrapper = shallowMount(buttonQuestion);
-    await wrapper.setData({
-      modelValueAnswers: ["Windshield", "BackDoor"]
-    });
-    wrapper.vm.handleCheckedChanged(true);
-    // Assert
-    expect(typeof wrapper.emitted()["update:modelValue"][0]).toEqual('object');
-  });
-});
-
-describe("buttonQuestion.vue", () => {
-  it("Should not trigger event modelValue change on select if checked is false", async () => {
-    // Act
-    const wrapper = shallowMount(buttonQuestion);
-    wrapper.setData({
-      modelValueAnswers: ["Front-door"]
-    })
-    const val = {isChecked : false, buttonId: "Front-door"}
+    const val = {isChecked: true, buttonId: "2021", }
    wrapper.vm.handleCheckedChanged(val);
    // Assert
-    expect(wrapper.emitted()["update:modelValue"][0]).toEqual([undefined]);
+    expect(wrapper.emitted()["update:modelValue"][0]).toEqual([["2021"]]);
+  });
+});
+
+describe("buttonQuestion.vue", () => {
+  it("Should add values to array on checkbox click", async () => {
+    // Act
+    const wrapper = shallowMount(buttonQuestion);
+    await wrapper.setProps({
+      modelValue: ["2022", "2021", "2020"],
+      isMultiSelect: true
+    });
+    const val = {isChecked: true, buttonId: "2019", }
+    wrapper.vm.handleCheckedChanged(val);
+    // Assert
+    expect(wrapper.emitted()["update:modelValue"][0]).toEqual([["2022", "2021", "2020", "2019"]]);
  });
 });

--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@ -30,7 +30,7 @@
              :altText="answer.Name ? answer.Name : answer"
              screenReaderOnlyText="(opens new window)"
              :colLength="this.answers.length < 3 ? '' : '-4'"
-              v-model="selectedValues"
+              :selectedButtonIDs="selectedValues"
              data-test="button"
            />
          </div>
@ -107,23 +107,23 @@ export default {
      }
    },
  },
-  data(){
-    return {
-      modelValueAnswers: [],
-    }
-  },
  mounted(){
    if(Array.isArray(this.answers) && this.answers.length === 1) {
-      this.modelValueAnswers.push(typeof(this.answers[0]) === 'object' ? this.answers[0].Name : this.answers[0]);
-      this.$emit("update:modelValue", this.modelValueAnswers);
+      const newSelectedValues = this.selectedValues;
+      newSelectedValues.push(typeof(this.answers[0]) === 'object' ? this.answers[0].Name : this.answers[0]);
+      this.selectedValues = newSelectedValues;
    }
  },
  methods: {
    handleCheckedChanged(val) {
-      // Add or remove item to array of data to emit
-      val.isChecked ? this.modelValueAnswers.push(val.buttonId) : this.modelValueAnswers.splice(this.modelValueAnswers.indexOf(val.buttonId), 1);
-      const answersToEmit = this.modelValueAnswers.length ? this.modelValueAnswers : undefined;
-      this.$emit("update:modelValue", answersToEmit);
+      if(this.isMultiSelect) {
+        // Add or remove item to array of data to emit
+        const newSelectedValues = this.selectedValues;
+        val.isChecked ? newSelectedValues.push(val.buttonId) : newSelectedValues.splice(newSelectedValues.indexOf(val.buttonId), 1);
+        this.selectedValues = newSelectedValues;
+      } else {
+        this.selectedValues = [val.buttonId]
+      }
    },
  },
  components: {
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@ -3,7 +3,7 @@
        <funnelHeader ref="funnelHeader" />
        <vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage=false />
        <funnelSubHeader ref="funnelSubHeader" :hasSubText=true />
-        <damageLocationQuestion ref="damageLocation" isMultiSelect v-model="damageLocationQuestionData" />
+        <damageLocationQuestion ref="damageLocation" v-model="damageLocationQuestionData" />
        <replaceOptionsQuestion ref="driverSideOptions" isAvailable isMultiSelect v-model="driverSideOptionsData" />
    </div>
 </template>
--- a/src/layouts/vehicle-make/make-question/make-question.vue
+++ b/src/layouts/vehicle-make/make-question/make-question.vue
@ -33,7 +33,7 @@ export default {
  computed: {
    selectedValueAsArray: {
      get: function() {
-        const modelValueAsArray = this.modelValue ? [this.modelValue] : null;
+        const modelValueAsArray = this.modelValue ? [this.modelValue] : [];
        return modelValueAsArray;
      },
      set: function(newValue) {
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@ -33,7 +33,7 @@ export default {
  name: "vehicle-make",
  data() {
    return {
-      selectedMake: String,
+      selectedMake: null,
    };
  },
  computed: {},
--- a/src/layouts/vehicle-model/model-question/model-question.vue
+++ b/src/layouts/vehicle-model/model-question/model-question.vue
@ -33,7 +33,7 @@ export default {
  computed: {
    selectedValueAsArray: {
      get: function() {
-        const modelValueAsArray = this.modelValue ? [this.modelValue] : null;
+        const modelValueAsArray = this.modelValue ? [this.modelValue] : [];
        return modelValueAsArray;
      },
      set: function(newValue) {
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@ -33,7 +33,7 @@ export default {
  name: "vehicle-model",
  data() {
    return {
-      selectedModel: String,
+      selectedModel: null,
    };
  },
  computed: {},
--- a/src/layouts/vehicle-style/style-question/style-question.vue
+++ b/src/layouts/vehicle-style/style-question/style-question.vue
@ -33,7 +33,7 @@ export default {
  computed: {
    selectedValueAsArray: {
      get: function() {
-        const modelValueAsArray = this.modelValue ? [this.modelValue] : null;
+        const modelValueAsArray = this.modelValue ? [this.modelValue] : [];
        return modelValueAsArray;
      },
      set: function(newValue) {
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@ -32,7 +32,7 @@ export default {
  name: "vehicle-style",
  data() {
    return {
-      selectedStyle: String,
+      selectedStyle: null,
    };
  },
  computed: {},
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@ -28,7 +28,7 @@ export default {
  name: "vehicle-year",
  data() {
    return {
-      selectedYear: String,
+      selectedYear: null,
    };
  },
  computed: {},
--- a/src/layouts/vehicle-year/year-question/year-question.spec.js
+++ b/src/layouts/vehicle-year/year-question/year-question.spec.js
@ -72,6 +72,7 @@ describe("year-question.vue", () => {
  });
 });

+
 function setupMocks({
  modelValueProp = "1900",
  cmsQuestionText = "CMS text goes here",
@ -89,6 +90,7 @@ function setupMocks({
  mountOptions.propsData = {
    modelValue: modelValueProp,
  };
+
  const wrapper = shallowMount(yearQuestion, mountOptions);

  //Mock CMS content
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@ -35,7 +35,7 @@ export default {
  computed: {
    selectedValueAsArray: {
      get: function() {
-        const modelValueAsArray = this.modelValue ? [this.modelValue] : null;
+        const modelValueAsArray = this.modelValue ? [this.modelValue] : [];
        return modelValueAsArray;
      },
      set: function(newValue) {
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
@ -173,4 +173,45 @@ describe("list-button-horizontal.vue", () => {

    expect(loader.attributes("style")).toContain("1rem");
  });
+
+  it("Should emit button value on click", async () => {
+    // Act
+    const wrapper = shallowMount(listButtonHorizontal, {
+      propsData: {
+        isRadioHorizontal: true,
+        buttonLabel: "Windshield",
+        buttonID: "List Card Checkbox",
+        groupID: "radio-demo-1",
+        groupName: "radio 1",
+        buttonImage: "windshield-damage.svg",
+        isRequired: true,
+        isWide: false,
+        modelValue: ["List Card Checkbox"],
+      },
+    });
+    wrapper.vm.handleCheckChange();
+    // Assert
+    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{buttonId: "List Card Checkbox", isChecked: Boolean}]);
+  });
+
+  it("Should set checkValue data if selectedButtonIDs has value(s)", async () => {
+    // Act
+    const wrapper = shallowMount(listButtonHorizontal, {
+      propsData: {
+        isRadioHorizontal: true,
+        buttonLabel: "Windshield",
+        buttonID: "List Card Checkbox",
+        groupID: "radio-demo-1",
+        groupName: "radio 1",
+        buttonImage: "windshield-damage.svg",
+        isRequired: true,
+        isWide: false,
+        modelValue: ["List Card Checkbox"],
+        isMultiSelect: false,
+        selectedButtonIDs: ["Car-Front"]
+      },
+    });
+    // Assert
+    expect(wrapper.componentVM.checkValue).toEqual("Car-Front");
+  });
 });
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@ -12,6 +12,7 @@
      :aria-required="isRequired" 
      :data-focus-target="groupName" 
      v-model="checkValue" 
+      @change="handleCheckChange"
    />
    <label 
      tabindex="-1" 
@ -69,7 +70,7 @@ export default {
      type: String,
      default: "",
    },
-    modelValue: [Array, String],
+    selectedButtonIDs: [Array, String],
  },
  data() {
    return {
@ -78,7 +79,9 @@ export default {
    };
  },
  created(){
-    this.checkValue = this.modelValue ? this.modelValue.includes(this.buttonID) : false;
+    if(this.selectedButtonIDs){
+      this.checkValue = this.isMultiSelect ? this.selectedButtonIDs.includes(this.buttonID) : this.selectedButtonIDs[0];
+    }
  },
  methods: {
    displayLoader() {
@ -90,12 +93,10 @@ export default {
      }
      this.handleChange(value);
    },
-  },
-  watch: {
-    checkValue(newValue, oldValue){
-      const isInitialization = typeof(oldValue) !== 'function';
-      if (isInitialization) {
-        this.$emit('isCheckedChanged', { isChecked: this.checkValue, buttonId: this.buttonID + '' });
+    handleCheckChange(newValue, oldValue){
+      const isInitialization = typeof(oldValue) === 'function';
+      if (!isInitialization) {
+        this.$emit('isCheckedChanged', { isChecked: this.checkValue, buttonId: this.buttonID.toString() });
      }
    }
  },
--- a/src/ux-components/list-button/list-button.spec.js
+++ b/src/ux-components/list-button/list-button.spec.js
@ -173,4 +173,44 @@ describe("list-button.vue", () => {

    expect(loader.attributes("style")).toContain("1rem");
  });
+
+  it("Should emit button value on click", async () => {
+    // Act
+    const wrapper = shallowMount(listButton, {
+      propsData: {
+        isRadioHorizontal: true,
+        buttonLabel: "Windshield",
+        buttonID: "List Card Checkbox",
+        groupID: "radio-demo-1",
+        groupName: "radio 1",
+        buttonImage: "windshield-damage.svg",
+        isRequired: true,
+        isWide: false,
+        modelValue: ["List Card Checkbox"],
+      },
+    });
+    wrapper.vm.handleCheckChange();
+    // Assert
+    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{buttonId: "List Card Checkbox", isChecked: Boolean}]);
+  });
+
+  it("Should set checkValue data if selectedButtonIDs has value(s)", async () => {
+    // Act
+    const wrapper = shallowMount(listButton, {
+      propsData: {
+        isRadioHorizontal: true,
+        buttonLabel: "Windshield",
+        buttonID: "List Card Checkbox",
+        groupID: "radio-demo-1",
+        groupName: "radio 1",
+        buttonImage: "windshield-damage.svg",
+        isRequired: true,
+        isWide: false,
+        modelValue: ["List Card Checkbox"],
+        selectedButtonIDs: ["Car-Front"]
+      },
+    });
+    // Assert
+    expect(wrapper.componentVM.checkValue).toEqual("Car-Front");
+  });
 });
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@ -12,6 +12,7 @@
      :aria-required="isRequired" 
      :data-focus-target="groupName" 
      v-model="checkValue"
+      @change="handleCheckChange"
    >
    <label 
      tabindex="-1" 
@ -71,7 +72,7 @@ export default {
      type: [String, Number],
      default: "",
    },
-    modelValue: [Array, String],
+    selectedButtonIDs: [Array, String],
  },
  data() {
    return {
@ -80,7 +81,9 @@ export default {
    };
  },
  created(){
-    this.checkValue = this.modelValue ? this.modelValue.includes(this.buttonID) : false;
+    if(this.selectedButtonIDs){
+      this.checkValue = this.isMultiSelect ? this.selectedButtonIDs.includes(this.buttonID) : this.selectedButtonIDs[0];
+    }
  },
  methods: {
    displayLoader() {
@ -92,12 +95,10 @@ export default {
      }
      this.handleChange(value);
    },
-  },
-  watch: {
-    checkValue(newValue, oldValue){
-      const isInitialization = typeof(oldValue) !== 'function';
-      if (isInitialization) {
-        this.$emit('isCheckedChanged', { isChecked: this.checkValue, buttonId: this.buttonID + '' });
+    handleCheckChange(newValue, oldValue){
+      const isInitialization = typeof(oldValue) === 'function';
+      if (!isInitialization) {
+        this.$emit('isCheckedChanged', { isChecked: this.checkValue, buttonId: this.buttonID.toString() });
      }
    }
  },
--- a/src/ux-components/list-card/list-card.spec.js
+++ b/src/ux-components/list-card/list-card.spec.js
@ -191,4 +191,45 @@ describe("list-card.vue", () => {
    expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-column", "pt-4", "pb-2"]);
  });

+  it("Should emit button value on click", async () => {
+    // Act
+    const wrapper = shallowMount(listCard, {
+      propsData: {
+        isRadioHorizontal: true,
+        buttonLabel: "Windshield",
+        buttonID: "List Card Checkbox",
+        groupID: "radio-demo-1",
+        groupName: "radio 1",
+        buttonImage: "windshield-damage.svg",
+        isRequired: true,
+        isWide: false,
+        modelValue: ["List Card Checkbox"],
+      },
+    });
+    wrapper.vm.handleCheckChange();
+    // Assert
+    expect(wrapper.emitted()["isCheckedChanged"][0]).toEqual([{buttonId: "List Card Checkbox", isChecked: Boolean}]);
+  });
+
+  it("Should set checkValue data if selectedButtonIDs has value(s)", async () => {
+    // Act
+    const wrapper = shallowMount(listCard, {
+      propsData: {
+        isRadioHorizontal: true,
+        buttonLabel: "Windshield",
+        buttonID: "List Card Checkbox",
+        groupID: "radio-demo-1",
+        groupName: "radio 1",
+        buttonImage: "windshield-damage.svg",
+        isRequired: true,
+        isWide: false,
+        modelValue: ["List Card Checkbox"],
+        selectedButtonIDs: ["Car-Front"]
+      },
+    });
+    // Assert
+    expect(wrapper.componentVM.checkValue).toEqual("Car-Front");
+  });
+
+
 });
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@ -12,6 +12,7 @@
        :aria-required="isRequired"
        :data-focus-target="groupName"
        v-model="checkValue"
+        @change="handleCheckChange"
       />
      <label
        :for="buttonID"
@ -70,7 +71,7 @@ export default {
      default: "",
    },
    colLength: String,
-    modelValue: [Array, String],
+    selectedButtonIDs: [Array, String],
  },
  data(){
    return {
@ -78,7 +79,9 @@ export default {
    }
  },
  created(){
-    this.checkValue = this.modelValue ? this.modelValue.includes(this.buttonID) : false;
+    if(this.selectedButtonIDs){
+      this.checkValue = this.isMultiSelect ? this.selectedButtonIDs.includes(this.buttonID) : this.selectedButtonIDs[0];
+    }
  },
  computed: {
    getLabelClasses() {
@ -93,11 +96,11 @@ export default {
      }
    },
  },
-  watch: {
-    checkValue(newValue, oldValue){
-      const isInitialization = typeof(oldValue) !== 'function';
-      if (isInitialization) {
-        this.$emit('isCheckedChanged', { isChecked: this.checkValue, buttonId: this.buttonID + '' });
+  methods: {
+    handleCheckChange(newValue, oldValue){
+      const isInitialization = typeof(oldValue) === 'function';
+      if (!isInitialization) {
+        this.$emit('isCheckedChanged', { isChecked: this.checkValue, buttonId: this.buttonID.toString() });
      }
    }
  },