diff --git a/src/client/App.test.tsx b/src/client/App.test.tsx index 1009a64dbb..ae91a2ea38 100644 --- a/src/client/App.test.tsx +++ b/src/client/App.test.tsx @@ -2,7 +2,7 @@ import { render, waitFor } from '@testing-library/react'; import { vi, describe, it, expect } from 'vitest'; import App from './App'; -import { bffApi } from '../test-utils'; +import { bffApi } from '../testing/utils'; const mocks = vi.hoisted(() => { return { diff --git a/src/client/App.tsx b/src/client/App.tsx index 88c2b9e57b..9d263d8d7d 100644 --- a/src/client/App.tsx +++ b/src/client/App.tsx @@ -87,7 +87,7 @@ import ZaakStatus from './pages/ZaakStatus/ZaakStatus'; import ZorgThemaPagina from './pages/Zorg/Zorg'; import ZorgVoorzieningen from './pages/Zorg/ZorgRegelingen'; import ZorgDetail from './pages/ZorgDetail/ZorgDetail'; -import { useMonitoring } from './utils/monitoring'; +import { useMonitoring } from './helpers/monitoring'; function AppNotAuthenticated() { useSetDeeplinkEntry(['sso', 'authMethod']); diff --git a/src/client/components/DocumentList/DocumentLink.tsx b/src/client/components/DocumentList/DocumentLink.tsx index 71fe462381..27bbfd4c2c 100644 --- a/src/client/components/DocumentList/DocumentLink.tsx +++ b/src/client/components/DocumentList/DocumentLink.tsx @@ -10,7 +10,7 @@ import { IconAlert, IconDownload } from '../../assets/icons'; import { trackDownload } from '../../hooks/analytics.hook'; import { useProfileTypeValue } from '../../hooks/useProfileType'; import { useUserCity } from '../../hooks/useUserCity'; -import { captureException } from '../../utils/monitoring'; +import { captureException } from '../../helpers/monitoring'; import { MaLink } from '../MaLink/MaLink'; import { Spinner } from '../Spinner/Spinner'; diff --git a/src/client/components/DocumentList/DocumentList.test.tsx b/src/client/components/DocumentList/DocumentList.test.tsx index 3b0ed66171..23a9b483cb 100644 --- a/src/client/components/DocumentList/DocumentList.test.tsx +++ b/src/client/components/DocumentList/DocumentList.test.tsx @@ -8,7 +8,7 @@ import DocumentList from './DocumentList'; import { GenericDocument } from '../../../universal/types/App.types'; import * as analytics from '../../hooks/analytics.hook'; import { trackDownload } from '../../hooks/analytics.hook'; -import * as Monitoring from '../../utils/monitoring'; +import * as Monitoring from '../../helpers/monitoring'; vi.mock('../../hooks/analytics.hook'); diff --git a/src/client/components/DocumentList/DocumentListV2.test.tsx b/src/client/components/DocumentList/DocumentListV2.test.tsx index 6b9f2ed3c4..95db760d7a 100644 --- a/src/client/components/DocumentList/DocumentListV2.test.tsx +++ b/src/client/components/DocumentList/DocumentListV2.test.tsx @@ -8,7 +8,7 @@ import DocumentListV2 from './DocumentListV2'; import { GenericDocument } from '../../../universal/types/App.types'; import * as analytics from '../../hooks/analytics.hook'; import { trackDownload } from '../../hooks/analytics.hook'; -import * as Monitoring from '../../utils/monitoring'; +import * as Monitoring from '../../helpers/monitoring'; vi.mock('../../hooks/analytics.hook'); diff --git a/src/client/components/MainFooter/MainFooter.test.tsx b/src/client/components/MainFooter/MainFooter.test.tsx index cb32d5f590..9cb604b29a 100644 --- a/src/client/components/MainFooter/MainFooter.test.tsx +++ b/src/client/components/MainFooter/MainFooter.test.tsx @@ -5,7 +5,7 @@ import { describe, expect, it, vi } from 'vitest'; import footer from './amsterdam-nl-footer-data.json'; import MainFooter from './MainFooter'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { AppRoutes } from '../../../universal/config/routes'; import { appStateAtom } from '../../hooks/useAppState'; import MockApp from '../../pages/MockApp'; diff --git a/src/client/components/MyArea/MyArea.hooks.test.ts b/src/client/components/MyArea/MyArea.hooks.test.ts index 89c71e7986..c27794218c 100644 --- a/src/client/components/MyArea/MyArea.hooks.test.ts +++ b/src/client/components/MyArea/MyArea.hooks.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, test, vi } from 'vitest'; import { useMapLocations, useSetMapCenterAtLocation } from './MyArea.hooks'; import { appStateAtom } from '../../hooks/useAppState'; -import { renderRecoilHook } from '../../utils/renderRecoilHook'; +import { renderRecoilHook } from '../../../testing/render-recoil.hook'; const mapInstanceMock = { setView: vi.fn(), diff --git a/src/client/components/MyArea/MyArea.hooks.ts b/src/client/components/MyArea/MyArea.hooks.ts index 5ac479ee9b..07ddb6cb94 100644 --- a/src/client/components/MyArea/MyArea.hooks.ts +++ b/src/client/components/MyArea/MyArea.hooks.ts @@ -34,7 +34,7 @@ import { getFullAddress } from '../../../universal/helpers/brp'; import { BFFApiUrls } from '../../config/api'; import { DEFAULT_MAP_OPTIONS } from '../../config/map'; import { useAppStateGetter, useAppStateReady } from '../../hooks/useAppState'; -import { captureMessage } from '../../utils/monitoring'; +import { captureMessage } from '../../helpers/monitoring'; const NO_DATA_ERROR_RESPONSE = { errors: [ diff --git a/src/client/components/MyNotifications/Notification.tsx b/src/client/components/MyNotifications/Notification.tsx index fff3ce63a4..409eeee227 100644 --- a/src/client/components/MyNotifications/Notification.tsx +++ b/src/client/components/MyNotifications/Notification.tsx @@ -17,8 +17,8 @@ import { ThemaTitles } from '../../config/thema'; import { trackItemClick } from '../../hooks/analytics.hook'; import { useContentDimensions } from '../../hooks/useContentDimensions'; import { useProfileTypeValue } from '../../hooks/useProfileType'; -import { trackEvent } from '../../utils/monitoring'; -import { isInteralUrl } from '../../utils/utils'; +import { trackEvent } from '../../helpers/monitoring'; +import { isInteralUrl } from '../../helpers/utils'; import Linkd from '../Button/Button'; import { DocumentLink } from '../DocumentList/DocumentLink'; import ThemaIcon from '../ThemaIcon/ThemaIcon'; diff --git a/src/client/components/Search/Search.test.tsx b/src/client/components/Search/Search.test.tsx index 78c10f6aa1..62b355a50d 100644 --- a/src/client/components/Search/Search.test.tsx +++ b/src/client/components/Search/Search.test.tsx @@ -8,7 +8,7 @@ import { afterEach, beforeEach, describe, expect, test } from 'vitest'; import * as bagResponse from './bag-response.json'; import { Search } from './Search'; import * as remoteConfig from './search-config.json'; -import { bffApi, remoteApi } from '../../../test-utils'; +import { bffApi, remoteApi } from '../../../testing/utils'; import { appStateAtom } from '../../hooks/useAppState'; describe('', () => { diff --git a/src/client/components/Search/useSearch.test.tsx b/src/client/components/Search/useSearch.test.tsx index c5f11a8da5..133e82b0e9 100644 --- a/src/client/components/Search/useSearch.test.tsx +++ b/src/client/components/Search/useSearch.test.tsx @@ -19,7 +19,7 @@ import { useSearchIndex, } from './useSearch'; import type { Vergunning } from '../../../server/services'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { AppRoutes } from '../../../universal/config/routes'; import { AppState } from '../../../universal/types/App.types'; import { appStateAtom } from '../../hooks/useAppState'; diff --git a/src/client/components/SectionCollapsible/SectionCollapsible.tsx b/src/client/components/SectionCollapsible/SectionCollapsible.tsx index e8d66eaa18..388726fac7 100644 --- a/src/client/components/SectionCollapsible/SectionCollapsible.tsx +++ b/src/client/components/SectionCollapsible/SectionCollapsible.tsx @@ -10,7 +10,7 @@ import { ComponentChildren } from '../../../universal/types'; import { IconChevronRight } from '../../assets/icons'; import { useSessionStorage } from '../../hooks/storage.hook'; import { useContentDimensions } from '../../hooks/useContentDimensions'; -import { withKeyPress } from '../../utils/utils'; +import { withKeyPress } from '../../helpers/utils'; import LoadingContent from '../LoadingContent/LoadingContent'; export interface SectionCollapsibleProps { diff --git a/src/client/data-transform/appState.test.tsx b/src/client/data-transform/appState.test.tsx index bb8ade7637..ed0a2663a6 100644 --- a/src/client/data-transform/appState.test.tsx +++ b/src/client/data-transform/appState.test.tsx @@ -1,7 +1,7 @@ import { AppState } from '../../universal/types/App.types'; import { PRISTINE_APPSTATE, createAllErrorState } from '../AppState'; import { transformSourceData } from './appState'; -import * as Monitoring from '../utils/monitoring'; +import * as Monitoring from '../helpers/monitoring'; describe('transformSourceData', () => { test('transformSourceData', () => { diff --git a/src/client/data-transform/appState.tsx b/src/client/data-transform/appState.tsx index 4c154af6e8..519ce89cd2 100644 --- a/src/client/data-transform/appState.tsx +++ b/src/client/data-transform/appState.tsx @@ -1,6 +1,6 @@ import { AppState } from '../../universal/types/App.types'; import { createAllErrorState, PRISTINE_APPSTATE } from '../AppState'; -import { captureMessage } from '../utils/monitoring'; +import { captureMessage } from '../helpers/monitoring'; export function transformSourceData(data: Partial | null) { // Copy the pristine content to the error content so we keep our diff --git a/src/client/utils/monitoring.ts b/src/client/helpers/monitoring.ts similarity index 100% rename from src/client/utils/monitoring.ts rename to src/client/helpers/monitoring.ts diff --git a/src/client/config/themas.ts b/src/client/helpers/themas.ts similarity index 99% rename from src/client/config/themas.ts rename to src/client/helpers/themas.ts index 66b7a6a270..190a536a74 100644 --- a/src/client/config/themas.ts +++ b/src/client/helpers/themas.ts @@ -1,10 +1,10 @@ -import { ThemaMenuItem } from './thema'; import { FeatureToggle } from '../../universal/config/feature-toggles'; import { Themas } from '../../universal/config/thema'; import { isLoading } from '../../universal/helpers/api'; import { isMokum } from '../../universal/helpers/brp'; import { AppState, AppStateKey } from '../../universal/types/App.types'; import { DecosCaseType } from '../../universal/types/vergunningen'; +import { ThemaMenuItem } from '../config/thema'; import { PARKEER_CASE_TYPES } from '../pages/Parkeren/useParkerenData.hook'; export function isThemaActive(item: ThemaMenuItem, appState: AppState) { diff --git a/src/client/utils/utils.test.ts b/src/client/helpers/utils.test.ts similarity index 100% rename from src/client/utils/utils.test.ts rename to src/client/helpers/utils.test.ts diff --git a/src/client/utils/utils.ts b/src/client/helpers/utils.ts similarity index 100% rename from src/client/utils/utils.ts rename to src/client/helpers/utils.ts diff --git a/src/client/hooks/api/useDataApi.test.tsx b/src/client/hooks/api/useDataApi.test.tsx index 8a8b6f43d6..75ebc5cb96 100644 --- a/src/client/hooks/api/useDataApi.test.tsx +++ b/src/client/hooks/api/useDataApi.test.tsx @@ -2,8 +2,8 @@ import { act, renderHook, waitFor } from '@testing-library/react'; import { describe, expect, it } from 'vitest'; import { getDefaultState, useDataApi } from './useDataApi'; -import { bffApiHost } from '../../../setupTests'; -import { bffApi } from '../../../test-utils'; +import { bffApiHost } from '../../../testing/setup'; +import { bffApi } from '../../../testing/utils'; interface ResponseData { foo: string; diff --git a/src/client/hooks/api/useDataApi.ts b/src/client/hooks/api/useDataApi.ts index 707012bf3f..4ab3f18a8c 100644 --- a/src/client/hooks/api/useDataApi.ts +++ b/src/client/hooks/api/useDataApi.ts @@ -4,7 +4,7 @@ import axios, { AxiosRequestConfig, AxiosResponseTransformer } from 'axios'; import { apiErrorResult } from '../../../universal/helpers/api'; import { Action } from '../../../universal/types'; -import { captureException } from '../../utils/monitoring'; +import { captureException } from '../../helpers/monitoring'; export interface ApiRequestOptions extends AxiosRequestConfig { postpone?: boolean; diff --git a/src/client/hooks/storage.hook.ts b/src/client/hooks/storage.hook.ts index 76b7bb6c3d..af0b02ae32 100644 --- a/src/client/hooks/storage.hook.ts +++ b/src/client/hooks/storage.hook.ts @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react'; import { Unshaped } from '../../universal/types'; -import { captureException } from '../utils/monitoring'; +import { captureException } from '../helpers/monitoring'; interface LocalStorageHandler { value: string | null; diff --git a/src/client/hooks/useAppState.test.tsx b/src/client/hooks/useAppState.test.tsx index 9fdae9ff52..d4d0d96d74 100644 --- a/src/client/hooks/useAppState.test.tsx +++ b/src/client/hooks/useAppState.test.tsx @@ -25,8 +25,8 @@ import { apiSuccessResult, } from '../../universal/helpers/api'; import * as appStateModule from '../AppState'; -import * as Monitoring from '../utils/monitoring'; -import { renderRecoilHook } from '../utils/renderRecoilHook'; +import * as Monitoring from '../helpers/monitoring'; +import { renderRecoilHook } from '../../testing/render-recoil.hook'; vi.mock('./api/useTipsApi'); vi.mock('./useProfileType'); diff --git a/src/client/hooks/useAppState.ts b/src/client/hooks/useAppState.ts index 4f568d02e7..82b16ce320 100644 --- a/src/client/hooks/useAppState.ts +++ b/src/client/hooks/useAppState.ts @@ -17,7 +17,7 @@ import { import { PRISTINE_APPSTATE, createAllErrorState } from '../AppState'; import { BFFApiUrls } from '../config/api'; import { transformSourceData } from '../data-transform/appState'; -import { captureMessage } from '../utils/monitoring'; +import { captureMessage } from '../helpers/monitoring'; import { useDataApi } from './api/useDataApi'; import { useProfileTypeValue } from './useProfileType'; import { SSE_ERROR_MESSAGE, useSSE } from './useSSE'; diff --git a/src/client/hooks/usePageChange.ts b/src/client/hooks/usePageChange.ts index cc7ff09b51..27f514136e 100644 --- a/src/client/hooks/usePageChange.ts +++ b/src/client/hooks/usePageChange.ts @@ -14,7 +14,7 @@ import { NOT_FOUND_TITLE, PageTitleMain, } from '../config/thema'; -import { captureMessage } from '../utils/monitoring'; +import { captureMessage } from '../helpers/monitoring'; const sortedPageTitleRoutes = Object.keys(DocumentTitles).sort((a, b) => { if (a.length === b.length) { diff --git a/src/client/hooks/useThemaMenuItems.test.tsx b/src/client/hooks/useThemaMenuItems.test.tsx index 2bce294a58..9adc6cd22e 100644 --- a/src/client/hooks/useThemaMenuItems.test.tsx +++ b/src/client/hooks/useThemaMenuItems.test.tsx @@ -1,6 +1,6 @@ import { Themas } from '../../universal/config/thema'; import { ThemaMenuItem, ThemaTitles } from '../config/thema'; -import { getThemaMenuItemsAppState, isThemaActive } from '../config/themas'; +import { getThemaMenuItemsAppState, isThemaActive } from '../helpers/themas'; describe('useThemaMenuItems', () => { test('Parkeren is not active without an Appstate entry.', () => { diff --git a/src/client/hooks/useThemaMenuItems.ts b/src/client/hooks/useThemaMenuItems.ts index 53a645e1de..83093cf5b3 100644 --- a/src/client/hooks/useThemaMenuItems.ts +++ b/src/client/hooks/useThemaMenuItems.ts @@ -5,7 +5,7 @@ import { useProfileTypeValue } from './useProfileType'; import { ApiResponse, isError, isLoading } from '../../universal/helpers/api'; import { themasByProfileType } from '../config/menuItems'; import { ThemaMenuItem } from '../config/thema'; -import { getThemaMenuItemsAppState, isThemaActive } from '../config/themas'; +import { getThemaMenuItemsAppState, isThemaActive } from '../helpers/themas'; export interface ThemasState { items: ThemaMenuItem[]; diff --git a/src/client/hooks/useTrackThemas.hook.test.tsx b/src/client/hooks/useTrackThemas.hook.test.tsx index 17ce869b63..5f181b8672 100644 --- a/src/client/hooks/useTrackThemas.hook.test.tsx +++ b/src/client/hooks/useTrackThemas.hook.test.tsx @@ -6,9 +6,9 @@ import { MutableSnapshot, RecoilRoot } from 'recoil'; import { appStateAtom } from './useAppState'; import { useTrackThemas } from './useTrackThemas.hook'; import { AppState } from '../../universal/types'; -import { trackEvent } from '../utils/monitoring'; +import { trackEvent } from '../helpers/monitoring'; -vi.mock('../utils/monitoring', () => ({ +vi.mock('../helpers/monitoring', () => ({ trackEvent: vi.fn(), })); diff --git a/src/client/hooks/useTrackThemas.hook.ts b/src/client/hooks/useTrackThemas.hook.ts index 1a84862bff..fc088f0bb9 100644 --- a/src/client/hooks/useTrackThemas.hook.ts +++ b/src/client/hooks/useTrackThemas.hook.ts @@ -3,7 +3,7 @@ import { useEffect } from 'react'; import { useSessionStorage } from './storage.hook'; import { useAppStateGetter } from './useAppState'; import { useThemaMenuItems } from './useThemaMenuItems'; -import { trackEvent } from '../utils/monitoring'; +import { trackEvent } from '../helpers/monitoring'; type ThemaTitleAndId = Record<'title' | 'id', string>; diff --git a/src/client/hooks/useUsabilla.ts b/src/client/hooks/useUsabilla.ts index 54926bd51b..bfb70e3735 100644 --- a/src/client/hooks/useUsabilla.ts +++ b/src/client/hooks/useUsabilla.ts @@ -3,7 +3,7 @@ import { useEffect } from 'react'; import { usePhoneScreen } from './media.hook'; import { useScript } from './useScript'; import { IS_AP } from '../../universal/config/env'; -import { captureException } from '../utils/monitoring'; +import { captureException } from '../helpers/monitoring'; const MAX_WAIT_FOR_USABILA_LIVE_MS = 5000; // 5 seconds const USABILLA_ID_MOBILE = '9fd5da44aa5b'; diff --git a/src/client/pages/Afis/Afis.test.tsx b/src/client/pages/Afis/Afis.test.tsx index 4098a97269..a2708c192a 100644 --- a/src/client/pages/Afis/Afis.test.tsx +++ b/src/client/pages/Afis/Afis.test.tsx @@ -6,7 +6,7 @@ import { AfisBusinessPartnerDetailsTransformed, AfisFacturenByStateResponse, } from '../../../server/services/afis/afis-types'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { AppRoutes } from '../../../universal/config/routes'; import { AppState } from '../../../universal/types'; import { appStateAtom } from '../../hooks/useAppState'; diff --git a/src/client/pages/Afis/AfisBetaalVoorkeuren.test.tsx b/src/client/pages/Afis/AfisBetaalVoorkeuren.test.tsx index 5b45d92acd..e903a6ae00 100644 --- a/src/client/pages/Afis/AfisBetaalVoorkeuren.test.tsx +++ b/src/client/pages/Afis/AfisBetaalVoorkeuren.test.tsx @@ -4,7 +4,7 @@ import { generatePath } from 'react-router-dom'; import { MutableSnapshot } from 'recoil'; import { AfisBusinessPartnerDetailsTransformed } from '../../../server/services/afis/afis-types'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { AppRoutes } from '../../../universal/config/routes'; import { AppState } from '../../../universal/types'; import { appStateAtom } from '../../hooks/useAppState'; diff --git a/src/client/pages/Afis/AfisFacturen.test.tsx b/src/client/pages/Afis/AfisFacturen.test.tsx index 48c2234711..7855f6f252 100644 --- a/src/client/pages/Afis/AfisFacturen.test.tsx +++ b/src/client/pages/Afis/AfisFacturen.test.tsx @@ -2,7 +2,7 @@ import { render, waitFor } from '@testing-library/react'; import { generatePath } from 'react-router-dom'; import { MutableSnapshot } from 'recoil'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { AppRoutes } from '../../../universal/config/routes'; import { AppState } from '../../../universal/types'; import { appStateAtom } from '../../hooks/useAppState'; diff --git a/src/client/pages/Dashboard/Dashboard.test.tsx b/src/client/pages/Dashboard/Dashboard.test.tsx index 6883f8a663..831a18ed2e 100644 --- a/src/client/pages/Dashboard/Dashboard.test.tsx +++ b/src/client/pages/Dashboard/Dashboard.test.tsx @@ -9,7 +9,7 @@ import { AppState } from '../../../universal/types/App.types'; import { appStateAtom } from '../../hooks/useAppState'; import MockApp from '../MockApp'; import Dashboard from './Dashboard'; -import { remoteApiHost } from '../../../setupTests'; +import { remoteApiHost } from '../../../testing/setup'; const testState: any = { BRP: { diff --git a/src/client/pages/Erfpacht/DossierDetail/DossierDetail.test.tsx b/src/client/pages/Erfpacht/DossierDetail/DossierDetail.test.tsx index a823c4ca34..d3ac6425e3 100644 --- a/src/client/pages/Erfpacht/DossierDetail/DossierDetail.test.tsx +++ b/src/client/pages/Erfpacht/DossierDetail/DossierDetail.test.tsx @@ -10,7 +10,7 @@ import { transformDossierResponse, transformErfpachtDossierProperties, } from '../../../../server/services/simple-connect/erfpacht'; -import { bffApi } from '../../../../test-utils'; +import { bffApi } from '../../../../testing/utils'; import { AppRoutes } from '../../../../universal/config/routes'; import { jsonCopy } from '../../../../universal/helpers/utils'; import { AppState } from '../../../../universal/types/App.types'; diff --git a/src/client/pages/Erfpacht/ErfpachtFacturen.test.tsx b/src/client/pages/Erfpacht/ErfpachtFacturen.test.tsx index 79d47cbb73..531ff51dbb 100644 --- a/src/client/pages/Erfpacht/ErfpachtFacturen.test.tsx +++ b/src/client/pages/Erfpacht/ErfpachtFacturen.test.tsx @@ -10,7 +10,7 @@ import { transformDossierResponse, transformErfpachtDossierProperties, } from '../../../server/services/simple-connect/erfpacht'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { AppRoutes } from '../../../universal/config/routes'; import { AppState } from '../../../universal/types/App.types'; import { appStateAtom } from '../../hooks/useAppState'; diff --git a/src/client/pages/Landing/Landing.test.tsx b/src/client/pages/Landing/Landing.test.tsx index 8865a85633..4eccf84a58 100644 --- a/src/client/pages/Landing/Landing.test.tsx +++ b/src/client/pages/Landing/Landing.test.tsx @@ -3,7 +3,7 @@ import { RecoilRoot } from 'recoil'; import { describe, expect, it } from 'vitest'; import Landing from './Landing'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { SessionState, sessionAtom } from '../../hooks/api/useSessionApi'; const appState = { isAuthenticated: false } as SessionState; diff --git a/src/client/pages/NotFound/NotFound.tsx b/src/client/pages/NotFound/NotFound.tsx index 7b09bca6f5..cd55586b96 100644 --- a/src/client/pages/NotFound/NotFound.tsx +++ b/src/client/pages/NotFound/NotFound.tsx @@ -3,7 +3,7 @@ import { useEffect } from 'react'; import { useLocation } from 'react-router-dom'; import { PageContent, PageHeading, TextPage } from '../../components'; -import { captureMessage } from '../../utils/monitoring'; +import { captureMessage } from '../../helpers/monitoring'; export default function NotFound() { const location = useLocation(); diff --git a/src/client/pages/Search/Search.test.tsx b/src/client/pages/Search/Search.test.tsx index ad3a599eae..5d1a1f585f 100644 --- a/src/client/pages/Search/Search.test.tsx +++ b/src/client/pages/Search/Search.test.tsx @@ -4,7 +4,7 @@ import { MutableSnapshot } from 'recoil'; import { beforeAll, describe, it } from 'vitest'; import Search from './Search'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { AppRoutes } from '../../../universal/config/routes'; import { appStateAtom } from '../../hooks/useAppState'; import MockApp from '../../pages/MockApp'; diff --git a/src/client/pages/StatusDetail/StatusDetail.tsx b/src/client/pages/StatusDetail/StatusDetail.tsx index 8eb49b7f1e..7d5c8b8fe1 100644 --- a/src/client/pages/StatusDetail/StatusDetail.tsx +++ b/src/client/pages/StatusDetail/StatusDetail.tsx @@ -30,7 +30,7 @@ import { import { LinkdInline } from '../../components/Button/Button'; import { ThemaTitles } from '../../config/thema'; import { useAppStateGetter } from '../../hooks/useAppState'; -import { captureMessage } from '../../utils/monitoring'; +import { captureMessage } from '../../helpers/monitoring'; export type StatusSourceItem = StatusLine; diff --git a/src/client/pages/ToeristischeVerhuur/ToeristischeVerhuurDetail.test.tsx b/src/client/pages/ToeristischeVerhuur/ToeristischeVerhuurDetail.test.tsx index d393e53f88..9f864d9e05 100644 --- a/src/client/pages/ToeristischeVerhuur/ToeristischeVerhuurDetail.test.tsx +++ b/src/client/pages/ToeristischeVerhuur/ToeristischeVerhuurDetail.test.tsx @@ -4,7 +4,7 @@ import { MutableSnapshot } from 'recoil'; import { describe, expect } from 'vitest'; import { BBVergunning } from '../../../server/services/toeristische-verhuur/toeristische-verhuur-powerbrowser-bb-vergunning-types'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; import { AppRoutes } from '../../../universal/config/routes'; import { appStateAtom } from '../../hooks/useAppState'; import MockApp from '../MockApp'; diff --git a/src/client/pages/VergunningDetail/VergunningDetail.test.tsx b/src/client/pages/VergunningDetail/VergunningDetail.test.tsx index d2e87a84e7..7829ec4b45 100644 --- a/src/client/pages/VergunningDetail/VergunningDetail.test.tsx +++ b/src/client/pages/VergunningDetail/VergunningDetail.test.tsx @@ -10,7 +10,7 @@ import { AppRoutes } from '../../../universal/config/routes'; import { appStateAtom } from '../../hooks/useAppState'; import MockApp from '../MockApp'; import VergunningDetail from './VergunningDetail'; -import { bffApi } from '../../../test-utils'; +import { bffApi } from '../../../testing/utils'; const content = transformVergunningenData(vergunningenData as any); diff --git a/src/index.tsx b/src/index.tsx index 50746d3c31..98abd40674 100755 --- a/src/index.tsx +++ b/src/index.tsx @@ -4,7 +4,7 @@ import { createRoot } from 'react-dom/client'; import App from './client/App'; import ApplicationError from './client/pages/ApplicationError/ApplicationError'; import './client/styles/main.scss'; -import { reactPlugin } from './client/utils/monitoring'; +import { reactPlugin } from './client/helpers/monitoring'; if ( /MSIE (\d+\.\d+);/.test(navigator.userAgent) || diff --git a/src/server/auth/auth-helpers.test.ts b/src/server/auth/auth-helpers.test.ts index ebee759986..b9f54f75db 100644 --- a/src/server/auth/auth-helpers.test.ts +++ b/src/server/auth/auth-helpers.test.ts @@ -22,7 +22,7 @@ import { getReqMockWithOidc, RequestMock, ResponseMock, -} from '../../test-utils'; +} from '../../testing/utils'; import * as blacklist from '../services/session-blacklist'; describe('auth-helpers', () => { diff --git a/src/server/helpers/source-api-request.test.ts b/src/server/helpers/source-api-request.test.ts index 2355bcdb7a..fb60edc8b9 100644 --- a/src/server/helpers/source-api-request.test.ts +++ b/src/server/helpers/source-api-request.test.ts @@ -18,8 +18,8 @@ import { getRequestConfigCacheKey, requestData, } from './source-api-request'; -import { remoteApiHost } from '../../setupTests'; -import { remoteApi } from '../../test-utils'; +import { remoteApiHost } from '../../testing/setup'; +import { remoteApi } from '../../testing/utils'; import { apiErrorResult, apiPostponeResult, diff --git a/src/server/routing/route-handlers.test.ts b/src/server/routing/route-handlers.test.ts index 3f0351ba63..fa3d4e9e55 100644 --- a/src/server/routing/route-handlers.test.ts +++ b/src/server/routing/route-handlers.test.ts @@ -9,7 +9,7 @@ import { getReqMockWithOidc, RequestMock, ResponseMock, -} from '../../test-utils'; +} from '../../testing/utils'; import { OIDC_SESSION_COOKIE_NAME } from '../auth/auth-config'; import { cache } from '../helpers/source-api-request'; import { addToBlackList } from '../services/session-blacklist'; diff --git a/src/server/routing/route-helpers.test.ts b/src/server/routing/route-helpers.test.ts index 0708f6f1f5..57847632ee 100644 --- a/src/server/routing/route-helpers.test.ts +++ b/src/server/routing/route-helpers.test.ts @@ -12,8 +12,8 @@ import { sendResponse, sendUnauthorized, } from './route-helpers'; -import { bffApiHost } from '../../setupTests'; -import { RequestMock, ResponseMock } from '../../test-utils'; +import { bffApiHost } from '../../testing/setup'; +import { RequestMock, ResponseMock } from '../../testing/utils'; import { ApiResponse, apiErrorResult } from '../../universal/helpers/api'; import { oidcConfigDigid, oidcConfigEherkenning } from '../auth/auth-config'; import { cache } from '../helpers/source-api-request'; diff --git a/src/server/routing/router-oidc.test.ts b/src/server/routing/router-oidc.test.ts index 6e6264ac22..c548534565 100644 --- a/src/server/routing/router-oidc.test.ts +++ b/src/server/routing/router-oidc.test.ts @@ -1,11 +1,11 @@ import { forTesting } from './router-oidc'; -import { bffApiHost } from '../../setupTests'; +import { bffApiHost } from '../../testing/setup'; import { getAuthProfileAndToken, getReqMockWithOidc, RequestMock, ResponseMock, -} from '../../test-utils'; +} from '../../testing/utils'; import { OIDC_SESSION_COOKIE_NAME, oidcConfigDigid, diff --git a/src/server/routing/router-public.test.ts b/src/server/routing/router-public.test.ts index 43bd31a0dc..8c1231cf4d 100644 --- a/src/server/routing/router-public.test.ts +++ b/src/server/routing/router-public.test.ts @@ -1,7 +1,6 @@ import { zaakStatusHandler } from './router-public'; -import { bffApiHost } from '../../setupTests'; -import { RequestMock, ResponseMock } from '../../test-utils'; - +import { bffApiHost } from '../../testing/setup'; +import { RequestMock, ResponseMock } from '../../testing/utils'; describe('router-public', () => { describe('zaak status endpoint', () => { diff --git a/src/server/routing/router-stadspas-external-consumer.test.ts b/src/server/routing/router-stadspas-external-consumer.test.ts index 8127783639..ec9ae16d0e 100644 --- a/src/server/routing/router-stadspas-external-consumer.test.ts +++ b/src/server/routing/router-stadspas-external-consumer.test.ts @@ -1,5 +1,5 @@ import { forTesting } from './router-stadspas-external-consumer'; -import { remoteApi, RequestMock, ResponseMock } from '../../test-utils'; +import { remoteApi, RequestMock, ResponseMock } from '../../testing/utils'; import { apiSuccessResult } from '../../universal/helpers/api'; import { AuthProfile } from '../auth/auth-types'; import * as stadspas from '../services/hli/stadspas'; diff --git a/src/server/services/afis/afis-business-partner.test.ts b/src/server/services/afis/afis-business-partner.test.ts index 38c0ad7a61..24426ec174 100644 --- a/src/server/services/afis/afis-business-partner.test.ts +++ b/src/server/services/afis/afis-business-partner.test.ts @@ -1,5 +1,5 @@ import { fetchAfisBusinessPartnerDetails } from './afis-business-partner'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; const REQUEST_ID = '456'; const GENERIC_ID = '12346789'; diff --git a/src/server/services/afis/afis-facturen.test.ts b/src/server/services/afis/afis-facturen.test.ts index abd181ebff..04ebecfcb3 100644 --- a/src/server/services/afis/afis-facturen.test.ts +++ b/src/server/services/afis/afis-facturen.test.ts @@ -19,7 +19,7 @@ import AFIS_AFGEHANDELDE_FACTUREN from './test-fixtures/afgehandelde-facturen.js import AFIS_OPENSTAAANDE_FACTUREN from './test-fixtures/openstaande-facturen.json'; import ARC_DOC from '../../../../mocks/fixtures/afis/arc-doc-id.json'; import DOCUMENT_DOWNLOAD_RESPONSE from '../../../../mocks/fixtures/afis/document.json'; -import { getAuthProfileAndToken, remoteApi } from '../../../test-utils'; +import { getAuthProfileAndToken, remoteApi } from '../../../testing/utils'; const mocks = vi.hoisted(() => { const MOCK_VALUE_ENCRYPTED = 'xx-encrypted-xx'; diff --git a/src/server/services/afis/afis-notifications.test.ts b/src/server/services/afis/afis-notifications.test.ts index eb240afcef..5b28e31728 100644 --- a/src/server/services/afis/afis-notifications.test.ts +++ b/src/server/services/afis/afis-notifications.test.ts @@ -7,7 +7,7 @@ import { fetchAfisNotifications, } from './afis-notifications'; import { AfisFactuur, AfisFactuurStatus } from './afis-types'; -import { getAuthProfileAndToken } from '../../../test-utils'; +import { getAuthProfileAndToken } from '../../../testing/utils'; import { apiDependencyError, ApiErrorResponse, diff --git a/src/server/services/afis/afis.test.ts b/src/server/services/afis/afis.test.ts index ee3bf29e3d..5cde884750 100644 --- a/src/server/services/afis/afis.test.ts +++ b/src/server/services/afis/afis.test.ts @@ -1,7 +1,7 @@ import { describe } from 'vitest'; import { fetchIsKnownInAFIS } from './afis'; -import { getAuthProfileAndToken, remoteApi } from '../../../test-utils'; +import { getAuthProfileAndToken, remoteApi } from '../../../testing/utils'; const mocks = vi.hoisted(() => { const MOCK_VALUE_ENCRYPTED = 'xx-encrypted-xx'; diff --git a/src/server/services/avg/avg.test.ts b/src/server/services/avg/avg.test.ts index c2c1f3b366..0c9c8b07be 100644 --- a/src/server/services/avg/avg.test.ts +++ b/src/server/services/avg/avg.test.ts @@ -3,7 +3,7 @@ import { describe, expect, beforeEach, afterEach, vi, it } from 'vitest'; import { fetchAVG, fetchAVGNotifications, transformAVGResponse } from './avg'; import avgThemasResponse from '../../../../mocks/fixtures/avg-themas.json'; import apiResponse from '../../../../mocks/fixtures/avg.json'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; describe('AVG', () => { diff --git a/src/server/services/bezwaren/bezwaren.test.ts b/src/server/services/bezwaren/bezwaren.test.ts index 1da04e54e8..98acee8417 100644 --- a/src/server/services/bezwaren/bezwaren.test.ts +++ b/src/server/services/bezwaren/bezwaren.test.ts @@ -10,8 +10,8 @@ import { import bezwarenDocumenten from '../../../../mocks/fixtures/bezwaren-documents.json'; import bezwarenStatus from '../../../../mocks/fixtures/bezwaren-status.json'; import bezwarenApiResponse from '../../../../mocks/fixtures/bezwaren.json'; -import { remoteApiHost } from '../../../setupTests'; -import { remoteApi } from '../../../test-utils'; +import { remoteApiHost } from '../../../testing/setup'; +import { remoteApi } from '../../../testing/utils'; import { range } from '../../../universal/helpers/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; diff --git a/src/server/services/bodem/loodmeting.test.ts b/src/server/services/bodem/loodmeting.test.ts index 1f72d2572d..5927b3375c 100644 --- a/src/server/services/bodem/loodmeting.test.ts +++ b/src/server/services/bodem/loodmeting.test.ts @@ -7,7 +7,7 @@ import { } from './loodmetingen'; import document from '../../../../mocks/fixtures/loodmeting-rapport.json'; import metingen from '../../../../mocks/fixtures/loodmetingen.json'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; describe('Loodmeting', () => { diff --git a/src/server/services/buurt/datasets.test.ts b/src/server/services/buurt/datasets.test.ts index a8645e7c70..4f5463325d 100644 --- a/src/server/services/buurt/datasets.test.ts +++ b/src/server/services/buurt/datasets.test.ts @@ -6,7 +6,7 @@ import { transformHardlooproutesResponse, transformMeldingenBuurtResponse, } from './datasets'; -import { remoteApiHost } from '../../../setupTests'; +import { remoteApiHost } from '../../../testing/setup'; describe('Custom dataset tranformations', () => { it('Should group distance of hardlooproute', () => { diff --git a/src/server/services/buurt/helpers.test.ts b/src/server/services/buurt/helpers.test.ts index 4895b55f29..c034f32b5b 100644 --- a/src/server/services/buurt/helpers.test.ts +++ b/src/server/services/buurt/helpers.test.ts @@ -26,7 +26,7 @@ import { recursiveCoordinateSwap, refineFilterSelection, } from './helpers'; -import { remoteApiHost } from '../../../setupTests'; +import { remoteApiHost } from '../../../testing/setup'; import { ApiResponse } from '../../../universal/helpers/api'; const DSO_API_RESULT = { diff --git a/src/server/services/controller.test.ts b/src/server/services/controller.test.ts index f884c2a779..2da3e1362c 100644 --- a/src/server/services/controller.test.ts +++ b/src/server/services/controller.test.ts @@ -15,10 +15,7 @@ import { getTipNotifications, servicesTipsByProfileType, } from './controller'; -import { - getReqMockWithOidc, - ResponseMock, -} from '../../test-utils'; +import { getReqMockWithOidc, ResponseMock } from '../../testing/utils'; const mocks = vi.hoisted(() => { return { diff --git a/src/server/services/hli/hli-zorgned-service.test.ts b/src/server/services/hli/hli-zorgned-service.test.ts index 9ba9217c19..60f7298694 100644 --- a/src/server/services/hli/hli-zorgned-service.test.ts +++ b/src/server/services/hli/hli-zorgned-service.test.ts @@ -3,7 +3,7 @@ import { fetchZorgnedAanvragenHLI, forTesting, } from './hli-zorgned-service'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; import * as zorgnedService from '../zorgned/zorgned-service'; import { diff --git a/src/server/services/hli/stadspas.test.ts b/src/server/services/hli/stadspas.test.ts index aff1b5ac32..a31622717f 100644 --- a/src/server/services/hli/stadspas.test.ts +++ b/src/server/services/hli/stadspas.test.ts @@ -8,7 +8,7 @@ import { StadspasDiscountTransactions, StadspasDiscountTransactionsResponseSource, } from './stadspas-types'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; import * as encryptDecrypt from '../../helpers/encrypt-decrypt'; diff --git a/src/server/services/horeca.test.ts b/src/server/services/horeca.test.ts index 627533f646..4289ab9d0a 100644 --- a/src/server/services/horeca.test.ts +++ b/src/server/services/horeca.test.ts @@ -3,10 +3,9 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest'; import { fetchHorecaNotifications, fetchHorecaVergunningen } from './horeca'; import vergunningenMockData from '../../../mocks/fixtures/vergunningen.json'; -import { remoteApi } from '../../test-utils'; +import { remoteApi } from '../../testing/utils'; import { AuthProfileAndToken } from '../auth/auth-types'; - describe('Horeca service', () => { const authProfileAndToken: AuthProfileAndToken = { profile: { authMethod: 'digid', profileType: 'private', id: '', sid: '' }, diff --git a/src/server/services/klachten/klachten.test.ts b/src/server/services/klachten/klachten.test.ts index ae11d9e13d..edef9dd0d7 100644 --- a/src/server/services/klachten/klachten.test.ts +++ b/src/server/services/klachten/klachten.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; import apiResponse from '../../../../mocks/fixtures/klachten.json'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { ApiConfig } from '../../config/source-api'; import { AuthProfileAndToken } from './../../auth/auth-types'; import { diff --git a/src/server/services/krefia.test.ts b/src/server/services/krefia.test.ts index 0ed658b45a..c32f5799c8 100644 --- a/src/server/services/krefia.test.ts +++ b/src/server/services/krefia.test.ts @@ -2,7 +2,7 @@ import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'; import { fetchKrefia, fetchKrefiaNotifications, fetchSource } from './krefia'; import KrefiaData from '../../../mocks/fixtures/krefia.json'; -import { remoteApi } from '../../test-utils'; +import { remoteApi } from '../../testing/utils'; import { jsonCopy, omit } from '../../universal/helpers/utils'; import { AuthProfileAndToken } from '../auth/auth-types'; import { axiosRequest } from '../helpers/source-api-request'; diff --git a/src/server/services/parkeren/parkeren.test.ts b/src/server/services/parkeren/parkeren.test.ts index 5a46551424..ae75137907 100644 --- a/src/server/services/parkeren/parkeren.test.ts +++ b/src/server/services/parkeren/parkeren.test.ts @@ -1,5 +1,5 @@ import { fetchSSOParkerenURL } from './parkeren'; -import { getAuthProfileAndToken, remoteApi } from '../../../test-utils'; +import { getAuthProfileAndToken, remoteApi } from '../../../testing/utils'; import { getFromEnv } from '../../helpers/env'; const REQUEST_ID = '123'; diff --git a/src/server/services/simple-connect/api-service.test.ts b/src/server/services/simple-connect/api-service.test.ts index b20356ec8b..495d771618 100644 --- a/src/server/services/simple-connect/api-service.test.ts +++ b/src/server/services/simple-connect/api-service.test.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, test } from 'vitest'; import * as service from './api-service'; -import { remoteApiHost } from '../../../setupTests'; -import { remoteApi } from '../../../test-utils'; +import { remoteApiHost } from '../../../testing/setup'; +import { remoteApi } from '../../../testing/utils'; const REQUEST_ID = 'test-x'; diff --git a/src/server/services/simple-connect/belasting.test.ts b/src/server/services/simple-connect/belasting.test.ts index 64cf241d55..5d5bfe7d5b 100644 --- a/src/server/services/simple-connect/belasting.test.ts +++ b/src/server/services/simple-connect/belasting.test.ts @@ -1,7 +1,7 @@ import { describe, expect, test } from 'vitest'; import { fetchBelasting, fetchBelastingNotifications } from './belasting'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; const REQUEST_ID = 'test-x-999'; diff --git a/src/server/services/simple-connect/cleopatra.test.ts b/src/server/services/simple-connect/cleopatra.test.ts index e81234f031..aed5036e44 100644 --- a/src/server/services/simple-connect/cleopatra.test.ts +++ b/src/server/services/simple-connect/cleopatra.test.ts @@ -7,7 +7,7 @@ import { fetchOvertredingenNotifications, getJSONRequestPayload, } from './cleopatra'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; const mocks = vi.hoisted(() => { diff --git a/src/server/services/simple-connect/erfpacht.test.ts b/src/server/services/simple-connect/erfpacht.test.ts index 791e9203bb..f9174d7aef 100644 --- a/src/server/services/simple-connect/erfpacht.test.ts +++ b/src/server/services/simple-connect/erfpacht.test.ts @@ -7,7 +7,7 @@ import { fetchErfpachtNotifications, getConfigMain, } from './erfpacht'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; describe('simple-connect/erfpacht', () => { diff --git a/src/server/services/simple-connect/erfpachtv2.test.ts b/src/server/services/simple-connect/erfpachtv2.test.ts index 004da27ffc..ac02ec124b 100644 --- a/src/server/services/simple-connect/erfpachtv2.test.ts +++ b/src/server/services/simple-connect/erfpachtv2.test.ts @@ -4,7 +4,7 @@ import { fetchErfpachtV2, fetchErfpachtV2DossiersDetail } from './erfpacht'; import ERFPACHTv2_DOSSIERINFO_DETAILS from '../../../../mocks/fixtures/erfpacht-v2-dossierinfo-bsn.json'; import ERFPACHTv2_DOSSIERS from '../../../../mocks/fixtures/erfpacht-v2-dossiers.json'; import ERFPACHTv2_ERFPACHTER from '../../../../mocks/fixtures/erfpacht-v2-erfpachter.json'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; // const mocks = vi.hoisted(() => { diff --git a/src/server/services/simple-connect/subsidie.test.ts b/src/server/services/simple-connect/subsidie.test.ts index f80b6c2b15..7cf7a88a8d 100644 --- a/src/server/services/simple-connect/subsidie.test.ts +++ b/src/server/services/simple-connect/subsidie.test.ts @@ -1,7 +1,7 @@ import { describe, expect, test } from 'vitest'; import { fetchSubsidieNotifications } from './subsidie'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { Themas } from '../../../universal/config/thema'; import { AuthProfileAndToken } from '../../auth/auth-types'; diff --git a/src/server/services/simple-connect/svwi.test.ts b/src/server/services/simple-connect/svwi.test.ts index 0e232132cf..f7e31e2e93 100644 --- a/src/server/services/simple-connect/svwi.test.ts +++ b/src/server/services/simple-connect/svwi.test.ts @@ -2,7 +2,7 @@ import { describe, expect, test } from 'vitest'; import { fetchSVWI } from './svwi'; import SVWI from '../../../../mocks/fixtures/svwi.json'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; vi.mock('../../../universal/config/app', async (importOriginal) => { diff --git a/src/server/services/toeristische-verhuur/toeristische-verhuur-powerbrowser-bb-vergunning.test.ts b/src/server/services/toeristische-verhuur/toeristische-verhuur-powerbrowser-bb-vergunning.test.ts index 0c7f540dd0..d9d75cf306 100644 --- a/src/server/services/toeristische-verhuur/toeristische-verhuur-powerbrowser-bb-vergunning.test.ts +++ b/src/server/services/toeristische-verhuur/toeristische-verhuur-powerbrowser-bb-vergunning.test.ts @@ -17,7 +17,7 @@ import { PowerBrowserStatusResponse, SearchRequestResponse, } from './toeristische-verhuur-powerbrowser-bb-vergunning-types'; -import { getAuthProfileAndToken, remoteApi } from '../../../test-utils'; +import { getAuthProfileAndToken, remoteApi } from '../../../testing/utils'; import { AuthProfile, AuthProfileAndToken } from '../../auth/auth-types'; import * as encryptDecrypt from '../../helpers/encrypt-decrypt'; diff --git a/src/server/services/toeristische-verhuur/toeristische-verhuur.test.ts b/src/server/services/toeristische-verhuur/toeristische-verhuur.test.ts index 1de1ab1254..604b7a4b89 100644 --- a/src/server/services/toeristische-verhuur/toeristische-verhuur.test.ts +++ b/src/server/services/toeristische-verhuur/toeristische-verhuur.test.ts @@ -6,7 +6,7 @@ import { createToeristischeVerhuurNotification } from './toeristische-verhuur-no import { BBVergunning } from './toeristische-verhuur-powerbrowser-bb-vergunning-types'; import { VakantieverhuurVergunning } from './toeristische-verhuur-types'; import vergunningenData from '../../../../mocks/fixtures/vergunningen.json'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { jsonCopy } from '../../../universal/helpers/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; diff --git a/src/server/services/vergunningen-v2/decos-service.test.ts b/src/server/services/vergunningen-v2/decos-service.test.ts index df74f5ff60..2168398d28 100644 --- a/src/server/services/vergunningen-v2/decos-service.test.ts +++ b/src/server/services/vergunningen-v2/decos-service.test.ts @@ -12,7 +12,7 @@ import { fetchDecosZakenFromSource, forTesting, } from './decos-service'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { jsonCopy, range } from '../../../universal/helpers/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; diff --git a/src/server/services/vergunningen/vergunningen.test.ts b/src/server/services/vergunningen/vergunningen.test.ts index b203320a01..bb7455c295 100644 --- a/src/server/services/vergunningen/vergunningen.test.ts +++ b/src/server/services/vergunningen/vergunningen.test.ts @@ -13,7 +13,7 @@ import { transformVergunningenData, } from './vergunningen'; import vergunningenData from '../../../../mocks/fixtures/vergunningen.json'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { jsonCopy } from '../../../universal/helpers/utils'; import { CaseType } from '../../../universal/types/vergunningen'; import { AuthProfileAndToken } from '../../auth/auth-types'; diff --git a/src/server/services/wmo/wmo-zorgned-service.test.ts b/src/server/services/wmo/wmo-zorgned-service.test.ts index 0a6a8acc71..d4e7c0f1b4 100644 --- a/src/server/services/wmo/wmo-zorgned-service.test.ts +++ b/src/server/services/wmo/wmo-zorgned-service.test.ts @@ -2,8 +2,8 @@ import Mockdate from 'mockdate'; import { fetchZorgnedAanvragenWMO, forTesting } from './wmo-zorgned-service'; import { fetchZorgnedAanvragenWMO, forTesting } from './wmo-zorgned-service'; -import { remoteApiHost } from '../../../setupTests'; -import { remoteApi } from '../../../test-utils'; +import { remoteApiHost } from '../../../testing/setup'; +import { remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; import * as request from '../../helpers/source-api-request'; import { diff --git a/src/server/services/wmo/wmo.test.ts b/src/server/services/wmo/wmo.test.ts index 6b253fd73c..c66d3558fb 100644 --- a/src/server/services/wmo/wmo.test.ts +++ b/src/server/services/wmo/wmo.test.ts @@ -2,7 +2,7 @@ import Mockdate from 'mockdate'; import { fetchWmo, forTesting } from './wmo'; import ZORGNED_AANVRAGEN_WMO from '../../../../mocks/fixtures/zorgned-jzd-aanvragen.json'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { jsonCopy } from '../../../universal/helpers/utils'; import { ZorgnedAanvraagTransformed } from '../zorgned/zorgned-types'; diff --git a/src/server/services/wpi/api-service.test.ts b/src/server/services/wpi/api-service.test.ts index 0d8332e9da..07ee8093eb 100644 --- a/src/server/services/wpi/api-service.test.ts +++ b/src/server/services/wpi/api-service.test.ts @@ -11,7 +11,7 @@ import { WpiRequestProcessLabels, WpiRequestStatusLabels, } from './wpi-types'; -import { remoteApi } from '../../../test-utils'; +import { remoteApi } from '../../../testing/utils'; import { ApiErrorResponse } from '../../../universal/helpers/api'; import { jsonCopy } from '../../../universal/helpers/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; diff --git a/src/server/services/zorgned/zorgned-service.test.ts b/src/server/services/zorgned/zorgned-service.test.ts index 170cefd0c8..ef57ec2d74 100644 --- a/src/server/services/zorgned/zorgned-service.test.ts +++ b/src/server/services/zorgned/zorgned-service.test.ts @@ -13,8 +13,8 @@ import { ZorgnedResponseDataSource, } from './zorgned-types'; import ZORGNED_JZD_AANVRAGEN from '../../../../mocks/fixtures/zorgned-jzd-aanvragen.json'; -import { remoteApiHost } from '../../../setupTests'; -import { getAuthProfileAndToken, remoteApi } from '../../../test-utils'; +import { remoteApiHost } from '../../../testing/setup'; +import { getAuthProfileAndToken, remoteApi } from '../../../testing/utils'; import { AuthProfileAndToken } from '../../auth/auth-types'; import * as request from '../../helpers/source-api-request'; diff --git a/src/client/utils/renderRecoilHook.tsx b/src/testing/render-recoil.hook.tsx similarity index 100% rename from src/client/utils/renderRecoilHook.tsx rename to src/testing/render-recoil.hook.tsx diff --git a/src/setupTests.ts b/src/testing/setup.ts similarity index 100% rename from src/setupTests.ts rename to src/testing/setup.ts diff --git a/src/test-utils.ts b/src/testing/utils.ts similarity index 92% rename from src/test-utils.ts rename to src/testing/utils.ts index 571e614343..9ee55e9680 100644 --- a/src/test-utils.ts +++ b/src/testing/utils.ts @@ -2,10 +2,10 @@ import { Request, Response } from 'express'; import nock from 'nock'; import UID from 'uid-safe'; -import { AuthProfile, AuthProfileAndToken } from './server/auth/auth-types'; -import { createOIDCStub } from './server/routing/router-development'; -import { bffApiHost, remoteApiHost } from './setupTests'; -import { HTTP_STATUS_CODES } from './universal/constants/errorCodes'; +import { bffApiHost, remoteApiHost } from './setup'; +import { AuthProfile, AuthProfileAndToken } from '../server/auth/auth-types'; +import { createOIDCStub } from '../server/routing/router-development'; +import { HTTP_STATUS_CODES } from '../universal/constants/errorCodes'; const defaultReplyHeaders = { 'access-control-allow-origin': '*', diff --git a/vite.config.ts b/vite.config.ts index f71b6c7d66..d567a39a39 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,3 +1,4 @@ +/* eslint-disable */ import { createHash } from 'node:crypto'; import react from '@vitejs/plugin-react'; @@ -29,7 +30,7 @@ export default defineConfig({ test: { globals: true, environment: 'jsdom', // NOTE: overridden with 'node' when testing bff application - setupFiles: './src/setupTests.ts', + setupFiles: './src/testing/setup.ts', css: false, }, plugins: [ @@ -63,3 +64,4 @@ export default defineConfig({ }, }, }); +/* eslint-enable */ diff --git a/vitest.config.ts b/vitest.config.ts index 31a9da5ba4..c8e95eb7de 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,5 +1,6 @@ // vitest.config.ts import { defineConfig, mergeConfig } from 'vitest/config'; + import viteConfig from './vite.config.ts'; export default mergeConfig(