Moved common test set-up code to helper function

test/servers/CreateServer.test.tsx

@@ -1,9 +1,9 @@
-import userEvent from '@testing-library/user-event';
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import { useNavigate } from 'react-router-dom';
 import { CreateServer as createCreateServer } from '../../src/servers/CreateServer';
 import { ServerWithId } from '../../src/servers/data';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), useNavigate: jest.fn() }));
 
@@ -22,10 +22,7 @@ describe('<CreateServer />', () => {
     });
     const CreateServer = createCreateServer(() => <>ImportServersBtn</>, useTimeoutToggle);
 
-    return {
-      user: userEvent.setup(),
-      ...render(<CreateServer createServer={createServerMock} servers={servers} />),
-    };
+    return renderWithEvents(<CreateServer createServer={createServerMock} servers={servers} />);
   };
 
   beforeEach(jest.clearAllMocks);

test/servers/DeleteServerButton.test.tsx

@@ -1,20 +1,17 @@
 import { ReactNode } from 'react';
-import userEvent from '@testing-library/user-event';
-import { render, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import { DeleteServerButton as createDeleteServerButton } from '../../src/servers/DeleteServerButton';
 import { ServerWithId } from '../../src/servers/data';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<DeleteServerButton />', () => {
   const DeleteServerButton = createDeleteServerButton(
     ({ isOpen }) => <>DeleteServerModal {isOpen ? '[Open]' : '[Closed]'}</>,
   );
-  const setUp = (children?: ReactNode) => ({
-    user: userEvent.setup(),
-    ...render(
-      <DeleteServerButton server={Mock.all<ServerWithId>()} textClassName="button">{children}</DeleteServerButton>,
-    ),
-  });
+  const setUp = (children?: ReactNode) => renderWithEvents(
+    <DeleteServerButton server={Mock.all<ServerWithId>()} textClassName="button">{children}</DeleteServerButton>,
+  );
 
   it.each([
     ['Foo bar'],

test/servers/DeleteServerModal.test.tsx

@@ -1,9 +1,9 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import { useNavigate } from 'react-router-dom';
 import { DeleteServerModal } from '../../src/servers/DeleteServerModal';
 import { ServerWithId } from '../../src/servers/data';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), useNavigate: jest.fn() }));
 
@@ -15,17 +15,14 @@ describe('<DeleteServerModal />', () => {
   const setUp = () => {
     (useNavigate as any).mockReturnValue(navigate);
 
-    return {
-      user: userEvent.setup(),
-      ...render(
-        <DeleteServerModal
-          server={Mock.of<ServerWithId>({ name: serverName })}
-          toggle={toggleMock}
-          isOpen
-          deleteServer={deleteServerMock}
-        />,
-      ),
-    };
+    return renderWithEvents(
+      <DeleteServerModal
+        server={Mock.of<ServerWithId>({ name: serverName })}
+        toggle={toggleMock}
+        isOpen
+        deleteServer={deleteServerMock}
+      />,
+    );
   };
 
   afterEach(jest.clearAllMocks);

test/servers/EditServer.test.tsx

@@ -1,9 +1,9 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { fireEvent, screen } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import { useNavigate } from 'react-router-dom';
 import { EditServer as editServerConstruct } from '../../src/servers/EditServer';
 import { ReachableServer, SelectedServer } from '../../src/servers/data';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), useNavigate: jest.fn() }));
 
@@ -18,10 +18,9 @@ describe('<EditServer />', () => {
     apiKey: 'the_api_key',
   });
   const EditServer = editServerConstruct(ServerError);
