remove 1st batch of unnecessary unmount calls

awx/ui_next/src/App.test.jsx

@@ -31,6 +31,5 @@ describe('<App />', () => {
     });
     expect(wrapper.length).toBe(1);
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 });

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

@@ -76,8 +76,8 @@ describe('<AdHocCommands />', () => {
     });
   });
   let wrapper;
+
   afterEach(() => {
-    wrapper.unmount();
     jest.clearAllMocks();
   });
 

awx/ui_next/src/components/AdHocCommands/AdHocCommandsWizard.test.jsx

@@ -54,7 +54,6 @@ describe('<AdHocCommandsWizard/>', () => {
   });
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should mount properly', async () => {

awx/ui_next/src/components/AdHocCommands/AdHocCredentialStep.test.jsx

@@ -36,7 +36,6 @@ describe('<AdHocCredentialStep />', () => {
   });
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should mount properly', async () => {

awx/ui_next/src/components/AdHocCommands/AdHocExecutionEnironmentStep.test.jsx

@@ -33,9 +33,9 @@ describe('<AdHocExecutionEnvironmentStep />', () => {
       );
     });
   });
+
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should mount properly', async () => {

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

@@ -34,6 +34,7 @@ describe('<SelectRoleStep />', () => {
       name: 'foo',
     },
   ];
