diff --git a/public/css/README.md b/public/css/README.md index 74cd82e39..a228213b2 100644 --- a/public/css/README.md +++ b/public/css/README.md @@ -6,7 +6,7 @@ This public/css folder uses a standalone .scss > .css setup. From a Terminal window, run the Sass Watch command from the public folder only: ```bash -sass --no-source-map --watch scss:css +sass --watch scss:css ``` This will compile and output .css files (into the public/css folder) that can be consumed by the Payment page. diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js index 71c782856..4326a5412 100644 --- a/src/constants/error-messages.js +++ b/src/constants/error-messages.js @@ -24,6 +24,7 @@ const errorMessages = { VIN_FORMAT: "Invalid VIN. Please make sure that you entered the correct 17-digit, alpha-numeric number. VINs do not contain the letters I, O, or Q", OPTION_REQUIRED: "Please select an option", + RECAL_ACK_REQUIRED: "Please acknowledge recalibration alert", VEHICLE_REQUIRED: "Please select a vehicle", MOBILE_LOCATION_REQUIRED: "Please enter your service address", DATE_REQUIRED: "Please select a date", diff --git a/src/digital-components/checkbox-question/checkbox-question.spec.js b/src/digital-components/checkbox-question/checkbox-question.spec.js index 3c5d75bf9..fa9fc5294 100644 --- a/src/digital-components/checkbox-question/checkbox-question.spec.js +++ b/src/digital-components/checkbox-question/checkbox-question.spec.js @@ -29,11 +29,25 @@ describe("checkbox-question.vue", () => { expect(input.attributes().name).toEqual("Checkbox"); }); - it("Should return checkbox id", async () => { + it("Should return default id when no custom id is specified", async () => { + // Act + const wrapper = shallowMount(checkboxQuestion, { + propsData: {}, + mixins: [mockMixin], + }); + + // Assert + const input = wrapper.find("input"); + + // Expect + expect(input.attributes().id).not.toBeFalsy(); + }); + + it("Should return custom id when specified", async () => { // Act const wrapper = shallowMount(checkboxQuestion, { propsData: { - buttonID: "Checkbox ID", + customInputId: "Checkbox ID", }, mixins: [mockMixin], }); diff --git a/src/digital-components/checkbox-question/checkbox-question.vue b/src/digital-components/checkbox-question/checkbox-question.vue index 6d3777210..d16c27df3 100644 --- a/src/digital-components/checkbox-question/checkbox-question.vue +++ b/src/digital-components/checkbox-question/checkbox-question.vue @@ -10,32 +10,67 @@ type="checkbox" aria-checked="false" :name="checkboxName" - :id="buttonID" + :validationRules="validationRules" + :id="inputId" :tabindex="tabIndex" :aria-required="isRequired" /> -

+ {{ screenReaderOnlyText }} @@ -56,6 +109,7 @@ export default { .form-check-input { border: 1px solid $gray-500; border-radius: 2px; + min-width: 1rem; // Prevent squish &:checked { background-size: 125%; border: 1px solid $blue; diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index c19dae63a..a712b8127 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -1,9 +1,10 @@