Fixed most tests using react-router-dom hooks

test/servers/CreateServer.test.tsx

@@ -1,27 +1,29 @@
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
-import { History } from 'history';
+import { useNavigate } from 'react-router-dom';
 import createServerConstruct from '../../src/servers/CreateServer';
 import { ServerForm } from '../../src/servers/helpers/ServerForm';
 import { ServerWithId } from '../../src/servers/data';
 import { DuplicatedServersModal } from '../../src/servers/helpers/DuplicatedServersModal';
 
+jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), useNavigate: jest.fn() }));
+
 describe('<CreateServer />', () => {
   let wrapper: ShallowWrapper;
   const ImportServersBtn = () => null;
   const createServerMock = jest.fn();
-  const push = jest.fn();
-  const goBack = jest.fn();
-  const historyMock = Mock.of<History>({ push, goBack });
+  const navigate = jest.fn();
   const servers = { foo: Mock.all<ServerWithId>() };
   const createWrapper = (serversImported = false, importFailed = false) => {
+    (useNavigate as any).mockReturnValue(navigate);
+
     const useStateFlagTimeout = jest.fn()
       .mockReturnValueOnce([ serversImported, () => '' ])
       .mockReturnValueOnce([ importFailed, () => '' ])
       .mockReturnValue([]);
     const CreateServer = createServerConstruct(ImportServersBtn, useStateFlagTimeout);
 
-    wrapper = shallow(<CreateServer createServer={createServerMock} history={historyMock} servers={servers} />);
+    wrapper = shallow(<CreateServer createServer={createServerMock} servers={servers} />);
 
     return wrapper;
   };
@@ -68,7 +70,7 @@ describe('<CreateServer />', () => {
     wrapper.find(DuplicatedServersModal).simulate('save');
 
     expect(createServerMock).toHaveBeenCalledTimes(1);
-    expect(push).toHaveBeenCalledTimes(1);
+    expect(navigate).toHaveBeenCalledTimes(1);
   });
 
   it('goes back on modal discard', () => {
@@ -76,6 +78,6 @@ describe('<CreateServer />', () => {
 
     wrapper.find(DuplicatedServersModal).simulate('discard');
 
-    expect(goBack).toHaveBeenCalledTimes(1);
+    expect(navigate).toHaveBeenCalledWith(-1);
   });
 });

test/servers/DeleteServerModal.test.tsx

@@ -1,25 +1,28 @@
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
-import { History } from 'history';
 import { Mock } from 'ts-mockery';
+import { useNavigate } from 'react-router-dom';
 import DeleteServerModal from '../../src/servers/DeleteServerModal';
 import { ServerWithId } from '../../src/servers/data';
 
+jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), useNavigate: jest.fn() }));
+
 describe('<DeleteServerModal />', () => {
   let wrapper: ShallowWrapper;
   const deleteServerMock = jest.fn();
-  const push = jest.fn();
+  const navigate = jest.fn();
   const toggleMock = jest.fn();
   const serverName = 'the_server_name';
 
   beforeEach(() => {
+    (useNavigate as any).mockReturnValue(navigate);
+
     wrapper = shallow(
       <DeleteServerModal
         server={Mock.of<ServerWithId>({ name: serverName })}
         toggle={toggleMock}
         isOpen={true}
         deleteServer={deleteServerMock}
-        history={Mock.of<History>({ push })}
       />,
     );
   });
@@ -48,7 +51,7 @@ describe('<DeleteServerModal />', () => {
 
     expect(toggleMock).toHaveBeenCalledTimes(1);
     expect(deleteServerMock).not.toHaveBeenCalled();
-    expect(push).not.toHaveBeenCalled();
+    expect(navigate).not.toHaveBeenCalled();
   });
 
   it('deletes server when clicking accept button', () => {
@@ -58,6 +61,6 @@ describe('<DeleteServerModal />', () => {
 
     expect(toggleMock).toHaveBeenCalledTimes(1);
     expect(deleteServerMock).toHaveBeenCalledTimes(1);
-    expect(push).toHaveBeenCalledTimes(1);
+    expect(navigate).toHaveBeenCalledTimes(1);
   });
 });

test/servers/EditServer.test.tsx

@@ -1,43 +1,34 @@
 import { mount, ReactWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
-import { History, Location } from 'history';
-import { match } from 'react-router'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { useNavigate } from 'react-router-dom';
 import { EditServer as editServerConstruct } from '../../src/servers/EditServer';
 import { ServerForm } from '../../src/servers/helpers/ServerForm';
 import { ReachableServer } from '../../src/servers/data';
 
+jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), useNavigate: jest.fn() }));
+
 describe('<EditServer />', () => {
   let wrapper: ReactWrapper;
   const ServerError = jest.fn();
   const editServerMock = jest.fn();
-  const goBack = jest.fn();
-  const historyMock = Mock.of<History>({ goBack });
-  const match = Mock.of<match<{ serverId: string }>>({
-    params: { serverId: 'abc123' },
-  });
+  const navigate = jest.fn();
   const selectedServer = Mock.of<ReachableServer>({
     id: 'abc123',
     name: 'name',
     url: 'url',
     apiKey: 'apiKey',
   });
+  const EditServer = editServerConstruct(ServerError);
 
   beforeEach(() => {
-    const EditServer = editServerConstruct(ServerError);
+    (useNavigate as any).mockReturnValue(navigate);
 
     wrapper = mount(
-      <EditServer
-        editServer={editServerMock}
-        history={historyMock}
-        match={match}
-        location={Mock.all<Location>()}
-        selectedServer={selectedServer}
-        selectServer={jest.fn()}
-      />,
+      <EditServer editServer={editServerMock} selectedServer={selectedServer} selectServer={jest.fn()} />,
     );
   });
 
-  afterEach(jest.resetAllMocks);
+  afterEach(jest.clearAllMocks);
   afterEach(() => wrapper?.unmount());
 
   it('renders components', () => {
@@ -50,6 +41,6 @@ describe('<EditServer />', () => {
     form.simulate('submit', {});
 
     expect(editServerMock).toHaveBeenCalledTimes(1);
-    expect(goBack).toHaveBeenCalledTimes(1);
+    expect(navigate).toHaveBeenCalledWith(-1);
   });
 });