remove 4th batch of unmount() calls

awx/ui_next/src/components/AddRole/AddResourceRole.test.jsx

@@ -16,7 +16,6 @@ jest.mock('../../api/models/Users');
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
-
   useHistory: () => ({ push: jest.fn(), location: { pathname: {} } }),
 }));
 // TODO: Once error handling is functional in

awx/ui_next/src/components/ScreenHeader/ScreenHeader.test.jsx

@@ -5,10 +5,6 @@ import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
 
 import ScreenHeader from './ScreenHeader';
 
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-}));
-
 describe('<ScreenHeader />', () => {
   let breadcrumbWrapper;
   let breadcrumb;

awx/ui_next/src/screens/Application/Application/Application.test.jsx

@@ -15,6 +15,7 @@ jest.mock('react-router-dom', () => ({
   }),
   useParams: () => ({ id: 1 }),
 }));
+
 const options = {
   data: {
     actions: {

awx/ui_next/src/screens/Setting/Settings.test.jsx

@@ -11,10 +11,6 @@ import Settings from './Settings';
 
 jest.mock('../../api');
 
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-}));
-
 describe('<Settings />', () => {
   let wrapper;
 

awx/ui_next/src/screens/Template/WorkflowJobTemplate.test.jsx

@@ -50,10 +50,11 @@ describe('<WorkflowJobTemplate />', () => {
       },
     });
   });
