From b4b0b22d66c3f5e54d483bf4239f55c927732ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadeusz=20Miesi=C4=85c?= <tadeusz.miesiac@gmail.com>
Date: Fri, 10 Nov 2023 12:43:58 +0100
Subject: [PATCH] test(map thunks): added missing test for retriving payloads
---
next.config.js | 6 -
src/constants/errors.ts | 1 +
src/redux/backgrounds/background.mock.ts | 60 ++++++++
src/redux/bioEntity/bioEntity.mock.ts | 8 +
src/redux/chemicals/chemicals.mock.ts | 8 +
src/redux/drugs/drugs.mock.ts | 8 +
src/redux/map/map.fixtures.ts | 10 +-
src/redux/map/map.thunks.test.ts | 179 +++++++++++------------
src/redux/map/map.thunks.ts | 2 +-
src/redux/mirnas/mirnas.mock.ts | 8 +
src/redux/models/models.mock.ts | 8 +
src/redux/overlays/overlays.mock.ts | 8 +
src/redux/project/project.mock.ts | 8 +
src/redux/root/root.fixtures.ts | 26 ++++
src/redux/search/search.mock.ts | 6 +
15 files changed, 245 insertions(+), 101 deletions(-)
create mode 100644 src/constants/errors.ts
create mode 100644 src/redux/backgrounds/background.mock.ts
create mode 100644 src/redux/bioEntity/bioEntity.mock.ts
create mode 100644 src/redux/chemicals/chemicals.mock.ts
create mode 100644 src/redux/drugs/drugs.mock.ts
create mode 100644 src/redux/mirnas/mirnas.mock.ts
create mode 100644 src/redux/models/models.mock.ts
create mode 100644 src/redux/overlays/overlays.mock.ts
create mode 100644 src/redux/project/project.mock.ts
create mode 100644 src/redux/root/root.fixtures.ts
create mode 100644 src/redux/search/search.mock.ts
diff --git a/next.config.js b/next.config.js
index 07a38178..eebeaf4d 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,11 +1,5 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
- eslint: {
- ignoreDuringBuilds: true,
- },
- typescript: {
- ignoreBuildErrors: true,
- },
reactStrictMode: true,
experimental: {
fontLoaders: [{ loader: '@next/font/google', options: { subsets: ['latin'] } }],
diff --git a/src/constants/errors.ts b/src/constants/errors.ts
new file mode 100644
index 00000000..887f64f3
--- /dev/null
+++ b/src/constants/errors.ts
@@ -0,0 +1 @@
+export const DEFAULT_ERROR: Error = { message: '', name: '' };
diff --git a/src/redux/backgrounds/background.mock.ts b/src/redux/backgrounds/background.mock.ts
new file mode 100644
index 00000000..515bb724
--- /dev/null
+++ b/src/redux/backgrounds/background.mock.ts
@@ -0,0 +1,60 @@
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { MapBackground } from '@/types/models';
+import { BackgroundsState } from './backgrounds.types';
+
+export const BACKGROUND_INITIAL_STATE_MOCK: BackgroundsState = {
+ data: undefined,
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+};
+
+export const BACKGROUNDS_MOCK: MapBackground[] = [
+ {
+ id: 13,
+ name: 'Pathways and compartments',
+ defaultOverlay: false,
+ project: {
+ projectId: 'pdmap_appu_test',
+ },
+ creator: {
+ login: 'admin',
+ },
+ status: 'NA',
+ progress: 0,
+ description: null,
+ order: 0,
+ images: [],
+ },
+ {
+ id: 14,
+ name: 'Network',
+ defaultOverlay: false,
+ project: {
+ projectId: 'pdmap_appu_test',
+ },
+ creator: {
+ login: 'admin',
+ },
+ status: 'NA',
+ progress: 0,
+ description: null,
+ order: 1,
+ images: [],
+ },
+ {
+ id: 15,
+ name: 'Empty',
+ defaultOverlay: false,
+ project: {
+ projectId: 'pdmap_appu_test',
+ },
+ creator: {
+ login: 'admin',
+ },
+ status: 'NA',
+ progress: 0,
+ description: null,
+ order: 2,
+ images: [],
+ },
+];
diff --git a/src/redux/bioEntity/bioEntity.mock.ts b/src/redux/bioEntity/bioEntity.mock.ts
new file mode 100644
index 00000000..3706162e
--- /dev/null
+++ b/src/redux/bioEntity/bioEntity.mock.ts
@@ -0,0 +1,8 @@
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { BioEntityContentsState } from './bioEntity.types';
+
+export const BIOENTITY_INITIAL_STATE_MOCK: BioEntityContentsState = {
+ data: undefined,
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+};
diff --git a/src/redux/chemicals/chemicals.mock.ts b/src/redux/chemicals/chemicals.mock.ts
new file mode 100644
index 00000000..3b492a2e
--- /dev/null
+++ b/src/redux/chemicals/chemicals.mock.ts
@@ -0,0 +1,8 @@
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { ChemicalsState } from './chemicals.types';
+
+export const CHEMICALS_INITIAL_STATE_MOCK: ChemicalsState = {
+ data: undefined,
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+};
diff --git a/src/redux/drugs/drugs.mock.ts b/src/redux/drugs/drugs.mock.ts
new file mode 100644
index 00000000..884c8de9
--- /dev/null
+++ b/src/redux/drugs/drugs.mock.ts
@@ -0,0 +1,8 @@
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { DrugsState } from './drugs.types';
+
+export const DRUGS_INITIAL_STATE_MOCK: DrugsState = {
+ data: undefined,
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+};
diff --git a/src/redux/map/map.fixtures.ts b/src/redux/map/map.fixtures.ts
index 28261172..5cb2f16f 100644
--- a/src/redux/map/map.fixtures.ts
+++ b/src/redux/map/map.fixtures.ts
@@ -1,4 +1,5 @@
-import { MapData, OppenedMap } from './map.types';
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { MapData, MapState, OppenedMap } from './map.types';
export const openedMapsInitialValueFixture: OppenedMap[] = [
{ modelId: 0, modelName: 'Main map', lastPosition: { x: 0, y: 0, z: 0 } },
@@ -32,3 +33,10 @@ export const initialMapDataFixture: MapData = {
maxZoom: 9,
},
};
+
+export const initialMapStateFixture: MapState = {
+ data: initialMapDataFixture,
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+ openedMaps: openedMapsInitialValueFixture,
+};
diff --git a/src/redux/map/map.thunks.test.ts b/src/redux/map/map.thunks.test.ts
index 39b347d2..69a2e9e1 100644
--- a/src/redux/map/map.thunks.test.ts
+++ b/src/redux/map/map.thunks.test.ts
@@ -1,20 +1,11 @@
-import { PROJECT_ID } from '@/constants';
-import { backgroundsFixture } from '@/models/fixtures/backgroundsFixture';
-import { modelsFixture } from '@/models/fixtures/modelsFixture';
-import { overlaysFixture } from '@/models/fixtures/overlaysFixture';
+import { MODELS_MOCK } from '@/models/mocks/modelsMock';
+/* eslint-disable no-magic-numbers */
import { QueryData } from '@/types/query';
-import { mockNetworkResponse } from '@/utils/mockNetworkResponse';
-import { getReduxWrapperWithStore } from '@/utils/testing/getReduxWrapperWithStore';
-import { HttpStatusCode } from 'axios';
-import { apiPath } from '../apiPath';
-import { backgroundsDataSelector } from '../backgrounds/background.selectors';
-import { modelsDataSelector } from '../models/models.selectors';
-import { overlaysDataSelector } from '../overlays/overlays.selectors';
-import { AppDispatch, StoreType } from '../store';
-import { initMapData } from './map.thunks';
-import { InitMapDataActionPayload } from './map.types';
-
-const mockedAxiosClient = mockNetworkResponse();
+import { BACKGROUNDS_MOCK, BACKGROUND_INITIAL_STATE_MOCK } from '../backgrounds/background.mock';
+import { RootState } from '../store';
+import { INITIAL_STORE_STATE_MOCK } from '../root/root.fixtures';
+import { MODELS_INITIAL_STATE_MOCK } from '../models/models.mock';
+import { getBackgroundId, getInitMapPosition, getInitMapSizeAndModelId } from './map.thunks';
const EMPTY_QUERY_DATA: QueryData = {
modelId: undefined,
@@ -22,96 +13,98 @@ const EMPTY_QUERY_DATA: QueryData = {
initialPosition: undefined,
};
-describe('map thunks', () => {
- describe('initMapData - thunk', () => {
- describe('when API is returning valid data', () => {
- let store = {} as StoreType;
- let payload = {} as InitMapDataActionPayload;
+const QUERY_DATA_WITH_BG: QueryData = {
+ modelId: undefined,
+ backgroundId: 21,
+ initialPosition: undefined,
+};
- beforeAll(async () => {
- mockedAxiosClient.resetHandlers();
- mockedAxiosClient.onGet(apiPath.getModelsString()).reply(HttpStatusCode.Ok, modelsFixture);
- mockedAxiosClient
- .onGet(apiPath.getAllOverlaysByProjectIdQuery(PROJECT_ID, { publicOverlay: true }))
- .reply(HttpStatusCode.Ok, overlaysFixture);
- mockedAxiosClient
- .onGet(apiPath.getAllBackgroundsByProjectIdQuery(PROJECT_ID))
- .reply(HttpStatusCode.Ok, backgroundsFixture);
+const QUERY_DATA_WITH_MODELID: QueryData = {
+ modelId: 5054,
+ backgroundId: undefined,
+ initialPosition: undefined,
+};
- store = getReduxWrapperWithStore().store;
- const dispatch = store.dispatch as AppDispatch;
- payload = (await dispatch(initMapData({ queryData: EMPTY_QUERY_DATA })))
- .payload as InitMapDataActionPayload;
- });
+const QUERY_DATA_WITH_POSITION: QueryData = {
+ modelId: undefined,
+ backgroundId: undefined,
+ initialPosition: {
+ x: 21,
+ y: 3,
+ z: 7,
+ },
+};
- it('should fetch backgrounds data in store', async () => {
- const data = backgroundsDataSelector(store.getState());
- expect(data).toEqual(backgroundsFixture);
- });
+const STATE_WITH_MODELS: RootState = {
+ ...INITIAL_STORE_STATE_MOCK,
+ models: { ...MODELS_INITIAL_STATE_MOCK, data: MODELS_MOCK },
+};
- it('should fetch overlays data in store', async () => {
- const data = overlaysDataSelector(store.getState());
- expect(data).toEqual(overlaysFixture);
- });
+describe('map thunks - utils', () => {
+ describe('getBackgroundId', () => {
+ it('should return backgroundId value from queryData', () => {
+ const backgroundId = getBackgroundId(INITIAL_STORE_STATE_MOCK, QUERY_DATA_WITH_BG);
+ expect(backgroundId).toBe(21);
+ });
+ it('should return main map background id if query param does not include background id', () => {
+ const store: RootState = {
+ ...INITIAL_STORE_STATE_MOCK,
+ backgrounds: { ...BACKGROUND_INITIAL_STATE_MOCK, data: BACKGROUNDS_MOCK },
+ };
+ const backgroundId = getBackgroundId(store, EMPTY_QUERY_DATA);
+
+ expect(backgroundId).toBe(13);
+ });
+ it('should return default value (0) if query data does not include backgroundId and could not find main background in the store', () => {
+ const backgroundId = getBackgroundId(INITIAL_STORE_STATE_MOCK, EMPTY_QUERY_DATA);
+
+ expect(backgroundId).toBe(0);
+ });
+ });
- it('should fetch models data in store', async () => {
- const data = modelsDataSelector(store.getState());
- expect(data).toEqual(modelsFixture);
+ describe('getInitMapPosition', () => {
+ it('should return valid map position from query params ', () => {
+ const position = getInitMapPosition(STATE_WITH_MODELS, QUERY_DATA_WITH_POSITION);
+ expect(position).toEqual({
+ initial: { x: 21, y: 3, z: 7 },
+ last: { x: 21, y: 3, z: 7 },
});
+ });
- it('should return valid payload', () => {
- const FIRST = 0;
- expect(payload).toMatchObject({
- data: {
- modelId: modelsFixture[FIRST].idObject,
- backgroundId: backgroundsFixture[FIRST].id,
- size: {
- width: 66.1207745783031,
- height: -54.25165700726211,
- tileSize: 85.73858779855072,
- minZoom: 19.16961562819779,
- maxZoom: 78.78634324297309,
- },
- position: {
- initial: { x: -47.612417908385396, y: -27.125828503631055, z: -97.42596028372645 },
- last: { x: -47.612417908385396, y: -27.125828503631055, z: -97.42596028372645 },
- },
- },
- openedMaps: [
- {
- modelId: 63.59699326567352,
- modelName: 'Main map',
- lastPosition: { x: 0, y: 0, z: 0 },
- },
- ],
- });
+ it('should return valid map position if query params do not include position', () => {
+ const position = getInitMapPosition(STATE_WITH_MODELS, EMPTY_QUERY_DATA);
+ expect(position).toEqual({
+ initial: { x: 13389.625, y: 6751.5, z: 5 },
+ last: { x: 13389.625, y: 6751.5, z: 5 },
});
});
+ it('should return default map position', () => {
+ const position = getInitMapPosition(INITIAL_STORE_STATE_MOCK, EMPTY_QUERY_DATA);
- describe('when API is returning empty array', () => {
- let store = {} as StoreType;
- let payload = {} as InitMapDataActionPayload;
+ expect(position).toEqual({ initial: { x: 0, y: 0, z: 0 }, last: { x: 0, y: 0, z: 0 } });
+ });
+ });
- beforeEach(async () => {
- mockedAxiosClient.onGet(apiPath.getModelsString()).reply(HttpStatusCode.Ok, []);
- mockedAxiosClient
- .onGet(apiPath.getAllOverlaysByProjectIdQuery(PROJECT_ID, { publicOverlay: true }))
- .reply(HttpStatusCode.Ok, []);
- mockedAxiosClient
- .onGet(apiPath.getAllBackgroundsByProjectIdQuery(PROJECT_ID))
- .reply(HttpStatusCode.Ok, []);
+ describe('getInitMapSizeAndModelId', () => {
+ it('should return correct mapsize and modelid when modelId is provided in queryData', () => {
+ const payload = getInitMapSizeAndModelId(STATE_WITH_MODELS, QUERY_DATA_WITH_MODELID);
- store = getReduxWrapperWithStore().store;
- const dispatch = store.dispatch as AppDispatch;
- payload = (await dispatch(initMapData({ queryData: EMPTY_QUERY_DATA })))
- .payload as InitMapDataActionPayload;
+ expect(payload).toEqual({
+ modelId: 5054,
+ size: { height: 1171.9429798877356, maxZoom: 5, minZoom: 2, tileSize: 256, width: 1652.75 },
});
-
- it('should return empty values for data and openedMaps in payload', () => {
- expect(payload).toStrictEqual({
- data: {},
- openedMaps: [{ modelId: 0, modelName: 'Main map', lastPosition: { x: 0, y: 0, z: 0 } }],
- });
+ });
+ it('should return correct mapsize and modelId if query params do not include modelId', () => {
+ const payload = getInitMapSizeAndModelId(STATE_WITH_MODELS, EMPTY_QUERY_DATA);
+ expect(payload).toEqual({
+ modelId: 5053,
+ size: {
+ height: 13503,
+ maxZoom: 9,
+ minZoom: 2,
+ tileSize: 256,
+ width: 26779.25,
+ },
});
});
});
diff --git a/src/redux/map/map.thunks.ts b/src/redux/map/map.thunks.ts
index 2a3b7b51..f2ea946b 100644
--- a/src/redux/map/map.thunks.ts
+++ b/src/redux/map/map.thunks.ts
@@ -31,7 +31,7 @@ import { DEFAULT_POSITION, MAIN_MAP } from './map.constants';
export const getBackgroundId = (state: RootState, queryData: QueryData): number => {
const mainMapBackground = mainBackgroundsDataSelector(state);
- const backgroundId = queryData?.backgroundId || mainMapBackground.id || ZERO;
+ const backgroundId = queryData?.backgroundId || mainMapBackground?.id || ZERO;
return backgroundId;
};
diff --git a/src/redux/mirnas/mirnas.mock.ts b/src/redux/mirnas/mirnas.mock.ts
new file mode 100644
index 00000000..233c3558
--- /dev/null
+++ b/src/redux/mirnas/mirnas.mock.ts
@@ -0,0 +1,8 @@
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { MirnasState } from './mirnas.types';
+
+export const MIRNAS_INITIAL_STATE_MOCK: MirnasState = {
+ data: undefined,
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+};
diff --git a/src/redux/models/models.mock.ts b/src/redux/models/models.mock.ts
new file mode 100644
index 00000000..e45763d8
--- /dev/null
+++ b/src/redux/models/models.mock.ts
@@ -0,0 +1,8 @@
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { ModelsState } from './models.types';
+
+export const MODELS_INITIAL_STATE_MOCK: ModelsState = {
+ data: [],
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+};
diff --git a/src/redux/overlays/overlays.mock.ts b/src/redux/overlays/overlays.mock.ts
new file mode 100644
index 00000000..1a8037b6
--- /dev/null
+++ b/src/redux/overlays/overlays.mock.ts
@@ -0,0 +1,8 @@
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { OverlaysState } from './overlays.types';
+
+export const OVERLAYS_INITIAL_STATE_MOCK: OverlaysState = {
+ data: [],
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+};
diff --git a/src/redux/project/project.mock.ts b/src/redux/project/project.mock.ts
new file mode 100644
index 00000000..036d2634
--- /dev/null
+++ b/src/redux/project/project.mock.ts
@@ -0,0 +1,8 @@
+import { DEFAULT_ERROR } from '@/constants/errors';
+import { ProjectState } from './project.types';
+
+export const PROJECT_STATE_INITIAL_MOCK: ProjectState = {
+ data: undefined,
+ loading: 'idle',
+ error: DEFAULT_ERROR,
+};
diff --git a/src/redux/root/root.fixtures.ts b/src/redux/root/root.fixtures.ts
new file mode 100644
index 00000000..7bd6e11e
--- /dev/null
+++ b/src/redux/root/root.fixtures.ts
@@ -0,0 +1,26 @@
+import { BACKGROUND_INITIAL_STATE_MOCK } from '../backgrounds/background.mock';
+import { BIOENTITY_INITIAL_STATE_MOCK } from '../bioEntity/bioEntity.mock';
+import { CHEMICALS_INITIAL_STATE_MOCK } from '../chemicals/chemicals.mock';
+import { initialStateFixture as drawerInitialStateMock } from '../drawer/drawerFixture';
+import { DRUGS_INITIAL_STATE_MOCK } from '../drugs/drugs.mock';
+import { initialMapStateFixture } from '../map/map.fixtures';
+import { MIRNAS_INITIAL_STATE_MOCK } from '../mirnas/mirnas.mock';
+import { MODELS_INITIAL_STATE_MOCK } from '../models/models.mock';
+import { OVERLAYS_INITIAL_STATE_MOCK } from '../overlays/overlays.mock';
+import { PROJECT_STATE_INITIAL_MOCK } from '../project/project.mock';
+import { SEARCH_STATE_INITIAL_MOCK } from '../search/search.mock';
+import { RootState } from '../store';
+
+export const INITIAL_STORE_STATE_MOCK: RootState = {
+ search: SEARCH_STATE_INITIAL_MOCK,
+ project: PROJECT_STATE_INITIAL_MOCK,
+ drugs: DRUGS_INITIAL_STATE_MOCK,
+ mirnas: MIRNAS_INITIAL_STATE_MOCK,
+ chemicals: CHEMICALS_INITIAL_STATE_MOCK,
+ models: MODELS_INITIAL_STATE_MOCK,
+ bioEntity: BIOENTITY_INITIAL_STATE_MOCK,
+ backgrounds: BACKGROUND_INITIAL_STATE_MOCK,
+ drawer: drawerInitialStateMock,
+ map: initialMapStateFixture,
+ overlays: OVERLAYS_INITIAL_STATE_MOCK,
+};
diff --git a/src/redux/search/search.mock.ts b/src/redux/search/search.mock.ts
new file mode 100644
index 00000000..83aa9e6c
--- /dev/null
+++ b/src/redux/search/search.mock.ts
@@ -0,0 +1,6 @@
+import { SearchState } from './search.types';
+
+export const SEARCH_STATE_INITIAL_MOCK: SearchState = {
+ searchValue: '',
+ loading: 'idle',
+};
--
GitLab