Updated test libs

package.json

@@ -69,13 +69,13 @@
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
     "@babel/plugin-proposal-optional-chaining": "^7.13.8",
     "@shlinkio/eslint-config-js-coding-standard": "~1.2.2",
-    "@stryker-mutator/core": "^5.0.0",
+    "@stryker-mutator/core": "^5.4.1",
-    "@stryker-mutator/jest-runner": "^5.0.0",
+    "@stryker-mutator/jest-runner": "^5.4.1",
-    "@stryker-mutator/typescript-checker": "^5.0.0",
+    "@stryker-mutator/typescript-checker": "^5.4.1",
     "@svgr/webpack": "^5.5.0",
     "@types/classnames": "^2.2.11",
     "@types/enzyme": "^3.10.10",
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^27.0.2",
     "@types/leaflet": "^1.5.23",
     "@types/qs": "^6.9.5",
     "@types/ramda": "^0.27.38",
@@ -93,14 +93,14 @@
     "adm-zip": "^0.4.16",
     "autoprefixer": "^10.0.2",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^26.6.3",
+    "babel-jest": "^27.3.1",
     "babel-loader": "^8.2.1",
     "babel-plugin-named-asset-import": "^0.3.7",
     "babel-preset-react-app": "^10.0.0",
     "babel-runtime": "^6.26.0",
     "bfj": "^7.0.2",
     "case-sensitive-paths-webpack-plugin": "^2.3.0",
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.2",
     "css-loader": "^5.0.1",
     "dart-sass": "^1.25.0",
     "dotenv": "^8.2.0",
@@ -113,9 +113,9 @@
     "fs-extra": "^9.0.1",
     "html-webpack-plugin": "^4.5.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^26.6.3",
+    "jest": "^27.3.1",
     "jest-pnp-resolver": "^1.2.2",
-    "jest-resolve": "^26.6.2",
+    "jest-resolve": "^27.3.1",
     "mini-css-extract-plugin": "^1.3.1",
     "object-assign": "^4.1.1",
     "optimize-css-assets-webpack-plugin": "^5.0.4",
@@ -141,9 +141,9 @@
     "stylelint-scss": "^3.18.0",
     "sw-precache-webpack-plugin": "^1.0.0",
     "terser-webpack-plugin": "^4.2.3",
-    "ts-jest": "^26.5.2",
+    "ts-jest": "^27.0.7",
     "ts-mockery": "^1.2.0",
-    "typescript": "^4.2.2",
+    "typescript": "^4.4.4",
     "url-loader": "^4.1.1",
     "webpack": "^4.44.2",
     "webpack-dev-server": "^3.11.0",

src/servers/helpers/ImportServersBtn.tsx

@@ -5,6 +5,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import ServersImporter from '../services/ServersImporter';
 import { ServerData } from '../data';
 import './ImportServersBtn.scss';
+import { pipe } from 'ramda';
 
 type Ref<T> = RefObject<T> | MutableRefObject<T>;
 
@@ -32,8 +33,7 @@ const ImportServersBtn = ({ importServersFromFile }: ServersImporter): FC<Import
   const ref = fileRef ?? useRef<HTMLInputElement>();
   const onChange = async ({ target }: ChangeEvent<HTMLInputElement>) =>
     importServersFromFile(target.files?.[0])
-      .then(createServers)
+      .then(pipe(createServers, onImport))
-      .then(onImport)
       .then(() => {
         // Reset input after processing file
         (target as { value: string | null }).value = null;

test/servers/helpers/ImportServersBtn.test.tsx

@@ -9,9 +9,8 @@ describe('<ImportServersBtn />', () => {
   let wrapper: ShallowWrapper;
   const onImportMock = jest.fn();
   const createServersMock = jest.fn();
-  const serversImporterMock = Mock.of<ServersImporter>({
+  const importServersFromFile = jest.fn().mockResolvedValue([]);
-    importServersFromFile: jest.fn().mockResolvedValue([]),
+  const serversImporterMock = Mock.of<ServersImporter>({ importServersFromFile });
-  });
   const click = jest.fn();
   const fileRef = {
     current: Mock.of<HTMLInputElement>({ click }),
@@ -76,17 +75,14 @@ describe('<ImportServersBtn />', () => {
     expect(click).toHaveBeenCalledTimes(1);
   });
 
-  it('imports servers when file input changes', (done) => {
+  it('imports servers when file input changes', async () => {
     const wrapper = createWrapper();
     const file = wrapper.find('.import-servers-btn__csv-select');
 
-    file.simulate('change', { target: { files: [ '' ] } });
+    await file.simulate('change', { target: { files: [ '' ] } }); // eslint-disable-line @typescript-eslint/await-thenable
 
-    setImmediate(() => {
+    expect(importServersFromFile).toHaveBeenCalledTimes(1);
-      expect(serversImporterMock.importServersFromFile).toHaveBeenCalledTimes(1);
+    expect(createServersMock).toHaveBeenCalledTimes(1);
-      expect(createServersMock).toHaveBeenCalledTimes(1);
+    expect(onImportMock).toHaveBeenCalledTimes(1);
-      expect(onImportMock).toHaveBeenCalledTimes(1);
-      done();
-    });
   });
 });

test/servers/reducers/remoteServers.test.ts

@@ -4,7 +4,7 @@ import { fetchServers } from '../../../src/servers/reducers/remoteServers';
 import { CREATE_SERVERS } from '../../../src/servers/reducers/servers';
 
 describe('remoteServersReducer', () => {
-  afterEach(jest.resetAllMocks);
+  afterEach(jest.clearAllMocks);
 
   describe('fetchServers', () => {
     const get = jest.fn();
@@ -46,12 +46,12 @@ describe('remoteServersReducer', () => {
       ],
       [ Promise.resolve('<html></html>'), {}],
       [ Promise.reject({}), {}],
-    ])('tries to fetch servers from remote', async (mockedValue, expectedList) => {
+    ])('tries to fetch servers from remote', async (mockedValue, expectedNewServers) => {
-      get.mockReturnValue(mockedValue);
+      get.mockResolvedValue(mockedValue);
 
       await fetchServers(axios)()(dispatch);
 
-      expect(dispatch).toHaveBeenCalledWith({ type: CREATE_SERVERS, newServers: expectedList });
+      expect(dispatch).toHaveBeenCalledWith({ type: CREATE_SERVERS, newServers: expectedNewServers });
       expect(get).toHaveBeenCalledTimes(1);
     });
   });