+
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
+
   test('initially renders successfully', async () => {
     await act(async () => {
       wrapper = mountWithContexts(
@@ -61,6 +62,7 @@ describe('<WorkflowJobTemplate />', () => {
       );
     });
   });
+
   test('When component mounts API is called and the response is put in state', async () => {
     await act(async () => {
       wrapper = mountWithContexts(
@@ -70,6 +72,7 @@ describe('<WorkflowJobTemplate />', () => {
     expect(WorkflowJobTemplatesAPI.readDetail).toBeCalled();
     expect(OrganizationsAPI.read).toBeCalled();
   });
+
   test('notifications tab shown for admins', async () => {
     await act(async () => {
       wrapper = mountWithContexts(
@@ -84,6 +87,7 @@ describe('<WorkflowJobTemplate />', () => {
     );
     expect(tabs.at(3).text()).toEqual('Notifications');
   });
+
   test('notifications tab hidden with reduced permissions', async () => {
     OrganizationsAPI.read.mockResolvedValue({
       data: {
@@ -135,6 +139,7 @@ describe('<WorkflowJobTemplate />', () => {
 
     await waitForElement(wrapper, 'ContentError', el => el.length === 1);
   });
+
   test('should call to get webhook key', async () => {
     const history = createMemoryHistory({
       initialEntries: ['/templates/workflow_job_template/1/foobar'],
@@ -161,6 +166,7 @@ describe('<WorkflowJobTemplate />', () => {
     });
     expect(WorkflowJobTemplatesAPI.readWebhookKey).toHaveBeenCalled();
   });
+
   test('should not call to get webhook key', async () => {
     WorkflowJobTemplatesAPI.readWorkflowJobTemplateOptions.mockResolvedValueOnce(
       {

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/DeleteAllNodesModal.test.jsx

@@ -15,10 +15,6 @@ describe('DeleteAllNodesModal', () => {
     );
   });
 
-  afterAll(() => {
-    wrapper.unmount();
-  });
-
   test('Delete All button dispatches as expected', () => {
     wrapper.find('button#confirm-delete-all-nodes').simulate('click');
     expect(dispatch).toHaveBeenCalledWith({

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkDeleteModal.test.jsx

@@ -32,10 +32,6 @@ describe('LinkDeleteModal', () => {
     );
   });
 
-  afterAll(() => {
-    wrapper.unmount();
-  });
-
   test('Confirm button dispatches as expected', () => {
     wrapper.find('button#confirm-link-removal').simulate('click');
     expect(dispatch).toHaveBeenCalledWith({

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.test.jsx

@@ -27,10 +27,6 @@ describe('LinkModal', () => {
       );
     });
 
-    afterAll(() => {
-      wrapper.unmount();
-    });
-
     test('Dropdown defaults to success when adding new link', () => {
       expect(wrapper.find('AnsibleSelect').prop('value')).toBe('success');
     });
@@ -57,6 +53,7 @@ describe('LinkModal', () => {
       expect(onConfirm).toHaveBeenCalledWith('always');
     });
   });
+
   describe('Editing existing link', () => {
     test('Dropdown defaults to existing link type when editing link', () => {
       wrapper = mountWithContexts(
@@ -79,7 +76,6 @@ describe('LinkModal', () => {
         </WorkflowDispatchContext.Provider>
       );
       expect(wrapper.find('AnsibleSelect').prop('value')).toBe('failure');
-      wrapper.unmount();
     });
   });
 });

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeDeleteModal.test.jsx

@@ -32,10 +32,6 @@ describe('NodeDeleteModal', () => {
       );
     });
 
-    afterAll(() => {
-      wrapper.unmount();
-    });
-
     test('Mounts successfully', () => {
       expect(wrapper.length).toBe(1);
     });
@@ -63,6 +59,7 @@ describe('NodeDeleteModal', () => {
       });
     });
   });
+
   describe('Node without unified job template', () => {
     test('Mounts successfully', () => {
       wrapper = mountWithContexts(
@@ -79,7 +76,6 @@ describe('NodeDeleteModal', () => {
         </WorkflowDispatchContext.Provider>
       );
       expect(wrapper.length).toBe(1);
-      wrapper.unmount();
     });
   });
 });

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeNextButton.test.jsx

@@ -28,10 +28,6 @@ describe('NodeNextButton', () => {
     );
   });
 
-  afterAll(() => {
-    wrapper.unmount();
-  });
-
   test('Button text matches', () => {
     expect(wrapper.find('button').text()).toBe(buttonText);
   });

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/InventorySourcesList.test.jsx

@@ -15,9 +15,6 @@ const onUpdateNodeResource = jest.fn();
 
 describe('InventorySourcesList', () => {
   let wrapper;
-  afterEach(() => {
-    wrapper.unmount();
-  });
   test('Row selected when nodeResource id matches row id and clicking new row makes expected callback', async () => {
     InventorySourcesAPI.read.mockResolvedValueOnce({
       data: {
@@ -74,6 +71,7 @@ describe('InventorySourcesList', () => {
       url: '/api/v2/inventory_sources/2',
     });
   });
+
   test('Error shown when read() request errors', async () => {
     InventorySourcesAPI.read.mockRejectedValue(new Error());
     await act(async () => {

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/JobTemplatesList.test.jsx

@@ -17,8 +17,8 @@ describe('JobTemplatesList', () => {
   let wrapper;
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
+
   test('Row selected when nodeResource id matches row id and clicking new row makes expected callback', async () => {
     JobTemplatesAPI.read.mockResolvedValueOnce({
       data: {
@@ -81,6 +81,7 @@ describe('JobTemplatesList', () => {
       project: 2,
     });
   });
+
   test('Error shown when read() request errors', async () => {
     JobTemplatesAPI.read.mockRejectedValue(new Error());
     JobTemplatesAPI.readOptions.mockResolvedValue({

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/ProjectsList.test.jsx

@@ -15,9 +15,7 @@ const onUpdateNodeResource = jest.fn();
 
 describe('ProjectsList', () => {
   let wrapper;
-  afterEach(() => {
+
-    wrapper.unmount();
-  });
   test('Row selected when nodeResource id matches row id and clicking new row makes expected callback', async () => {
     ProjectsAPI.read.mockResolvedValueOnce({
       data: {
@@ -70,6 +68,7 @@ describe('ProjectsList', () => {
       url: '/api/v2/projects/2',
     });
   });
+
   test('Error shown when read() request errors', async () => {
     ProjectsAPI.read.mockRejectedValue(new Error());
     await act(async () => {

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeTypeStep/WorkflowJobTemplatesList.test.jsx

@@ -15,9 +15,7 @@ const onUpdateNodeResource = jest.fn();
 
 describe('WorkflowJobTemplatesList', () => {
   let wrapper;
-  afterEach(() => {
+
-    wrapper.unmount();
-  });
   test('Row selected when nodeResource id matches row id and clicking new row makes expected callback', async () => {
     WorkflowJobTemplatesAPI.read.mockResolvedValueOnce({
       data: {
@@ -76,6 +74,7 @@ describe('WorkflowJobTemplatesList', () => {
       url: '/api/v2/workflow_job_templates/2',
     });
   });
+
   test('Error shown when read() request errors', async () => {
     WorkflowJobTemplatesAPI.read.mockRejectedValue(new Error());
     await act(async () => {

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.test.jsx

@@ -85,7 +85,6 @@ describe('NodeViewModal', () => {
 
     afterAll(() => {
       jest.resetAllMocks();
-      wrapper.unmount();
     });
 
     test('should render prompt detail', () => {
@@ -151,7 +150,6 @@ describe('NodeViewModal', () => {
       expect(JobTemplatesAPI.readWebhookKey).not.toHaveBeenCalledWith();
       expect(JobTemplatesAPI.readLaunch).toHaveBeenCalledWith(1);
       expect(JobTemplatesAPI.readInstanceGroups).toHaveBeenCalledTimes(1);
-      wrapper.unmount();
       jest.clearAllMocks();
     });
 
@@ -169,7 +167,6 @@ describe('NodeViewModal', () => {
       });
       waitForLoaded(wrapper);
       expect(wrapper.find('ContentError').length).toBe(1);
-      wrapper.unmount();
       jest.clearAllMocks();
     });
 
@@ -186,7 +183,6 @@ describe('NodeViewModal', () => {
       });
       waitForLoaded(wrapper);
       expect(wrapper.find('Button#node-view-edit-button').length).toBe(1);
-      wrapper.unmount();
       jest.clearAllMocks();
     });
 
@@ -203,7 +199,6 @@ describe('NodeViewModal', () => {
       });
       waitForLoaded(wrapper);
       expect(wrapper.find('Button#node-view-edit-button').length).toBe(0);
-      wrapper.unmount();
       jest.clearAllMocks();
     });
   });
@@ -237,7 +232,6 @@ describe('NodeViewModal', () => {
       expect(WorkflowJobTemplatesAPI.readLaunch).not.toHaveBeenCalled();
       expect(JobTemplatesAPI.readLaunch).not.toHaveBeenCalled();
       expect(JobTemplatesAPI.readInstanceGroups).not.toHaveBeenCalled();
-      wrapper.unmount();
       jest.clearAllMocks();
     });
   });
@@ -271,7 +265,6 @@ describe('NodeViewModal', () => {
       expect(WorkflowJobTemplatesAPI.readLaunch).not.toHaveBeenCalled();
       expect(JobTemplatesAPI.readLaunch).not.toHaveBeenCalled();
       expect(JobTemplatesAPI.readInstanceGroups).not.toHaveBeenCalled();
-      wrapper.unmount();
       jest.clearAllMocks();
     });
   });
@@ -305,7 +298,6 @@ describe('NodeViewModal', () => {
       expect(WorkflowJobTemplatesAPI.readLaunch).not.toHaveBeenCalled();
       expect(JobTemplatesAPI.readLaunch).not.toHaveBeenCalled();
       expect(JobTemplatesAPI.readInstanceGroups).not.toHaveBeenCalled();
-      wrapper.unmount();
       jest.clearAllMocks();
     });
   });

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/RunStep.test.jsx

@@ -16,10 +16,6 @@ describe('RunStep', () => {
     );
   });
 
-  afterAll(() => {
-    wrapper.unmount();
-  });
-
   test('Default selected card matches default link type when present', () => {
     expect(wrapper.find('#link-type-success').props().isSelected).toBe(true);
     expect(wrapper.find('#link-type-failure').props().isSelected).toBe(false);

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/UnsavedChangesModal.test.jsx

@@ -17,10 +17,6 @@ describe('UnsavedChangesModal', () => {
     );
   });
 
-  afterAll(() => {
-    wrapper.unmount();
-  });
-
   test('Exit Without Saving button dispatches as expected', () => {
     wrapper.find('button#confirm-exit-without-saving').simulate('click');
     expect(onExit).toHaveBeenCalled();

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.test.jsx

@@ -141,7 +141,6 @@ describe('Visualizer', () => {
   });
 
   afterAll(() => {
-    wrapper.unmount();
     delete window.SVGElement.prototype.getBBox;
     delete window.SVGElement.prototype.getBoundingClientRect;
     delete window.SVGElement.prototype.height;

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerLink.test.jsx

@@ -62,9 +62,6 @@ describe('VisualizerLink', () => {
       </WorkflowDispatchContext.Provider>
     );
   });
-  afterAll(() => {
-    wrapper.unmount();
-  });
 
   test('Displays action tooltip on hover and updates help text on hover', () => {
     expect(wrapper.find('WorkflowActionTooltip').length).toBe(0);

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.test.jsx

@@ -73,12 +73,11 @@ describe('VisualizerNode', () => {
     afterEach(() => {
       jest.clearAllMocks();
     });
-    afterAll(() => {
+
-      wrapper.unmount();
-    });
     test('Displays unified job template name inside node', () => {
       expect(wrapper.find('NodeResourceName').text()).toBe('Automation JT');
     });
+
     test('Displays action tooltip on hover and updates help text on hover', () => {
       expect(wrapper.find('WorkflowActionTooltip').length).toBe(0);
       wrapper.find('g').simulate('mouseenter');
@@ -234,9 +233,7 @@ describe('VisualizerNode', () => {
         </WorkflowDispatchContext.Provider>
       );
     });
-    afterAll(() => {
+
-      wrapper.unmount();
-    });
     test('Displays correct help text when hovering over node while adding link', () => {
       expect(wrapper.find('WorkflowActionTooltip').length).toBe(0);
       wrapper.find('g').simulate('mouseenter');
@@ -248,6 +245,7 @@ describe('VisualizerNode', () => {
       expect(wrapper.find('WorkflowActionTooltip').length).toBe(0);
       expect(updateHelpText).toHaveBeenCalledWith(null);
     });
+
     test('Dispatches properly when node is clicked', () => {
       wrapper
         .find('foreignObject')
@@ -259,6 +257,7 @@ describe('VisualizerNode', () => {
       });
     });
   });
+
   describe('Node without unified job template', () => {
     test('Displays DELETED text inside node when unified job template is missing', () => {
       const wrapper = mountWithContexts(
@@ -279,6 +278,7 @@ describe('VisualizerNode', () => {
       expect(wrapper.find('NodeResourceName').text()).toBe('DELETED');
     });
   });
+
   describe('Node without full unified job template', () => {
     let wrapper;
     beforeEach(() => {
@@ -336,9 +336,7 @@ describe('VisualizerNode', () => {
         </WorkflowDispatchContext.Provider>
       );
     });
-    afterEach(() => {
+
-      wrapper.unmount();
-    });
     test('Attempts to fetch full unified job template on view', async () => {
       wrapper.find('g').simulate('mouseenter');
       await act(async () => {
@@ -348,6 +346,7 @@ describe('VisualizerNode', () => {
       });
       expect(JobTemplatesAPI.readDetail).toHaveBeenCalledWith(7);
     });
+
     test('Displays error fetching full unified job template', async () => {
       JobTemplatesAPI.readDetail.mockRejectedValueOnce(
         new Error({
@@ -371,6 +370,7 @@ describe('VisualizerNode', () => {
       wrapper.update();
       expect(wrapper.find('AlertModal').length).toBe(1);
     });
+
     test('Attempts to fetch credentials on view', async () => {
       JobTemplatesAPI.readDetail.mockResolvedValueOnce({
         data: {

awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerToolbar.test.jsx

@@ -54,10 +54,6 @@ describe('VisualizerToolbar', () => {
     );
   });
 
-  afterAll(() => {
-    wrapper.unmount();
-  });
-
   test('Shows correct number of nodes', () => {
     // The start node (id=1) and deleted nodes (isDeleted=true) should be ignored
     expect(wrapper.find('Badge').text()).toBe('1');

awx/ui_next/src/screens/User/UserList/UserListItem.test.jsx

@@ -16,10 +16,6 @@ i18n.activate('en');
 
 let wrapper;
 
-afterEach(() => {
-  wrapper.unmount();
-});
-
 describe('UserListItem with full permissions', () => {
   beforeEach(() => {
     wrapper = mountWithContexts(
@@ -39,9 +35,11 @@ describe('UserListItem with full permissions', () => {
       </I18nProvider>
     );
   });
+
   test('initially renders successfully', () => {
     expect(wrapper.length).toBe(1);
   });
+
   test('edit button shown to users with edit capabilities', () => {
     expect(wrapper.find('PencilAltIcon').exists()).toBeTruthy();
   });

awx/ui_next/src/screens/User/UserRoles/UserRolesList.test.jsx

@@ -94,6 +94,7 @@ const roles = {
 };
 
 describe('<UserRolesList />', () => {
+  let wrapper;
   beforeEach(() => {
     UsersAPI.readOptions.mockResolvedValue({
       data: {
@@ -102,11 +103,11 @@ describe('<UserRolesList />', () => {
       },
     });
   });
-  let wrapper;
+
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
+
   test('should render properly', async () => {
     UsersAPI.readRoles.mockResolvedValue(roles);
 

awx/ui_next/src/screens/User/UserTeams/UserTeamList.test.jsx

@@ -118,7 +118,6 @@ describe('<UserTeamList />', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should load and render teams', async () => {

awx/ui_next/src/screens/User/UserTokenAdd/UserTokenAdd.test.jsx

@@ -22,9 +22,9 @@ const onSuccessfulAdd = jest.fn();
 
 describe('<UserTokenAdd />', () => {
   afterEach(() => {
-    wrapper.unmount();
     jest.clearAllMocks();
   });
+
   test('handleSubmit should post to api', async () => {
     await act(async () => {
       wrapper = mountWithContexts(

awx/ui_next/src/screens/User/UserTokens/UserTokens.test.jsx

@@ -8,10 +8,6 @@ import UserTokens from './UserTokens';
 describe('<UserTokens />', () => {
   let wrapper;
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
   test('renders successfully', () => {
     wrapper = mountWithContexts(<UserTokens />);
     expect(wrapper.length).toBe(1);

awx/ui_next/src/screens/User/Users.test.jsx

@@ -1,38 +1,23 @@
 import React from 'react';
-import { createMemoryHistory } from 'history';
+import { shallow } from 'enzyme';
-
-import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
-
 import Users from './Users';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
+  useRouteMatch: () => ({
+    path: 'users',
+  }),
 }));
 
 describe('<Users />', () => {
-  test('initially renders successfully', () => {
+  test('should set breadcrumbs', () => {
-    const wrapper = mountWithContexts(<Users />);
+    const wrapper = shallow(<Users />);
-    wrapper.unmount();
-  });
 
-  test('should display a breadcrumb heading', () => {
+    const header = wrapper.find('ScreenHeader');
-    const history = createMemoryHistory({
+    expect(header.prop('streamType')).toBe('user');
-      initialEntries: ['/users'],
+    expect(header.prop('breadcrumbConfig')).toEqual({
+      '/users': 'Users',
+      '/users/add': 'Create New User',
     });
-    const match = { path: '/users', url: '/users', isExact: true };
-
-    const wrapper = mountWithContexts(<Users />, {
-      context: {
-        router: {
-          history,
-          route: {
-            location: history.location,
-            match,
-          },
-        },
-      },
-    });
-    expect(wrapper.find('Title').length).toBe(1);
-    wrapper.unmount();
   });
 });

awx/ui_next/src/screens/User/shared/UserForm.test.jsx

@@ -27,7 +27,6 @@ describe('<UserForm />', () => {
   });
 
   afterEach(() => {
-    wrapper.unmount();
     jest.clearAllMocks();
   });
 

awx/ui_next/src/screens/User/shared/UserTokenForm.test.jsx

@@ -28,9 +28,7 @@ const applications = {
 };
 describe('<UserTokenForm />', () => {
   let wrapper;
-  beforeEach(() => {});
   afterEach(() => {
-    wrapper.unmount();
     jest.clearAllMocks();
   });
 

awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.test.jsx

@@ -29,7 +29,6 @@ describe('<WorkflowApprovalList />', () => {
   });
 
   afterEach(() => {
-    wrapper.unmount();
     jest.clearAllMocks();
   });
 

awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.test.jsx

@@ -9,9 +9,6 @@ jest.mock('../../../api/models/WorkflowApprovals');
 
 describe('<WorkflowApprovalListItem />', () => {
   let wrapper;
-  afterEach(() => {
-    wrapper.unmount();
-  });
 
   test('should display never expires status', () => {
     wrapper = mountWithContexts(
@@ -28,6 +25,7 @@ describe('<WorkflowApprovalListItem />', () => {
     );
     expect(wrapper.find('Label[children="Never expires"]').length).toBe(1);
   });
+
   test('should display timed out status', () => {
     wrapper = mountWithContexts(
       <table>
@@ -47,6 +45,7 @@ describe('<WorkflowApprovalListItem />', () => {
     );
     expect(wrapper.find('Label[children="Timed out"]').length).toBe(1);
   });
+
   test('should display canceled status', () => {
     wrapper = mountWithContexts(
       <table>
@@ -66,6 +65,7 @@ describe('<WorkflowApprovalListItem />', () => {
     );
     expect(wrapper.find('Label[children="Canceled"]').length).toBe(1);
   });
+
   test('should display approved status', () => {
     wrapper = mountWithContexts(
       <table>
@@ -93,6 +93,7 @@ describe('<WorkflowApprovalListItem />', () => {
     );
     expect(wrapper.find('Label[children="Approved"]').length).toBe(1);
   });
+
   test('should display denied status', () => {
     wrapper = mountWithContexts(
       <table>

awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovals.test.jsx

@@ -11,10 +11,6 @@ import mockWorkflowApprovals from './data.workflowApprovals.json';
 
 jest.mock('../../api');
 
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-}));
-
 describe('<WorkflowApprovals />', () => {
   beforeEach(() => {
     WorkflowApprovalsAPI.read.mockResolvedValue({
@@ -70,6 +66,5 @@ describe('<WorkflowApprovals />', () => {
 
     await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
     expect(wrapper.find('Title').length).toBe(1);
-    wrapper.unmount();
   });
 });

awx/ui_next/src/screens/WorkflowApproval/shared/WorkflowApprovalStatus.test.jsx

@@ -8,15 +8,14 @@ const workflowApproval = mockWorkflowApprovals.results[0];
 
 describe('<WorkflowApprovalStatus />', () => {
   let wrapper;
-  afterEach(() => {
+
-    wrapper.unmount();
-  });
   test('shows no expiration when approval status is pending and no approval_expiration', () => {
     wrapper = mountWithContexts(
       <WorkflowApprovalStatus workflowApproval={workflowApproval} />
     );
     expect(wrapper.text()).toBe('Never expires');
   });
+
   test('shows expiration date/time when approval status is pending and approval_expiration present', () => {
     wrapper = mountWithContexts(
       <WorkflowApprovalStatus
@@ -30,6 +29,7 @@ describe('<WorkflowApprovalStatus />', () => {
       `Expires on ${formatDateString('2020-10-10T17:13:12.067947Z')}`
     );
   });
+
   test('shows when an approval has timed out', () => {
     wrapper = mountWithContexts(
       <WorkflowApprovalStatus
@@ -42,6 +42,7 @@ describe('<WorkflowApprovalStatus />', () => {
     );
     expect(wrapper.find('Label').text()).toBe('Timed out');
   });
+
   test('shows when an approval has canceled', () => {
     wrapper = mountWithContexts(
       <WorkflowApprovalStatus
@@ -54,6 +55,7 @@ describe('<WorkflowApprovalStatus />', () => {
     );
     expect(wrapper.find('Label').text()).toBe('Canceled');
   });
+
   test('shows when an approval has approved', () => {
     wrapper = mountWithContexts(
       <WorkflowApprovalStatus
@@ -73,6 +75,7 @@ describe('<WorkflowApprovalStatus />', () => {
     );
     expect(wrapper.find('Label').text()).toBe('Approved');
   });
+
   test('shows when an approval has denied', () => {
     wrapper = mountWithContexts(
       <WorkflowApprovalStatus