diff --git a/awx/ui/src/components/AddRole/SelectResourceStep.test.js b/awx/ui/src/components/AddRole/SelectResourceStep.test.js index 0566766611..0654558a17 100644 --- a/awx/ui/src/components/AddRole/SelectResourceStep.test.js +++ b/awx/ui/src/components/AddRole/SelectResourceStep.test.js @@ -6,7 +6,6 @@ import { shallowWithContexts, waitForElement, } from '../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../testUtils/testUtils'; import SelectResourceStep from './SelectResourceStep'; describe('', () => { @@ -114,7 +113,6 @@ describe('', () => { /> ); }); - await sleep(0); wrapper.update(); const checkboxListItemWrapper = wrapper.find('CheckboxListItem'); expect(checkboxListItemWrapper.length).toBe(2); diff --git a/awx/ui/src/components/LaunchButton/LaunchButton.test.js b/awx/ui/src/components/LaunchButton/LaunchButton.test.js index 888523ce62..d181d915a2 100644 --- a/awx/ui/src/components/LaunchButton/LaunchButton.test.js +++ b/awx/ui/src/components/LaunchButton/LaunchButton.test.js @@ -10,7 +10,6 @@ import { WorkflowJobTemplatesAPI, } from 'api'; import { mountWithContexts } from '../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../testUtils/testUtils'; import LaunchButton from './LaunchButton'; @@ -74,7 +73,6 @@ describe('LaunchButton', () => { const button = wrapper.find('button'); await act(() => button.prop('onClick')()); expect(JobTemplatesAPI.readLaunch).toHaveBeenCalledWith(1); - await sleep(0); expect(JobTemplatesAPI.launch).toHaveBeenCalledWith(1, {}); expect(history.location.pathname).toEqual('/jobs/9000/output'); }); @@ -111,7 +109,6 @@ describe('LaunchButton', () => { const button = wrapper.find('button'); await act(() => button.prop('onClick')()); expect(WorkflowJobTemplatesAPI.readLaunch).toHaveBeenCalledWith(1); - await sleep(0); expect(WorkflowJobTemplatesAPI.launch).toHaveBeenCalledWith(1, {}); expect(history.location.pathname).toEqual('/jobs/9000/output'); }); @@ -128,7 +125,7 @@ describe('LaunchButton', () => { WorkflowJobTemplatesAPI.launch.mockImplementation(async () => { // return asynchronously so isLaunching isn't set back to false in the // same tick - await sleep(10); + await new Promise((resolve) => setTimeout(resolve, 10)); return { data: { id: 9000, @@ -190,7 +187,6 @@ describe('LaunchButton', () => { const button = wrapper.find('button'); await act(() => button.prop('onClick')()); expect(JobsAPI.readRelaunch).toHaveBeenCalledWith(1); - await sleep(0); expect(JobsAPI.relaunch).toHaveBeenCalledWith(1, {}); expect(history.location.pathname).toEqual('/jobs/9000/output'); }); @@ -227,7 +223,6 @@ describe('LaunchButton', () => { const button = wrapper.find('button'); await act(() => button.prop('onClick')()); expect(WorkflowJobsAPI.readRelaunch).toHaveBeenCalledWith(1); - await sleep(0); expect(WorkflowJobsAPI.relaunch).toHaveBeenCalledWith(1); expect(history.location.pathname).toEqual('/jobs/9000/output'); }); @@ -265,7 +260,6 @@ describe('LaunchButton', () => { const button = wrapper.find('button'); await act(() => button.prop('onClick')()); expect(ProjectsAPI.readLaunchUpdate).toHaveBeenCalledWith(5); - await sleep(0); expect(ProjectsAPI.launchUpdate).toHaveBeenCalledWith(5); expect(history.location.pathname).toEqual('/jobs/9000/output'); }); @@ -303,7 +297,6 @@ describe('LaunchButton', () => { const button = wrapper.find('button'); await act(() => button.prop('onClick')()); expect(InventorySourcesAPI.readLaunchUpdate).toHaveBeenCalledWith(5); - await sleep(0); expect(InventorySourcesAPI.launchUpdate).toHaveBeenCalledWith(5); expect(history.location.pathname).toEqual('/jobs/9000/output'); }); @@ -326,11 +319,9 @@ describe('LaunchButton', () => { ); expect(wrapper.find('Modal').length).toBe(0); await act(() => wrapper.find('button').prop('onClick')()); - await sleep(0); wrapper.update(); expect(wrapper.find('Modal').length).toBe(1); wrapper.find('ModalBoxCloseButton').simulate('click'); - await sleep(0); wrapper.update(); expect(wrapper.find('Modal').length).toBe(0); }); diff --git a/awx/ui/src/screens/Inventory/InventoryAdd/InventoryAdd.test.js b/awx/ui/src/screens/Inventory/InventoryAdd/InventoryAdd.test.js index d35dc1e73f..3efbae7ff3 100644 --- a/awx/ui/src/screens/Inventory/InventoryAdd/InventoryAdd.test.js +++ b/awx/ui/src/screens/Inventory/InventoryAdd/InventoryAdd.test.js @@ -6,7 +6,6 @@ import { mountWithContexts, waitForElement, } from '../../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../../testUtils/testUtils'; import InventoryAdd from './InventoryAdd'; @@ -43,7 +42,6 @@ describe('', () => { instanceGroups, }); }); - await sleep(1); expect(InventoriesAPI.create).toHaveBeenCalledWith({ name: 'new Foo', organization: 2, diff --git a/awx/ui/src/screens/Inventory/InventoryEdit/InventoryEdit.test.js b/awx/ui/src/screens/Inventory/InventoryEdit/InventoryEdit.test.js index fb0afe163b..c27a9115e3 100644 --- a/awx/ui/src/screens/Inventory/InventoryEdit/InventoryEdit.test.js +++ b/awx/ui/src/screens/Inventory/InventoryEdit/InventoryEdit.test.js @@ -6,7 +6,6 @@ import { mountWithContexts, waitForElement, } from '../../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../../testUtils/testUtils'; import InventoryEdit from './InventoryEdit'; @@ -105,7 +104,6 @@ describe('', () => { instanceGroups, }); }); - await sleep(0); expect(InventoriesAPI.orderInstanceGroups).toHaveBeenCalledWith( mockInventory.id, instanceGroups, diff --git a/awx/ui/src/screens/Job/JobDetail/JobDetail.test.js b/awx/ui/src/screens/Job/JobDetail/JobDetail.test.js index da19a0f357..4120795e8e 100644 --- a/awx/ui/src/screens/Job/JobDetail/JobDetail.test.js +++ b/awx/ui/src/screens/Job/JobDetail/JobDetail.test.js @@ -3,7 +3,6 @@ import { act } from 'react-dom/test-utils'; import { createMemoryHistory } from 'history'; import { JobsAPI, ProjectUpdatesAPI } from 'api'; import { mountWithContexts } from '../../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../../testUtils/testUtils'; import JobDetail from './JobDetail'; import mockJobData from '../shared/data.job.json'; @@ -249,7 +248,6 @@ describe('', () => { test('should properly delete job', async () => { wrapper = mountWithContexts(); wrapper.find('button[aria-label="Delete"]').simulate('click'); - await sleep(1); wrapper.update(); const modal = wrapper.find('Modal[aria-label="Alert modal"]'); expect(modal.length).toBe(1); @@ -296,7 +294,6 @@ describe('', () => { const detail = wrapper.find('JobDetail'); async function assertMissingDetail(label) { expect(detail.length).toBe(1); - await sleep(0); expect(detail.find(`Detail[label="${label}"] dt`).text()).toBe(label); expect(detail.find(`Detail[label="${label}"] dd`).text()).toBe('DELETED'); } diff --git a/awx/ui/src/screens/Organization/OrganizationTeams/OrganizationTeamList.test.js b/awx/ui/src/screens/Organization/OrganizationTeams/OrganizationTeamList.test.js index 260887233c..3952039003 100644 --- a/awx/ui/src/screens/Organization/OrganizationTeams/OrganizationTeamList.test.js +++ b/awx/ui/src/screens/Organization/OrganizationTeams/OrganizationTeamList.test.js @@ -6,7 +6,6 @@ import { mountWithContexts, waitForElement, } from '../../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../../testUtils/testUtils'; import OrganizationTeamList from './OrganizationTeamList'; @@ -100,7 +99,6 @@ describe('', () => { ); }); - await sleep(0); wrapper.update(); const list = wrapper.find('PaginatedTable'); diff --git a/awx/ui/src/screens/Project/shared/ProjectSyncButton.test.js b/awx/ui/src/screens/Project/shared/ProjectSyncButton.test.js index ac8dec3ce5..98c86ac872 100644 --- a/awx/ui/src/screens/Project/shared/ProjectSyncButton.test.js +++ b/awx/ui/src/screens/Project/shared/ProjectSyncButton.test.js @@ -2,7 +2,6 @@ import React from 'react'; import { act } from 'react-dom/test-utils'; import { ProjectsAPI } from 'api'; import { mountWithContexts } from '../../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../../testUtils/testUtils'; import ProjectSyncButton from './ProjectSyncButton'; @@ -89,13 +88,11 @@ describe('ProjectSyncButton', () => { await act(async () => { wrapper.find('button').prop('onClick')(); }); - await sleep(0); wrapper.update(); expect(wrapper.find('Modal').length).toBe(1); await act(async () => { wrapper.find('ModalBoxCloseButton').simulate('click'); }); - await sleep(0); wrapper.update(); expect(wrapper.find('Modal').length).toBe(0); }); diff --git a/awx/ui/src/screens/Template/shared/JobTemplateForm.test.js b/awx/ui/src/screens/Template/shared/JobTemplateForm.test.js index b9ea58ffcb..4fbf9cbbd3 100644 --- a/awx/ui/src/screens/Template/shared/JobTemplateForm.test.js +++ b/awx/ui/src/screens/Template/shared/JobTemplateForm.test.js @@ -15,7 +15,6 @@ import { mountWithContexts, waitForElement, } from '../../../../testUtils/enzymeHelpers'; -import { sleep } from '../../../../testUtils/testUtils'; import JobTemplateForm from './JobTemplateForm'; jest.mock('../../../api'); @@ -420,7 +419,6 @@ describe('', () => { await act(async () => { wrapper.find('button[aria-label="Save"]').simulate('click'); }); - await sleep(1); expect(handleSubmit).toBeCalled(); }); diff --git a/awx/ui/src/screens/Template/shared/WorkflowJobTemplateForm.test.js b/awx/ui/src/screens/Template/shared/WorkflowJobTemplateForm.test.js index 0cdbf0abbd..17234df88c 100644 --- a/awx/ui/src/screens/Template/shared/WorkflowJobTemplateForm.test.js +++ b/awx/ui/src/screens/Template/shared/WorkflowJobTemplateForm.test.js @@ -12,7 +12,6 @@ import { ExecutionEnvironmentsAPI, CredentialsAPI, } from 'api'; -import { sleep } from '../../../../testUtils/testUtils'; import { mountWithContexts } from '../../../../testUtils/enzymeHelpers'; import WorkflowJobTemplateForm from './WorkflowJobTemplateForm'; @@ -310,7 +309,6 @@ describe('', () => { wrapper.find('Formik').prop('onSubmit')({}); }); wrapper.update(); - sleep(0); expect(handleSubmit).toBeCalled(); }); diff --git a/awx/ui/src/screens/User/shared/UserTokenForm.test.js b/awx/ui/src/screens/User/shared/UserTokenForm.test.js index beade56592..3dd2ae34ad 100644 --- a/awx/ui/src/screens/User/shared/UserTokenForm.test.js +++ b/awx/ui/src/screens/User/shared/UserTokenForm.test.js @@ -6,7 +6,6 @@ import { waitForElement, } from '../../../../testUtils/enzymeHelpers'; import UserTokenForm from './UserTokenForm'; -import { sleep } from '../../../../testUtils/testUtils'; jest.mock('../../../api'); const applications = { @@ -102,7 +101,6 @@ describe('', () => { await act(async () => { wrapper.find('button[aria-label="Save"]').prop('onClick')(); }); - await sleep(1); expect(handleSubmit).toBeCalled(); }); @@ -132,7 +130,6 @@ describe('', () => { await act(async () => { wrapper.find('button[aria-label="Save"]').prop('onClick')(); }); - await sleep(1); wrapper.update(); expect( wrapper.find('FormGroup[name="scope"]').prop('helperTextInvalid') diff --git a/awx/ui/testUtils/testUtils.js b/awx/ui/testUtils/testUtils.js deleted file mode 100644 index 6666d69844..0000000000 --- a/awx/ui/testUtils/testUtils.js +++ /dev/null @@ -1,4 +0,0 @@ - -const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms)); -/* eslint-disable-next-line import/prefer-default-export */ -export { sleep };