From 462e4f93376e5e490bd6ebb1d611f08da237358b Mon Sep 17 00:00:00 2001 From: Matt Caimi Date: Thu, 1 Feb 2024 15:17:16 -0500 Subject: [PATCH] SSR-1064 linting --- src/constants/payment-method-constants.js | 8 +- src/iss-components/nav-bar/nav-bar.spec.js | 46 +++--- src/iss-components/nav-bar/nav-bar.vue | 43 +++--- .../payment-method-list-button.spec.js | 139 +++++++++--------- .../payment-method-list-button.vue | 38 ++--- .../payment-method-question.spec.js | 101 +++++++------ .../payment-method-question.vue | 56 +++---- src/layouts/payment-method/payment-method.vue | 58 +++----- src/store/index.js | 4 +- 9 files changed, 241 insertions(+), 252 deletions(-) diff --git a/src/constants/payment-method-constants.js b/src/constants/payment-method-constants.js index 0799f2b2..8f0ee825 100644 --- a/src/constants/payment-method-constants.js +++ b/src/constants/payment-method-constants.js @@ -1,7 +1,7 @@ export const paymentMethods = { NONE: null, - LATER: "Later", - CREDIT_CARD: "CreditCard", - PAYPAL: "Paypal", - AFTERPAY: "Afterpay", + LATER: 'Later', + CREDIT_CARD: 'CreditCard', + PAYPAL: 'Paypal', + AFTERPAY: 'Afterpay' }; diff --git a/src/iss-components/nav-bar/nav-bar.spec.js b/src/iss-components/nav-bar/nav-bar.spec.js index 68b9f6c8..bfd921a9 100644 --- a/src/iss-components/nav-bar/nav-bar.spec.js +++ b/src/iss-components/nav-bar/nav-bar.spec.js @@ -1,48 +1,55 @@ -import { mount } from "@vue/test-utils"; -import navbar from "./nav-bar"; +import { mount } from '@vue/test-utils'; +import navbar from './nav-bar'; -describe("nav-bar.vue", () => { - test("Should emit ForwardClicked on button click", async () => { +const mockMixin = { + methods: { + getCmsContent: jest.fn(), + getFooterInfoBoxHeight: jest.fn(() => 80) + } +}; + +describe('nav-bar.vue', () => { + test('Should emit ForwardClicked on button click', async () => { // Act const wrapper = mount(navbar, { - mixins: [mockMixin], + mixins: [mockMixin] }); wrapper.vm.buttonClick(); // Assert - expect(wrapper.emitted()["ForwardClicked"][0]).toHaveBeenCalled; + expect(wrapper.emitted()['ForwardClicked'][0]).toHaveBeenCalled; }); - test("Should emit BackClicked on link click", async () => { + test('Should emit BackClicked on link click', async () => { // Act const wrapper = mount(navbar, { - mixins: [mockMixin], + mixins: [mockMixin] }); wrapper.vm.linkClick(); // Assert - expect(wrapper.emitted()["BackClicked"][0]).toHaveBeenCalled; + expect(wrapper.emitted()['BackClicked'][0]).toHaveBeenCalled; }); - test("Should change button text when update button text is called", async () => { + test('Should change button text when update button text is called', async () => { // Act const wrapper = mount(navbar, { - mixins: [mockMixin], + mixins: [mockMixin] }); - wrapper.vm.updateButtonText("newText"); + wrapper.vm.updateButtonText('newText'); // Assert - expect(wrapper.componentVM.customButtontext).toBe("newText"); + expect(wrapper.componentVM.customButtontext).toBe('newText'); }); - test("should run removeLoader fn on buttonMain and return false for onkeydown fn", async () => { + test('should run removeLoader fn on buttonMain and return false for onkeydown fn', async () => { // Arrange const wrapper = mount(navbar, { - mixins: [mockMixin], + mixins: [mockMixin] }); // Act wrapper.vm.$refs.buttonMain.removeLoader = jest.fn(); wrapper.vm.removeLoader(); - const spy = jest.spyOn(document, "onkeydown"); + const spy = jest.spyOn(document, 'onkeydown'); document.onkeydown(); // Assert @@ -50,10 +57,3 @@ describe("nav-bar.vue", () => { expect(spy).toReturnWith(true); }); }); - -const mockMixin = { - methods: { - getCmsContent: jest.fn(), - getFooterInfoBoxHeight: jest.fn(() => 80), - }, -}; diff --git a/src/iss-components/nav-bar/nav-bar.vue b/src/iss-components/nav-bar/nav-bar.vue index 631e5c0e..67b107ee 100644 --- a/src/iss-components/nav-bar/nav-bar.vue +++ b/src/iss-components/nav-bar/nav-bar.vue @@ -43,41 +43,40 @@ diff --git a/src/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.spec.js b/src/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.spec.js index 8cf6c55b..523e10ba 100644 --- a/src/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.spec.js +++ b/src/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.spec.js @@ -1,87 +1,34 @@ -import { shallowMount } from "@vue/test-utils"; -import { getMountOptions } from "@/helpers/unit-test-helper.js"; +import { shallowMount } from '@vue/test-utils'; +import { getMountOptions } from '@/helpers/unit-test-helper.js'; -import paymentMethodListButton from "@/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button"; +// eslint-disable-next-line max-len +import paymentMethodListButton from '@/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.vue'; const testConstants = { images: { - A: "imageA", - B: "imageB", - NONE: null, + A: 'imageA', + B: 'imageB', + NONE: null }, names: { - A: "nameA", - B: "nameB", + A: 'nameA', + B: 'nameB' }, content: { - withInline: "Button text with {custom:inlineImage} inline.", - noInline: "Button text with no inline", + withInline: 'Button text with {custom:inlineImage} inline.', + noInline: 'Button text with no inline' }, }; let cmsContent; -describe("Payment Method Question", () => { - beforeEach(() => { - cmsContent = {}; - }); - - describe("Side image", () => { - it("Renders side image if image is present and not inline", () => { - // Arrange - const props = generateDefaultProps(); - const { wrapper } = setupMocks({ - propsData: props, - }); - - // Act - const showSideImage = wrapper.vm.shouldDisplaySideImage; - - expect(showSideImage).toBe(true); - }); - - it("Does not render side image if no image is present", () => { - // Arrange - let props = generateDefaultProps(); - - props.buttonImage = testConstants.images.NONE; - - const { wrapper } = setupMocks({ - propsData: props, - }); - - // Act - const showSideImage = wrapper.vm.shouldDisplaySideImage; - - expect(showSideImage).toBe(false); - }); - - it("Does not render side image if inline", () => { - // Arrange - let props = generateDefaultProps(); - - props.buttonLabel = testConstants.content.withInline; - props.altText = testConstants.content.withInline; - - const { wrapper } = setupMocks({ - propsData: props, - }); - - // Act - const showSideImage = wrapper.vm.shouldDisplaySideImage; - - expect(showSideImage).toBe(false); - }); - }); -}); - function generateDefaultProps() { return { buttonLabel: testConstants.noInline, altText: testConstants.noInline, - groupName: "payment-method", + groupName: 'payment-method', value: testConstants.names.A, - buttonImage: testConstants.images.A, + buttonImage: testConstants.images.A }; } @@ -91,9 +38,9 @@ function setupMocks(customMountOptions) { const mockMixin = { methods: { getCmsContent: jest.fn((widgetName, cmsFieldName) => { - return cmsContent?.[widgetName]?.[cmsFieldName] ?? ""; - }), - }, + return cmsContent?.[widgetName]?.[cmsFieldName] ?? ''; + }) + } }; mountOptions.global.mixins = [mockMixin]; @@ -102,3 +49,57 @@ function setupMocks(customMountOptions) { wrapper.vm.setCmsContent = jest.fn(); return { wrapper }; } + +describe('Payment Method Question', () => { + beforeEach(() => { + cmsContent = {}; + }); + + describe('Side image', () => { + it('Renders side image if image is present and not inline', () => { + // Arrange + const props = generateDefaultProps(); + const { wrapper } = setupMocks({ + propsData: props + }); + + // Act + const showSideImage = wrapper.vm.shouldDisplaySideImage; + + expect(showSideImage).toBe(true); + }); + + it('Does not render side image if no image is present', () => { + // Arrange + const props = generateDefaultProps(); + + props.buttonImage = testConstants.images.NONE; + + const { wrapper } = setupMocks({ + propsData: props + }); + + // Act + const showSideImage = wrapper.vm.shouldDisplaySideImage; + + expect(showSideImage).toBe(false); + }); + + it('Does not render side image if inline', () => { + // Arrange + const props = generateDefaultProps(); + + props.buttonLabel = testConstants.content.withInline; + props.altText = testConstants.content.withInline; + + const { wrapper } = setupMocks({ + propsData: props + }); + + // Act + const showSideImage = wrapper.vm.shouldDisplaySideImage; + + expect(showSideImage).toBe(false); + }); + }); +}); diff --git a/src/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.vue b/src/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.vue index 2763f1af..871f8ba7 100644 --- a/src/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.vue +++ b/src/layouts/payment-method/payment-method-question/payment-method-list-button/payment-method-list-button.vue @@ -1,8 +1,8 @@