+
   test('initially renders without crashing', () => {
     wrapper = shallowWithContexts(
       <SelectRoleStep
@@ -43,8 +44,8 @@ describe('<SelectRoleStep />', () => {
       />
     );
     expect(wrapper.length).toBe(1);
-    wrapper.unmount();
   });
+
   test('clicking role fires onRolesClick callback', () => {
     const onRolesClick = jest.fn();
     wrapper = mountWithContexts(
@@ -63,6 +64,5 @@ describe('<SelectRoleStep />', () => {
       name: 'Project Admin',
       description: 'Can manage all projects of the organization',
     });
-    wrapper.unmount();
   });
 });

awx/ui_next/src/components/AppContainer/PageHeaderToolbar.test.jsx

@@ -14,10 +14,6 @@ describe('PageHeaderToolbar', () => {
   const onAboutClick = jest.fn();
   const onLogoutClick = jest.fn();
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
   test('expected content is rendered on initialization', async () => {
     await act(async () => {
       wrapper = mountWithContexts(

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

@@ -8,9 +8,6 @@ jest.mock('../../api');
 let wrapper;
 
 describe('<CopyButton/>', () => {
-  afterEach(() => {
-    wrapper.unmount();
-  });
   test('should mount properly', async () => {
     await act(async () => {
       wrapper = mountWithContexts(
@@ -24,6 +21,7 @@ describe('<CopyButton/>', () => {
     });
     expect(wrapper.find('CopyButton').length).toBe(1);
   });
+
   test('should call the correct function on button click', async () => {
     const copyItem = jest.fn();
     await act(async () => {

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

@@ -15,13 +15,6 @@ describe('<DataListToolbar />', () => {
     integerFields: ['page', 'page_size'],
   };
 
-  afterEach(() => {
-    if (toolbar) {
-      toolbar.unmount();
-      toolbar = null;
-    }
-  });
-
   const onSearch = jest.fn();
   const onReplaceSearch = jest.fn();
   const onSort = jest.fn();

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

@@ -40,7 +40,6 @@ describe('<DisassociateButton />', () => {
 
     afterAll(() => {
       jest.clearAllMocks();
-      wrapper.unmount();
     });
 
     test('should render button', () => {

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

@@ -15,6 +15,5 @@ describe('<ExpandCollapse />', () => {
       />
     );
     expect(wrapper.length).toBe(1);
-    wrapper.unmount();
   });
 });

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

@@ -6,10 +6,6 @@ import FieldWithPrompt from './FieldWithPrompt';
 describe('FieldWithPrompt', () => {
   let wrapper;
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
   test('Required asterisk and Popover hidden when not required and tooltip not provided', () => {
     wrapper = mountWithContexts(
       <Formik

awx/ui_next/src/components/JobList/JobListCancelButton.test.jsx

@@ -5,9 +5,6 @@ import JobListCancelButton from './JobListCancelButton';
 describe('<JobListCancelButton />', () => {
   let wrapper;
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
   test('should be disabled when no rows are selected', () => {
     wrapper = mountWithContexts(<JobListCancelButton jobsToCancel={[]} />);
     expect(wrapper.find('JobListCancelButton button').props().disabled).toBe(

awx/ui_next/src/components/JobList/JobListItem.test.jsx

@@ -41,10 +41,6 @@ describe('<JobListItem />', () => {
     );
   });
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
   test('initially renders successfully', () => {
     expect(wrapper.find('JobListItem').length).toBe(1);
   });
@@ -118,10 +114,6 @@ describe('<JobListItem with failed job />', () => {
     );
   });
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
   test('launch button shown to users with launch capabilities', () => {
     expect(wrapper.find('LaunchButton').length).toBe(1);
   });

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

@@ -24,7 +24,6 @@ describe('ListHeader', () => {
       />
     );
     expect(wrapper.length).toBe(1);
-    wrapper.unmount();
   });
 
   test('should navigate when DataListToolbar calls onSort prop', async () => {

awx/ui_next/src/components/Lookup/ApplicationLookup.test.jsx

@@ -36,7 +36,6 @@ describe('ApplicationLookup', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should render successfully', async () => {

awx/ui_next/src/components/Lookup/ExecutionEnvironmentLookup.test.jsx

@@ -38,7 +38,6 @@ describe('ExecutionEnvironmentLookup', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should render successfully', async () => {

awx/ui_next/src/components/Lookup/InventoryLookup.test.jsx

@@ -26,7 +26,6 @@ describe('InventoryLookup', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should render successfully and fetch data', async () => {

awx/ui_next/src/components/Lookup/MultiCredentialsLookup.test.jsx

@@ -122,7 +122,6 @@ describe('<Formik><MultiCredentialsLookup /></Formik>', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should load credential types', async () => {

awx/ui_next/src/components/Lookup/OrganizationLookup.test.jsx

@@ -12,7 +12,6 @@ describe('OrganizationLookup', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('should render successfully', async () => {

awx/ui_next/src/components/NotificationList/NotificationListItem.test.jsx

@@ -21,10 +21,6 @@ describe('<NotificationListItem canToggleNotifications />', () => {
   });
 
   afterEach(() => {
-    if (wrapper) {
-      wrapper.unmount();
-      wrapper = null;
-    }
     jest.clearAllMocks();
   });
 

awx/ui_next/src/components/PaginatedTable/ToolbarDeleteButton.test.jsx

@@ -40,8 +40,8 @@ describe('<ToolbarDeleteButton />', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
+
   test('should render button', () => {
     wrapper = mountWithContexts(
       <ToolbarDeleteButton onDelete={() => {}} itemsToDelete={[]} />

awx/ui_next/src/components/PromptDetail/PromptProjectDetail.test.jsx

@@ -25,10 +25,6 @@ describe('PromptProjectDetail', () => {
     );
   });
 
-  afterAll(() => {
-    wrapper.unmount();
-  });
-
   test('should render successfully', () => {
     expect(wrapper.find('PromptProjectDetail')).toHaveLength(1);
   });

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

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

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

@@ -113,12 +113,11 @@ describe('<Schedule />', () => {
     });
     await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
   });
-  afterAll(() => {
+
-    wrapper.unmount();
-  });
   test('renders successfully', async () => {
     expect(wrapper.length).toBe(1);
   });
+
   test('expect all tabs to exist, including Back to Schedules', async () => {
     expect(
       wrapper.find('button[link="/templates/job_template/1/schedules"]').length

awx/ui_next/src/components/Schedule/ScheduleList/ScheduleList.test.jsx

@@ -52,10 +52,6 @@ describe('ScheduleList', () => {
       wrapper.update();
     });
 
-    afterEach(() => {
-      wrapper.unmount();
-    });
-
     test('should fetch schedules from api and render the list', () => {
       expect(loadSchedules).toHaveBeenCalled();
       expect(wrapper.find('ScheduleListItem').length).toBe(5);

awx/ui_next/src/components/Schedule/ScheduleList/ScheduleListItem.test.jsx

@@ -64,10 +64,6 @@ describe('ScheduleListItem', () => {
       );
     });
 
-    afterAll(() => {
-      wrapper.unmount();
-    });
-
     test('Name correctly shown with correct link', () => {
       expect(
         wrapper
@@ -149,10 +145,6 @@ describe('ScheduleListItem', () => {
       );
     });
 
-    afterAll(() => {
-      wrapper.unmount();
-    });
-
     test('Name correctly shown with correct link', () => {
       expect(
         wrapper
@@ -217,10 +209,6 @@ describe('ScheduleListItem', () => {
       );
     });
 
-    afterAll(() => {
-      wrapper.unmount();
-    });
-
     test('should show missing resource icon', () => {
       expect(wrapper.find('ExclamationTriangleIcon').length).toBe(1);
       expect(wrapper.find('ScheduleToggle').prop('isDisabled')).toBe(true);

awx/ui_next/src/components/Schedule/ScheduleOccurrences/ScheduleOccurrences.test.jsx

@@ -15,15 +15,15 @@ describe('<ScheduleOccurrences>', () => {
         />
       );
     });
-    afterAll(() => {
+
-      wrapper.unmount();
-    });
     test('Local option initially set', async () => {
       expect(wrapper.find('MultiButtonToggle').props().value).toBe('local');
     });
+
     test('It renders the correct number of dates', async () => {
       expect(wrapper.find('dd').children().length).toBe(2);
     });
+
     test('Clicking UTC button toggles the dates to utc', async () => {
       wrapper.find('button[aria-label="UTC"]').simulate('click');
       expect(wrapper.find('MultiButtonToggle').props().value).toBe('utc');
@@ -44,6 +44,7 @@ describe('<ScheduleOccurrences>', () => {
       ).toBe('3/30/2020, 4:00:00 AM');
     });
   });
+
   describe('Only one date passed in', () => {
     test('Component should not render chldren', async () => {
       wrapper = mountWithContexts(
@@ -55,7 +56,6 @@ describe('<ScheduleOccurrences>', () => {
         />
       );
       expect(wrapper.find('ScheduleOccurrences').children().length).toBe(0);
-      wrapper.unmount();
     });
   });
 });

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

@@ -43,7 +43,6 @@ describe('<ScreenHeader />', () => {
     expect(breadcrumbItem.first().text()).toBe('Foo');
     expect(breadcrumbItem.last().text()).toBe('One');
     expect(breadcrumbHeading.text()).toBe('Bar');
-    breadcrumbWrapper.unmount();
   });
 
   test('renders breadcrumb items defined in breadcrumbConfig', () => {
@@ -66,7 +65,6 @@ describe('<ScreenHeader />', () => {
       expect(breadcrumbWrapper.find('BreadcrumbItem')).toHaveLength(
         crumbLength
       );
-      breadcrumbWrapper.unmount();
     });
   });
 });

awx/ui_next/src/components/Search/AdvancedSearch.test.jsx

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

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

@@ -8,11 +8,10 @@ describe('<SelectableCard />', () => {
   test('initially renders without crashing when not selected', () => {
     wrapper = shallow(<SelectableCard onClick={onClick} />);
     expect(wrapper.length).toBe(1);
-    wrapper.unmount();
   });
+
   test('initially renders without crashing when selected', () => {
     wrapper = shallow(<SelectableCard isSelected onClick={onClick} />);
     expect(wrapper.length).toBe(1);
-    wrapper.unmount();
   });
 });

awx/ui_next/src/components/SelectedList/DraggableSelectedList.test.jsx

@@ -6,8 +6,8 @@ describe('<DraggableSelectedList />', () => {
   let wrapper;
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
+
   test('should render expected rows', () => {
     const mockSelected = [
       {

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

@@ -1,25 +1,17 @@
 import React from 'react';
-
+import { act } from 'react-dom/test-utils';
 import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
 
 import ActivityStream from './ActivityStream';
 
-jest.mock('react-router-dom', () => ({
+jest.mock('../../api');
-  ...jest.requireActual('react-router-dom'),
-}));
 
 describe('<ActivityStream />', () => {
-  let pageWrapper;
+  test('initially renders without crashing', async () => {
-
+    let pageWrapper;
-  beforeEach(() => {
+    await act(async () => {
-    pageWrapper = mountWithContexts(<ActivityStream />);
+      pageWrapper = await mountWithContexts(<ActivityStream />);
-  });
+    });
-
-  afterEach(() => {
-    pageWrapper.unmount();
-  });
-
-  test('initially renders without crashing', () => {
     expect(pageWrapper.length).toBe(1);
   });
 });

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

@@ -1,21 +1,13 @@
 import React from 'react';
-import { act } from 'react-dom/test-utils';
 import { createMemoryHistory } from 'history';
+import { shallow } from 'enzyme';
 import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
 
 import Applications from './Applications';
 
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-}));
-
 describe('<Applications />', () => {
   let wrapper;
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
   test('renders successfully', () => {
     wrapper = mountWithContexts(<Applications />);
     const pageSections = wrapper.find('PageSection');
@@ -28,22 +20,20 @@ describe('<Applications />', () => {
     const history = createMemoryHistory({
       initialEntries: ['/applications/add'],
     });
-    wrapper = mountWithContexts(<Applications />, {
+    wrapper = shallow(<Applications />, {
       context: { router: { history } },
     });
     expect(wrapper.find('Modal[title="Application information"]').length).toBe(
       0
     );
-    await act(async () => {
+    wrapper
-      wrapper
+      .find('ApplicationAdd')
-        .find('ApplicationAdd')
+      .props()
-        .props()
+      .onSuccessfulAdd({
-        .onSuccessfulAdd({
+        name: 'test',
-          name: 'test',
+        client_id: 'foobar',
-          client_id: 'foobar',
+        client_secret: 'aaaaaaaaaaaaaaaaaaaaaaaaaa',
-          client_secret: 'aaaaaaaaaaaaaaaaaaaaaaaaaa',
+      });
-        });
-    });
     wrapper.update();
     expect(wrapper.find('Modal[title="Application information"]').length).toBe(
       1

awx/ui_next/src/screens/Credential/CredentialAdd/CredentialAdd.test.jsx

@@ -196,7 +196,6 @@ describe('<CredentialAdd />', () => {
       });
       wrapper.update();
       expect(wrapper.find('ContentError').length).toBe(1);
-      wrapper.unmount();
     });
   });
 });

awx/ui_next/src/screens/Credential/CredentialEdit/CredentialEdit.test.jsx

@@ -485,7 +485,6 @@ describe('<CredentialEdit />', () => {
       });
       wrapper.update();
       expect(wrapper.find('ContentError').length).toBe(1);
-      wrapper.unmount();
     });
   });
 });

awx/ui_next/src/screens/Credential/CredentialList/CredentialList.test.jsx

@@ -33,7 +33,6 @@ describe('<CredentialList />', () => {
 
   afterEach(() => {
     jest.clearAllMocks();
-    wrapper.unmount();
   });
 
   test('initially renders successfully', () => {

awx/ui_next/src/screens/Credential/CredentialList/CredentialListItem.test.jsx

@@ -10,10 +10,6 @@ jest.mock('../../../api');
 describe('<CredentialListItem />', () => {
   let wrapper;
 
-  afterEach(() => {
-    wrapper.unmount();
-  });
-
   test('edit button shown to users with edit capabilities', () => {
     wrapper = mountWithContexts(
       <table>

awx/ui_next/src/screens/Credential/Credentials.test.jsx

@@ -1,60 +1,16 @@
 import React from 'react';
-import { createMemoryHistory } from 'history';
+import { shallow } from 'enzyme';
-import { mountWithContexts } from '../../../testUtils/enzymeHelpers';
 import Credentials from './Credentials';
 
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-}));
-
 describe('<Credentials />', () => {
-  let wrapper;
+  test('should set breadcrumb config', () => {
+    const wrapper = shallow(<Credentials />);
 
-  afterEach(() => {
+    const header = wrapper.find('ScreenHeader');
-    wrapper.unmount();
+    expect(header.prop('streamType')).toEqual('credential');
-  });
+    expect(header.prop('breadcrumbConfig')).toEqual({
-
+      '/credentials': 'Credentials',
-  test('initially renders successfully', () => {
+      '/credentials/add': 'Create New Credential',
-    wrapper = mountWithContexts(<Credentials />);
-  });
-
-  test('should display credential list breadcrumb heading', () => {
-    const history = createMemoryHistory({
-      initialEntries: ['/credentials'],
     });
-
-    wrapper = mountWithContexts(<Credentials />, {
-      context: {
-        router: {
-          history,
-          route: {
-            location: history.location,
-          },
-        },
-      },
-    });
-
-    expect(wrapper.find('Crumb').length).toBe(0);
-    expect(wrapper.find('Title').text()).toBe('Credentials');
-  });
-
-  test('should display create new credential breadcrumb heading', () => {
-    const history = createMemoryHistory({
-      initialEntries: ['/credentials/add'],
-    });
-
-    wrapper = mountWithContexts(<Credentials />, {
-      context: {
-        router: {
-          history,
-          route: {
-            location: history.location,
-          },
-        },
-      },
-    });
-
-    expect(wrapper.find('Crumb').length).toBe(2);
-    expect(wrapper.find('Title').text()).toBe('Create New Credential');
   });
 });

awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx

@@ -95,15 +95,15 @@ describe('<CredentialForm />', () => {
         );
       });
     });
-    afterAll(() => {
+
-      wrapper.unmount();
-    });
     test('should display form fields on add properly', async () => {
       addFieldExpects();
     });
+
     test('should hide Test button initially', () => {
       expect(wrapper.find('Button[children="Test"]').length).toBe(0);
     });
+
     test('should update form values', async () => {
       // name and description change
       await act(async () => {
@@ -135,6 +135,7 @@ describe('<CredentialForm />', () => {
         name: 'organization',
       });
     });
+
     test('should display cred type subform when scm type select has a value', async () => {
       await act(async () => {
         await wrapper
@@ -218,6 +219,7 @@ describe('<CredentialForm />', () => {
         wrapper.find('textarea#credential-ssh_key_data').prop('value')
       ).toBe('');
     });
+
     test('should update field when RSA Private Key file uploaded', async () => {
       await act(async () => {
         wrapper.find('FileUpload#credential-ssh_key_data').invoke('onChange')(
@@ -232,6 +234,7 @@ describe('<CredentialForm />', () => {
         '-----BEGIN PRIVATE KEY-----\\nBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\\n-----END PRIVATE KEY-----\\n'
       );
     });
+
     test('should show error when error thrown parsing JSON', async () => {
       await act(async () => {
         await wrapper
@@ -295,9 +298,6 @@ describe('<CredentialForm />', () => {
   });
 
   describe('Edit', () => {
-    afterEach(() => {
-      wrapper.unmount();
-    });
     test('Initially renders successfully', async () => {
       await act(async () => {
         wrapper = mountWithContexts(

awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.test.jsx

@@ -15,9 +15,6 @@ const fieldOptions = {
 
 describe('<CredentialField />', () => {
   let wrapper;
-  afterEach(() => {
-    wrapper.unmount();
-  });
   test('renders correctly without initial value', () => {
     wrapper = mountWithContexts(
       <Formik
@@ -42,6 +39,7 @@ describe('<CredentialField />', () => {
     expect(wrapper.find('KeyIcon').length).toBe(1);
     expect(wrapper.find('PficonHistoryIcon').length).toBe(0);
   });
+
   test('renders correctly with initial value', () => {
     wrapper = mountWithContexts(
       <Formik
@@ -68,6 +66,7 @@ describe('<CredentialField />', () => {
     expect(wrapper.find('KeyIcon').length).toBe(1);
     expect(wrapper.find('PficonHistoryIcon').length).toBe(1);
   });
+
   test('replace/revert button behaves as expected', async () => {
     wrapper = mountWithContexts(
       <Formik

awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.test.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Formik } from 'formik';
 import { TextInput } from '@patternfly/react-core';
+import { act } from 'react-dom/test-utils';
 import { mountWithContexts } from '../../../../../testUtils/enzymeHelpers';
 import CredentialPluginField from './CredentialPluginField';
 
@@ -10,6 +11,8 @@ const fieldOptions = {
   type: 'string',
 };
 
+jest.mock('../../../../api');
+
 describe('<CredentialPluginField />', () => {
   let wrapper;
   describe('No plugin configured', () => {
@@ -34,20 +37,23 @@ describe('<CredentialPluginField />', () => {
         </Formik>
       );
     });
-    afterAll(() => {
+
-      wrapper.unmount();
-    });
     test('renders the expected content', () => {
       expect(wrapper.find('input').length).toBe(1);
       expect(wrapper.find('KeyIcon').length).toBe(1);
       expect(wrapper.find('CredentialPluginSelected').length).toBe(0);
     });
-    test('clicking plugin button shows plugin prompt', () => {
+
+    test('clicking plugin button shows plugin prompt', async () => {
       expect(wrapper.find('CredentialPluginPrompt').length).toBe(0);
-      wrapper.find('KeyIcon').simulate('click');
+      await act(async () => {
+        wrapper.find('KeyIcon').simulate('click');
+      });
+      wrapper.update();
       expect(wrapper.find('CredentialPluginPrompt').length).toBe(1);
     });
   });
+
   describe('Plugin already configured', () => {
     beforeAll(() => {
       wrapper = mountWithContexts(
@@ -78,9 +84,7 @@ describe('<CredentialPluginField />', () => {
         </Formik>
       );
     });
-    afterAll(() => {
+
-      wrapper.unmount();
-    });
     test('renders the expected content', () => {
       expect(wrapper.find('CredentialPluginPrompt').length).toBe(0);
       expect(wrapper.find('input').length).toBe(0);

awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx

@@ -99,10 +99,6 @@ describe('<CredentialPluginPrompt />', () => {
       });
     });
 
-    afterAll(() => {
-      wrapper.unmount();
-    });
-
     test('should render Wizard with all steps', async () => {
       const wizard = await waitForElement(wrapper, 'Wizard');
       const steps = wizard.prop('steps');
@@ -119,15 +115,18 @@ describe('<CredentialPluginPrompt />', () => {
         wrapper.find('Radio').filterWhere(radio => radio.isChecked).length
       ).toBe(0);
     });
+
     test('next button disabled until credential selected', () => {
       expect(wrapper.find('Button[children="Next"]').prop('isDisabled')).toBe(
         true
       );
     });
+
     test('clicking cancel button calls correct function', () => {
       wrapper.find('Button[children="Cancel"]').simulate('click');
       expect(onClose).toHaveBeenCalledTimes(1);
     });
+
     test('clicking credential row enables next button', async () => {
       await waitForElement(wrapper, 'CheckboxListItem', el => el.length > 0);
       await act(async () => {
@@ -207,9 +206,7 @@ describe('<CredentialPluginPrompt />', () => {
         );
       });
     });
-    afterAll(() => {
+
-      wrapper.unmount();
-    });
     test('should render Wizard with all steps', async () => {
       const wizard = await waitForElement(wrapper, 'Wizard');
       const steps = wizard.prop('steps');
@@ -218,6 +215,7 @@ describe('<CredentialPluginPrompt />', () => {
       expect(steps[0].name).toEqual('Credential');
       expect(steps[1].name).toEqual('Metadata');
     });
+
     test('credentials step renders correctly', async () => {
       await waitForElement(wrapper, 'CheckboxListItem', el => el.length > 0);
 
@@ -233,6 +231,7 @@ describe('<CredentialPluginPrompt />', () => {
         false
       );
     });
+
     test('metadata step renders correctly', async () => {
       await act(async () => {
         wrapper.find('Button[children="Next"]').simulate('click');
@@ -247,6 +246,7 @@ describe('<CredentialPluginPrompt />', () => {
         wrapper.find('input#credential-secret_version').prop('value')
       ).toBe('9000');
     });
+
     test('clicking Test button makes correct call', async () => {
       await act(async () => {
         wrapper.find('Button[children="Test"]').simulate('click');

awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.test.jsx

@@ -16,17 +16,17 @@ describe('<CredentialPluginSelected />', () => {
       />
     );
   });
-  afterAll(() => {
+
-    wrapper.unmount();
-  });
   test('renders the expected content', () => {
     expect(wrapper.find('CredentialChip').length).toBe(1);
     expect(wrapper.find('KeyIcon').length).toBe(1);
   });
+
   test('clearing plugin calls expected function', () => {
     wrapper.find('CredentialChip button').simulate('click');
     expect(onClearPlugin).toBeCalledTimes(1);
   });
+
   test('editing plugin calls expected function', () => {
     wrapper.find('KeyIcon').simulate('click');
     expect(onEditPlugin).toBeCalledTimes(1);