Moved common test set-up code to helper function

test/short-urls/ShortUrlForm.test.tsx

@@ -1,5 +1,4 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { UserEvent } from '@testing-library/user-event/dist/types/setup';
 import { formatISO } from 'date-fns';
 import { Mock } from 'ts-mockery';
@@ -7,13 +6,13 @@ import { ShortUrlForm as createShortUrlForm, Mode } from '../../src/short-urls/S
 import { ReachableServer, SelectedServer } from '../../src/servers/data';
 import { parseDate } from '../../src/utils/helpers/date';
 import { OptionalString } from '../../src/utils/utils';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<ShortUrlForm />', () => {
   const createShortUrl = jest.fn(async () => Promise.resolve());
   const ShortUrlForm = createShortUrlForm(() => <span>TagsSelector</span>, () => <span>DomainSelector</span>);
-  const setUp = (selectedServer: SelectedServer = null, mode: Mode = 'create', title?: OptionalString) => ({
-    user: userEvent.setup(),
-    ...render(
+  const setUp = (selectedServer: SelectedServer = null, mode: Mode = 'create', title?: OptionalString) =>
+    renderWithEvents(
       <ShortUrlForm
         selectedServer={selectedServer}
         mode={mode}
@@ -21,8 +20,7 @@ describe('<ShortUrlForm />', () => {
         initialState={{ validateUrl: true, findIfExists: false, title, longUrl: '' }}
         onSave={createShortUrl}
       />,
-    ),
-  });
+    );
 
   afterEach(jest.clearAllMocks);
 

test/short-urls/ShortUrlsFilteringBar.test.tsx

@@ -1,5 +1,4 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen, waitFor } from '@testing-library/react';
 import { Mock } from 'ts-mockery';
 import { endOfDay, formatISO, startOfDay } from 'date-fns';
 import { MemoryRouter, useLocation, useNavigate } from 'react-router-dom';
@@ -7,6 +6,7 @@ import { ShortUrlsFilteringBar as filteringBarCreator } from '../../src/short-ur
 import { ReachableServer, SelectedServer } from '../../src/servers/data';
 import { DateRange } from '../../src/utils/dates/types';
 import { formatDate } from '../../src/utils/helpers/date';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -24,18 +24,15 @@ describe('<ShortUrlsFilteringBar />', () => {
     (useLocation as any).mockReturnValue({ search });
     (useNavigate as any).mockReturnValue(navigate);
 
-    return {
-      user: userEvent.setup(),
-      ...render(
-        <MemoryRouter>
-          <ShortUrlsFilteringBar
-            selectedServer={selectedServer ?? Mock.all<SelectedServer>()}
-            order={{}}
-            handleOrderBy={handleOrderBy}
-          />
-        </MemoryRouter>,
-      ),
-    };
+    return renderWithEvents(
+      <MemoryRouter>
+        <ShortUrlsFilteringBar
+          selectedServer={selectedServer ?? Mock.all<SelectedServer>()}
+          order={{}}
+          handleOrderBy={handleOrderBy}
+        />
+      </MemoryRouter>,
+    );
   };
 
   afterEach(jest.clearAllMocks);

test/short-urls/ShortUrlsList.test.tsx

@@ -1,5 +1,4 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { FC } from 'react';
 import { Mock } from 'ts-mockery';
 import { MemoryRouter, useNavigate } from 'react-router-dom';
@@ -10,6 +9,7 @@ import { ShortUrlsList as ShortUrlsListModel } from '../../src/short-urls/reduce
 import { ReachableServer } from '../../src/servers/data';
 import { Settings } from '../../src/settings/reducers/settings';
 import { ShortUrlsTableProps } from '../../src/short-urls/ShortUrlsTable';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -36,20 +36,17 @@ describe('<ShortUrlsList />', () => {
     },
   });
   const ShortUrlsList = createShortUrlsList(ShortUrlsTable, ShortUrlsFilteringBar);
-  const setUp = (defaultOrdering: ShortUrlsOrder = {}) => ({
-    user: userEvent.setup(),
-    ...render(
-      <MemoryRouter>
-        <ShortUrlsList
-          {...Mock.of<MercureBoundProps>({ mercureInfo: { loading: true } })}
-          listShortUrls={listShortUrlsMock}
-          shortUrlsList={shortUrlsList}
-          selectedServer={Mock.of<ReachableServer>({ id: '1' })}
-          settings={Mock.of<Settings>({ shortUrlsList: { defaultOrdering } })}
-        />
-      </MemoryRouter>,
-    ),
-  });
+  const setUp = (defaultOrdering: ShortUrlsOrder = {}) => renderWithEvents(
+    <MemoryRouter>
+      <ShortUrlsList
+        {...Mock.of<MercureBoundProps>({ mercureInfo: { loading: true } })}
+        listShortUrls={listShortUrlsMock}
+        shortUrlsList={shortUrlsList}
+        selectedServer={Mock.of<ReachableServer>({ id: '1' })}
+        settings={Mock.of<Settings>({ shortUrlsList: { defaultOrdering } })}
+      />
+    </MemoryRouter>,
+  );
 
   beforeEach(() => {
     (useNavigate as any).mockReturnValue(navigate);

test/short-urls/ShortUrlsTable.test.tsx

@@ -1,21 +1,18 @@
-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 { ShortUrlsTable as shortUrlsTableCreator } from '../../src/short-urls/ShortUrlsTable';
 import { ShortUrlsList } from '../../src/short-urls/reducers/shortUrlsList';
 import { ReachableServer, SelectedServer } from '../../src/servers/data';
 import { ShortUrlsOrderableFields, SHORT_URLS_ORDERABLE_FIELDS } from '../../src/short-urls/data';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<ShortUrlsTable />', () => {
   const shortUrlsList = Mock.all<ShortUrlsList>();
   const orderByColumn = jest.fn();
   const ShortUrlsTable = shortUrlsTableCreator(() => <span>ShortUrlsRow</span>);
-  const setUp = (server: SelectedServer = null) => ({
-    user: userEvent.setup(),
-    ...render(
-      <ShortUrlsTable shortUrlsList={shortUrlsList} selectedServer={server} orderByColumn={() => orderByColumn} />,
-    ),
-  });
+  const setUp = (server: SelectedServer = null) => renderWithEvents(
+    <ShortUrlsTable shortUrlsList={shortUrlsList} selectedServer={server} orderByColumn={() => orderByColumn} />,
+  );
 
   afterEach(jest.resetAllMocks);
 

test/short-urls/UseExistingIfFoundInfoIcon.test.tsx

@@ -1,11 +1,10 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { UseExistingIfFoundInfoIcon } from '../../src/short-urls/UseExistingIfFoundInfoIcon';
+import { renderWithEvents } from '../__mocks__/setUpTest';
 
 describe('<UseExistingIfFoundInfoIcon />', () => {
   it('shows modal when icon is clicked', async () => {
-    const user = userEvent.setup();
-    render(<UseExistingIfFoundInfoIcon />);
+    const { user } = renderWithEvents(<UseExistingIfFoundInfoIcon />);
 
     expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     await user.click(screen.getByTitle('What does this mean?').firstElementChild as Element);

test/short-urls/helpers/CreateShortUrlResult.test.tsx

@@ -1,18 +1,17 @@
-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 { CreateShortUrlResult as createResult } from '../../../src/short-urls/helpers/CreateShortUrlResult';
 import { ShortUrl } from '../../../src/short-urls/data';
 import { TimeoutToggle } from '../../../src/utils/helpers/hooks';
+import { renderWithEvents } from '../../__mocks__/setUpTest';
 
 describe('<CreateShortUrlResult />', () => {
   const copyToClipboard = jest.fn();
   const useTimeoutToggle = jest.fn(() => [false, copyToClipboard]) as TimeoutToggle;
   const CreateShortUrlResult = createResult(useTimeoutToggle);
-  const setUp = (result: ShortUrl | null = null, error = false) => ({
-    user: userEvent.setup(),
-    ...render(<CreateShortUrlResult resetCreateShortUrl={() => {}} result={result} error={error} saving={false} />),
-  });
+  const setUp = (result: ShortUrl | null = null, error = false) => renderWithEvents(
+    <CreateShortUrlResult resetCreateShortUrl={() => {}} result={result} error={error} saving={false} />,
+  );
 
   afterEach(jest.clearAllMocks);
 

test/short-urls/helpers/ExportShortUrlsBtn.test.tsx

@@ -1,10 +1,10 @@
 import { Mock } from 'ts-mockery';
-import { render, screen, waitForElementToBeRemoved } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen, waitForElementToBeRemoved } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { ReportExporter } from '../../../src/common/services/ReportExporter';
 import { ExportShortUrlsBtn as createExportShortUrlsBtn } from '../../../src/short-urls/helpers/ExportShortUrlsBtn';
 import { NotFoundServer, ReachableServer, SelectedServer } from '../../../src/servers/data';
+import { renderWithEvents } from '../../__mocks__/setUpTest';
 
 describe('<ExportShortUrlsBtn />', () => {
   const listShortUrls = jest.fn();
@@ -12,14 +12,11 @@ describe('<ExportShortUrlsBtn />', () => {
   const exportShortUrls = jest.fn();
   const reportExporter = Mock.of<ReportExporter>({ exportShortUrls });
   const ExportShortUrlsBtn = createExportShortUrlsBtn(buildShlinkApiClient, reportExporter);
-  const setUp = (amount?: number, selectedServer?: SelectedServer) => ({
-    user: userEvent.setup(),
-    ...render(
-      <MemoryRouter>
-        <ExportShortUrlsBtn selectedServer={selectedServer ?? Mock.all<SelectedServer>()} amount={amount} />
-      </MemoryRouter>,
-    ),
-  });
+  const setUp = (amount?: number, selectedServer?: SelectedServer) => renderWithEvents(
+    <MemoryRouter>
+      <ExportShortUrlsBtn selectedServer={selectedServer ?? Mock.all<SelectedServer>()} amount={amount} />
+    </MemoryRouter>,
+  );
 
   afterEach(jest.clearAllMocks);
 

test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx

@@ -1,17 +1,14 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { QrErrorCorrection } from '../../../../src/utils/helpers/qrCodes';
 import { QrErrorCorrectionDropdown } from '../../../../src/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown';
+import { renderWithEvents } from '../../../__mocks__/setUpTest';
 
 describe('<QrErrorCorrectionDropdown />', () => {
   const initialErrorCorrection: QrErrorCorrection = 'Q';
   const setErrorCorrection = jest.fn();
-  const setUp = () => ({
-    user: userEvent.setup(),
-    ...render(
-      <QrErrorCorrectionDropdown errorCorrection={initialErrorCorrection} setErrorCorrection={setErrorCorrection} />,
-    ),
-  });
+  const setUp = () => renderWithEvents(
+    <QrErrorCorrectionDropdown errorCorrection={initialErrorCorrection} setErrorCorrection={setErrorCorrection} />,
+  );
 
   afterEach(jest.clearAllMocks);
 

test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx

@@ -1,15 +1,12 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 import { QrCodeFormat } from '../../../../src/utils/helpers/qrCodes';
 import { QrFormatDropdown } from '../../../../src/short-urls/helpers/qr-codes/QrFormatDropdown';
+import { renderWithEvents } from '../../../__mocks__/setUpTest';
 
 describe('<QrFormatDropdown />', () => {
   const initialFormat: QrCodeFormat = 'svg';
   const setFormat = jest.fn();
-  const setUp = () => ({
-    user: userEvent.setup(),
-    ...render(<QrFormatDropdown format={initialFormat} setFormat={setFormat} />),
-  });
+  const setUp = () => renderWithEvents(<QrFormatDropdown format={initialFormat} setFormat={setFormat} />);
 
   afterEach(jest.clearAllMocks);