Remove usages of vi.mock

test/servers/CreateServer.test.tsx

@@ -1,16 +1,12 @@
 import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { useNavigate } from 'react-router-dom';
+import { createMemoryHistory } from 'history';
+import { Router } from 'react-router-dom';
 import { CreateServerFactory } from '../../src/servers/CreateServer';
 import type { ServersMap } from '../../src/servers/data';
 import { checkAccessibility } from '../__helpers__/accessibility';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual<any>('react-router-dom')),
-  useNavigate: vi.fn(),
-}));
-
 type SetUpOptions = {
   serversImported?: boolean;
   importFailed?: boolean;
@@ -19,13 +15,10 @@ type SetUpOptions = {
 
 describe('<CreateServer />', () => {
   const createServersMock = vi.fn();
-  const navigate = vi.fn();
   const defaultServers: ServersMap = {
     foo: fromPartial({ url: 'https://existing_url.com', apiKey: 'existing_api_key' }),
   };
   const setUp = ({ serversImported = false, importFailed = false, servers = defaultServers }: SetUpOptions = {}) => {
-    (useNavigate as any).mockReturnValue(navigate);
-
     let callCount = 0;
     const useTimeoutToggle = vi.fn().mockImplementation(() => {
       const result = [callCount % 2 === 0 ? serversImported : importFailed, () => null];
@@ -36,8 +29,16 @@ describe('<CreateServer />', () => {
       ImportServersBtn: () => <>ImportServersBtn</>,
       useTimeoutToggle,
     }));
+    const history = createMemoryHistory({ initialEntries: ['/foo', '/bar'] });
 
-    return renderWithEvents(<CreateServer createServers={createServersMock} servers={servers} />);
+    return {
+      history,
+      ...renderWithEvents(
+        <Router location={history.location} navigator={history}>
+          <CreateServer createServers={createServersMock} servers={servers} />
+        </Router>,
+      ),
+    };
   };
 
   it('passes a11y checks', () => checkAccessibility(setUp()));
@@ -67,7 +68,7 @@ describe('<CreateServer />', () => {
   });
 
   it('creates server data when form is submitted', async () => {
-    const { user } = setUp();
+    const { user, history } = setUp();
 
     expect(createServersMock).not.toHaveBeenCalled();
 
@@ -81,12 +82,12 @@ describe('<CreateServer />', () => {
       url: 'https://the_url.com',
       apiKey: 'the_api_key',
     })]);
-    expect(navigate).toHaveBeenCalledWith(expect.stringMatching(/^\/server\//));
+    expect(history.location.pathname).toEqual(expect.stringMatching(/^\/server\//));
     expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
   });
 
   it('displays dialog when trying to create a duplicated server', async () => {
-    const { user } = setUp();
+    const { user, history } = setUp();
 
     await user.type(screen.getByLabelText(/^Name/), 'the_name');
     await user.type(screen.getByLabelText(/^URL/), 'https://existing_url.com');
@@ -97,6 +98,6 @@ describe('<CreateServer />', () => {
     await user.click(screen.getByRole('button', { name: 'Discard' }));
 
     expect(createServersMock).not.toHaveBeenCalled();
-    expect(navigate).toHaveBeenCalledWith(-1);
+    expect(history.location.pathname).toEqual('/foo'); // Goes back to first route from history's initialEntries
   });
 });

test/servers/DeleteServerModal.test.tsx

@@ -1,34 +1,33 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { useNavigate } from 'react-router-dom';
+import { createMemoryHistory } from 'history';
+import { Router } from 'react-router-dom';
 import { DeleteServerModal } from '../../src/servers/DeleteServerModal';
 import { checkAccessibility } from '../__helpers__/accessibility';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 import { TestModalWrapper } from '../__helpers__/TestModalWrapper';
 
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual<any>('react-router-dom')),
-  useNavigate: vi.fn(),
-}));
-
 describe('<DeleteServerModal />', () => {
   const deleteServerMock = vi.fn();
-  const navigate = vi.fn();
   const serverName = 'the_server_name';
   const setUp = () => {
-    (useNavigate as any).mockReturnValue(navigate);
-
-    return renderWithEvents(
-      <TestModalWrapper
-        renderModal={(args) => (
-          <DeleteServerModal
-            {...args}
-            server={fromPartial({ name: serverName })}
-            deleteServer={deleteServerMock}
+    const history = createMemoryHistory({ initialEntries: ['/foo'] });
+    return {
+      history,
+      ...renderWithEvents(
+        <Router location={history.location} navigator={history}>
+          <TestModalWrapper
+            renderModal={(args) => (
+              <DeleteServerModal
+                {...args}
+                server={fromPartial({ name: serverName })}
+                deleteServer={deleteServerMock}
+              />
+            )}
           />
-        )}
-      />,
-    );
+        </Router>,
+      ),
+    };
   };
 
   it('passes a11y checks', () => checkAccessibility(setUp()));
@@ -51,22 +50,23 @@ describe('<DeleteServerModal />', () => {
     [() => screen.getByRole('button', { name: 'Cancel' })],
     [() => screen.getByLabelText('Close')],
   ])('toggles when clicking cancel button', async (getButton) => {
-    const { user } = setUp();
+    const { user, history } = setUp();
 
+    expect(history.location.pathname).toEqual('/foo');
     await user.click(getButton());
 
     expect(deleteServerMock).not.toHaveBeenCalled();
-    expect(navigate).not.toHaveBeenCalled();
+    expect(history.location.pathname).toEqual('/foo'); // No navigation happens, keeping initial pathname
   });
 
   it('deletes server when clicking accept button', async () => {
-    const { user } = setUp();
+    const { user, history } = setUp();
 
     expect(deleteServerMock).not.toHaveBeenCalled();
-    expect(navigate).not.toHaveBeenCalled();
+    expect(history.location.pathname).toEqual('/foo');
     await user.click(screen.getByRole('button', { name: 'Delete' }));
 
     await waitFor(() => expect(deleteServerMock).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(navigate).toHaveBeenCalledTimes(1));
+    await waitFor(() => expect(history.location.pathname).toEqual('/'));
   });
 });

test/servers/EditServer.test.tsx

@@ -1,20 +1,15 @@
 import { fireEvent, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { MemoryRouter, useNavigate } from 'react-router-dom';
+import { createMemoryHistory } from 'history';
+import { Router } from 'react-router-dom';
 import type { ReachableServer, SelectedServer } from '../../src/servers/data';
 import { EditServerFactory } from '../../src/servers/EditServer';
 import { checkAccessibility } from '../__helpers__/accessibility';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
-vi.mock('react-router-dom', async () => ({
-  ...(await vi.importActual<any>('react-router-dom')),
-  useNavigate: vi.fn(),
-}));
-
 describe('<EditServer />', () => {
   const ServerError = vi.fn();
   const editServerMock = vi.fn();
-  const navigate = vi.fn();
   const defaultSelectedServer = fromPartial<ReachableServer>({
     id: 'abc123',
     name: 'the_name',
@@ -22,15 +17,17 @@ describe('<EditServer />', () => {
     apiKey: 'the_api_key',
   });
   const EditServer = EditServerFactory(fromPartial({ ServerError }));
-  const setUp = (selectedServer: SelectedServer = defaultSelectedServer) => renderWithEvents(
-    <MemoryRouter>
-      <EditServer editServer={editServerMock} selectedServer={selectedServer} selectServer={vi.fn()} />
-    </MemoryRouter>,
-  );
-
-  beforeEach(() => {
-    (useNavigate as any).mockReturnValue(navigate);
-  });
+  const setUp = (selectedServer: SelectedServer = defaultSelectedServer) => {
+    const history = createMemoryHistory({ initialEntries: ['/foo', '/bar'] });
+    return {
+      history,
+      ...renderWithEvents(
+        <Router location={history.location} navigator={history}>
+          <EditServer editServer={editServerMock} selectedServer={selectedServer} selectServer={vi.fn()} />
+        </Router>,
+      ),
+    };
+  };
 
   it('passes a11y checks', () => checkAccessibility(setUp()));
 
@@ -56,7 +53,7 @@ describe('<EditServer />', () => {
   });
 
   it('edits server and redirects to it when form is submitted', async () => {
-    const { user } = setUp();
+    const { user, history } = setUp();
 
     await user.type(screen.getByDisplayValue('the_name'), ' edited');
     await user.type(screen.getByDisplayValue('the_url'), ' edited');
@@ -69,6 +66,8 @@ describe('<EditServer />', () => {
       url: 'the_url edited',
       apiKey: 'the_api_key',
     });
-    expect(navigate).toHaveBeenCalledWith(-1);
+
+    // After saving we go back, to the first route from history's initialEntries
+    expect(history.location.pathname).toEqual('/foo');
   });
 });