-  const setUp = (selectedServer: SelectedServer = defaultSelectedServer) => ({
-    user: userEvent.setup(),
-    ...render(<EditServer editServer={editServerMock} selectedServer={selectedServer} selectServer={jest.fn()} />),
-  });
+  const setUp = (selectedServer: SelectedServer = defaultSelectedServer) => renderWithEvents(
+    <EditServer editServer={editServerMock} selectedServer={selectedServer} selectServer={jest.fn()} />,
+  );
 
   beforeEach(() => {
     (useNavigate as any).mockReturnValue(navigate);

test/servers/ManageServers.test.tsx

@@ -1,10 +1,10 @@
 import { Mock } from 'ts-mockery';
-import userEvent from '@testing-library/user-event';
-import { render, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import ServersExporter from '../../src/servers/services/ServersExporter';
 import { ManageServers as createManageServers } from '../../src/servers/ManageServers';
 import { ServersMap, ServerWithId } from '../../src/servers/data';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<ManageServers />', () => {
   const exportServers = jest.fn();
@@ -19,10 +19,9 @@ describe('<ManageServers />', () => {
   const createServerMock = (value: string, autoConnect = false) => Mock.of<ServerWithId>(
     { id: value, name: value, url: value, autoConnect },
   );
-  const setUp = (servers: ServersMap = {}) => ({
-    user: userEvent.setup(),
-    ...render(<MemoryRouter><ManageServers servers={servers} /></MemoryRouter>),
-  });
+  const setUp = (servers: ServersMap = {}) => renderWithEvents(
+    <MemoryRouter><ManageServers servers={servers} /></MemoryRouter>,
+  );
 
   afterEach(jest.clearAllMocks);
 

test/servers/ManageServersRowDropdown.test.tsx

@@ -1,9 +1,9 @@
-import userEvent from '@testing-library/user-event';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import { MemoryRouter } from 'react-router-dom';
 import { ServerWithId } from '../../src/servers/data';
 import { ManageServersRowDropdown as createManageServersRowDropdown } from '../../src/servers/ManageServersRowDropdown';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<ManageServersRowDropdown />', () => {
   const ManageServersRowDropdown = createManageServersRowDropdown(
@@ -12,14 +12,11 @@ describe('<ManageServersRowDropdown />', () => {
   const setAutoConnect = jest.fn();
   const setUp = (autoConnect = false) => {
     const server = Mock.of<ServerWithId>({ id: 'abc123', autoConnect });
-    return {
-      user: userEvent.setup(),
-      ...render(
-        <MemoryRouter>
-          <ManageServersRowDropdown setAutoConnect={setAutoConnect} server={server} />
-        </MemoryRouter>,
-      ),
-    };
+    return renderWithEvents(
+      <MemoryRouter>
+        <ManageServersRowDropdown setAutoConnect={setAutoConnect} server={server} />
+      </MemoryRouter>,
+    );
   };
 
   afterEach(jest.clearAllMocks);

test/servers/ServersDropdown.test.tsx

@@ -1,10 +1,10 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { values } from 'ramda';
 import { Mock } from 'ts-mockery';
 import { MemoryRouter } from 'react-router-dom';
 import { ServersDropdown } from '../../src/servers/ServersDropdown';
 import { ServersMap, ServerWithId } from '../../src/servers/data';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<ServersDropdown />', () => {
   const fallbackServers: ServersMap = {
@@ -12,10 +12,9 @@ describe('<ServersDropdown />', () => {
     '2b': Mock.of<ServerWithId>({ name: 'bar', id: '2b' }),
     '3c': Mock.of<ServerWithId>({ name: 'baz', id: '3c' }),
   };
-  const setUp = (servers: ServersMap = fallbackServers) => ({
-    user: userEvent.setup(),
-    ...render(<MemoryRouter><ServersDropdown servers={servers} selectedServer={null} /></MemoryRouter>),
-  });
+  const setUp = (servers: ServersMap = fallbackServers) => renderWithEvents(
+    <MemoryRouter><ServersDropdown servers={servers} selectedServer={null} /></MemoryRouter>,
+  );
 
   it('contains the list of servers and the "mange servers" button', async () => {
     const { user } = setUp();

test/servers/helpers/DuplicatedServersModal.test.tsx

@@ -1,18 +1,15 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import { DuplicatedServersModal } from '../../../src/servers/helpers/DuplicatedServersModal';
 import { ServerData } from '../../../src/servers/data';
+import { renderWithEvents } from '../../__mocks__/setUpTest';
 
 describe('<DuplicatedServersModal />', () => {
   const onDiscard = jest.fn();
   const onSave = jest.fn();
-  const setUp = (duplicatedServers: ServerData[] = []) => ({
-    user: userEvent.setup(),
-    ...render(
-      <DuplicatedServersModal isOpen duplicatedServers={duplicatedServers} onDiscard={onDiscard} onSave={onSave} />,
-    ),
-  });
+  const setUp = (duplicatedServers: ServerData[] = []) => renderWithEvents(
+    <DuplicatedServersModal isOpen duplicatedServers={duplicatedServers} onDiscard={onDiscard} onSave={onSave} />,
+  );
 
   beforeEach(jest.clearAllMocks);
 

test/servers/helpers/ImportServersBtn.test.tsx

@@ -1,5 +1,4 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import {
   ImportServersBtn as createImportServersBtn,
@@ -7,6 +6,7 @@ import {
 } from '../../../src/servers/helpers/ImportServersBtn';
 import { ServersImporter } from '../../../src/servers/services/ServersImporter';
 import { ServersMap, ServerWithId } from '../../../src/servers/data';
+import { renderWithEvents } from '../../__mocks__/setUpTest';
 
 describe('<ImportServersBtn />', () => {
   const onImportMock = jest.fn();
@@ -14,17 +14,14 @@ describe('<ImportServersBtn />', () => {
   const importServersFromFile = jest.fn().mockResolvedValue([]);
   const serversImporterMock = Mock.of<ServersImporter>({ importServersFromFile });
   const ImportServersBtn = createImportServersBtn(serversImporterMock);
-  const setUp = (props: Partial<ImportServersBtnProps> = {}, servers: ServersMap = {}) => ({
-    user: userEvent.setup(),
-    ...render(
-      <ImportServersBtn
-        servers={servers}
-        {...props}
-        createServers={createServersMock}
-        onImport={onImportMock}
-      />,
-    ),
-  });
+  const setUp = (props: Partial<ImportServersBtnProps> = {}, servers: ServersMap = {}) => renderWithEvents(
+    <ImportServersBtn
+      servers={servers}
+      {...props}
+      createServers={createServersMock}
+      onImport={onImportMock}
+    />,
+  );
 
   afterEach(jest.clearAllMocks);