From 6d00d4327341507453f65aa7b9947b76cfc7f527 Mon Sep 17 00:00:00 2001 From: Keith Grant Date: Tue, 1 Oct 2019 15:20:51 -0700 Subject: [PATCH] prettier --- .../src/components/MultiSelect/MultiSelect.jsx | 4 +++- .../components/MultiSelect/MultiSelect.test.jsx | 15 ++++++++++++--- .../JobTemplateAdd/JobTemplateAdd.test.jsx | 14 +++++--------- .../JobTemplateEdit/JobTemplateEdit.test.jsx | 2 +- .../screens/Template/shared/LabelSelect.test.jsx | 9 +++------ .../Template/shared/PlaybookSelect.test.jsx | 2 +- awx/ui_next/src/util/lists.js | 2 +- awx/ui_next/src/util/lists.test.js | 2 +- 8 files changed, 27 insertions(+), 23 deletions(-) diff --git a/awx/ui_next/src/components/MultiSelect/MultiSelect.jsx b/awx/ui_next/src/components/MultiSelect/MultiSelect.jsx index b4676dc513..1f00008859 100644 --- a/awx/ui_next/src/components/MultiSelect/MultiSelect.jsx +++ b/awx/ui_next/src/components/MultiSelect/MultiSelect.jsx @@ -210,7 +210,9 @@ class MultiSelect extends Component { {value.map(item => ( { this.removeItem(item); }} + onClick={() => { + this.removeItem(item); + }} > {item.name} diff --git a/awx/ui_next/src/components/MultiSelect/MultiSelect.test.jsx b/awx/ui_next/src/components/MultiSelect/MultiSelect.test.jsx index 77c2beae1b..e18ed64eff 100644 --- a/awx/ui_next/src/components/MultiSelect/MultiSelect.test.jsx +++ b/awx/ui_next/src/components/MultiSelect/MultiSelect.test.jsx @@ -63,9 +63,15 @@ describe('', () => { wrapper.update(); const event = { preventDefault: () => {}, - target: wrapper.find('DropdownItem').at(1).getDOMNode(), + target: wrapper + .find('DropdownItem') + .at(1) + .getDOMNode(), }; - wrapper.find('DropdownItem').at(1).invoke('onClick')(event); + wrapper + .find('DropdownItem') + .at(1) + .invoke('onClick')(event); expect(onAddNewItem).toHaveBeenCalledWith(options[1]); const newVal = onChange.mock.calls[0][0]; @@ -86,7 +92,10 @@ describe('', () => { /> ); - wrapper.find('Chip').at(1).invoke('onClick')(); + wrapper + .find('Chip') + .at(1) + .invoke('onClick')(); expect(onRemoveItem).toHaveBeenCalledWith(value[1]); const newVal = onChange.mock.calls[0][0]; diff --git a/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx b/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx index baf3792c67..41032535bf 100644 --- a/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx +++ b/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx @@ -57,7 +57,7 @@ describe('', () => { expect(wrapper.find('JobTemplateForm').length).toBe(1); }); - test('should render Job Template Form with default values', async done => { + test('should render Job Template Form with default values', async () => { const wrapper = mountWithContexts(); await waitForElement(wrapper, 'EmptyStateBody', el => el.length === 0); expect(wrapper.find('input#template-description').text()).toBe( @@ -80,10 +80,9 @@ describe('', () => { expect(wrapper.find('input#template-name').text()).toBe(defaultProps.name); expect(wrapper.find('PlaybookSelect')).toHaveLength(1); expect(wrapper.find('ProjectLookup').prop('value')).toBe(null); - done(); }); - test('handleSubmit should post to api', async done => { + test('handleSubmit should post to api', async () => { JobTemplatesAPI.create.mockResolvedValueOnce({ data: { id: 1, @@ -99,7 +98,7 @@ describe('', () => { values: { ...jobTemplateData, labels: [], - } + }, }, () => resolve() ); @@ -108,10 +107,9 @@ describe('', () => { wrapper.find('form').simulate('submit'); await sleep(1); expect(JobTemplatesAPI.create).toHaveBeenCalledWith(jobTemplateData); - done(); }); - test('should navigate to job template detail after form submission', async done => { + test('should navigate to job template detail after form submission', async () => { const history = { push: jest.fn(), }; @@ -133,10 +131,9 @@ describe('', () => { expect(history.push).toHaveBeenCalledWith( '/templates/job_template/1/details' ); - done(); }); - test('should navigate to templates list when cancel is clicked', async done => { + test('should navigate to templates list when cancel is clicked', async () => { const history = { push: jest.fn(), }; @@ -146,6 +143,5 @@ describe('', () => { await waitForElement(wrapper, 'EmptyStateBody', el => el.length === 0); wrapper.find('button[aria-label="Cancel"]').invoke('onClick')(); expect(history.push).toHaveBeenCalledWith('/templates'); - done(); }); }); diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx index cd7ef7a141..363c1ca920 100644 --- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx +++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx @@ -178,7 +178,7 @@ describe('', () => { { id: 4, name: 'Bar', isNew: true }, { id: 5, name: 'Maple' }, { id: 6, name: 'Tree' }, - ] + ]; JobTemplatesAPI.update.mockResolvedValue({ data: { ...updatedTemplateData }, }); diff --git a/awx/ui_next/src/screens/Template/shared/LabelSelect.test.jsx b/awx/ui_next/src/screens/Template/shared/LabelSelect.test.jsx index 07bf0c0a62..b03d4e1572 100644 --- a/awx/ui_next/src/screens/Template/shared/LabelSelect.test.jsx +++ b/awx/ui_next/src/screens/Template/shared/LabelSelect.test.jsx @@ -1,15 +1,12 @@ import React from 'react'; import { mount } from 'enzyme'; import { LabelsAPI } from '@api'; -import { sleep} from '@testUtils/testUtils'; +import { sleep } from '@testUtils/testUtils'; import LabelSelect from './LabelSelect'; jest.mock('@api'); -const options = [ - { id: 1, name: 'one' }, - { id: 2, name: 'two' }, -]; +const options = [{ id: 1, name: 'one' }, { id: 2, name: 'two' }]; describe('', () => { afterEach(() => { @@ -47,7 +44,7 @@ describe('', () => { expect(LabelsAPI.read).toHaveBeenCalledTimes(2); expect(wrapper.find('MultiSelect').prop('options')).toEqual([ ...options, - ...options + ...options, ]); }); }); diff --git a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.test.jsx b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.test.jsx index 0a2d979fff..3d1a26355a 100644 --- a/awx/ui_next/src/screens/Template/shared/PlaybookSelect.test.jsx +++ b/awx/ui_next/src/screens/Template/shared/PlaybookSelect.test.jsx @@ -14,7 +14,7 @@ describe('', () => { afterEach(() => { jest.resetAllMocks(); - }) + }); test('should reload playbooks when project value changes', () => { const wrapper = mountWithContexts( diff --git a/awx/ui_next/src/util/lists.js b/awx/ui_next/src/util/lists.js index ad03cccde2..561c306faf 100644 --- a/awx/ui_next/src/util/lists.js +++ b/awx/ui_next/src/util/lists.js @@ -1,5 +1,5 @@ /* eslint-disable import/prefer-default-export */ -export function getAddedAndRemoved (original, current) { +export function getAddedAndRemoved(original, current) { original = original || []; current = current || []; const added = []; diff --git a/awx/ui_next/src/util/lists.test.js b/awx/ui_next/src/util/lists.test.js index b15fe009df..126de4f07e 100644 --- a/awx/ui_next/src/util/lists.test.js +++ b/awx/ui_next/src/util/lists.test.js @@ -1,4 +1,4 @@ -import {getAddedAndRemoved} from './lists'; +import { getAddedAndRemoved } from './lists'; const one = { id: 1 }; const two = { id: 2 };