Moved common test set-up code to helper function

test/common/AppUpdateBanner.test.tsx

@@ -1,14 +1,11 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { AppUpdateBanner } from '../../src/common/AppUpdateBanner';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<AppUpdateBanner />', () => {
   const toggle = jest.fn();
   const forceUpdate = jest.fn();
-  const setUp = () => ({
-    user: userEvent.setup(),
-    ...render(<AppUpdateBanner isOpen toggle={toggle} forceUpdate={forceUpdate} />),
-  });
+  const setUp = () => renderWithEvents(<AppUpdateBanner isOpen toggle={toggle} forceUpdate={forceUpdate} />);
 
   afterEach(jest.clearAllMocks);
 

test/common/ErrorHandler.test.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 import { Mock } from 'ts-mockery';
 import { ErrorHandler as createErrorHandler } from '../../src/common/ErrorHandler';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 const ComponentWithError = () => {
   throw new Error('Error!!');
@@ -36,8 +36,7 @@ describe('<ErrorHandler />', () => {
   });
 
   it('reloads page on button click', async () => {
-    const user = userEvent.setup();
-    render(<ErrorHandler children={<ComponentWithError />} />);
+    const { user } = renderWithEvents(<ErrorHandler children={<ComponentWithError />} />);
 
     expect(reload).not.toHaveBeenCalled();
     await user.click(screen.getByRole('button'));

test/common/MainHeader.test.tsx

@@ -1,8 +1,8 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen, waitFor } from '@testing-library/react';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 import { MainHeader as createMainHeader } from '../../src/common/MainHeader';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<MainHeader />', () => {
   const MainHeader = createMainHeader(() => <>ServersDropdown</>);
@@ -10,14 +10,11 @@ describe('<MainHeader />', () => {
     const history = createMemoryHistory();
     history.push(pathname);
 
-    const user = userEvent.setup();
-    const renderResult = render(
+    return renderWithEvents(
       <Router location={history.location} navigator={history}>
         <MainHeader />
       </Router>,
     );
-
-    return { user, ...renderResult };
   };
 
   it('renders ServersDropdown', () => {