Fix shlink-web-component tests

shlink-web-component/test/visits/DomainVisits.test.tsx

@@ -3,6 +3,7 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
 import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import { SettingsProvider } from '../../src/utils/settings';
 import { DomainVisits as createDomainVisits } from '../../src/visits/DomainVisits';
 import type { DomainVisits } from '../../src/visits/reducers/domainVisits';
 import { renderWithEvents } from '../__helpers__/setUpTest';
@@ -20,13 +21,14 @@ describe('<DomainVisits />', () => {
   const DomainVisits = createDomainVisits(fromPartial({ exportVisits }));
   const setUp = () => renderWithEvents(
     <MemoryRouter>
-      <DomainVisits
-        {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
-        getDomainVisits={getDomainVisits}
-        cancelGetDomainVisits={cancelGetDomainVisits}
-        domainVisits={domainVisits}
-        settings={fromPartial({})}
-      />
+      <SettingsProvider value={fromPartial({})}>
+        <DomainVisits
+          {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
+          getDomainVisits={getDomainVisits}
+          cancelGetDomainVisits={cancelGetDomainVisits}
+          domainVisits={domainVisits}
+        />
+      </SettingsProvider>
     </MemoryRouter>,
   );
 

shlink-web-component/test/visits/NonOrphanVisits.test.tsx

@@ -3,6 +3,7 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
 import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import { SettingsProvider } from '../../src/utils/settings';
 import { NonOrphanVisits as createNonOrphanVisits } from '../../src/visits/NonOrphanVisits';
 import type { VisitsInfo } from '../../src/visits/reducers/types';
 import { renderWithEvents } from '../__helpers__/setUpTest';
@@ -15,13 +16,14 @@ describe('<NonOrphanVisits />', () => {
   const NonOrphanVisits = createNonOrphanVisits(fromPartial({ exportVisits }));
   const setUp = () => renderWithEvents(
     <MemoryRouter>
-      <NonOrphanVisits
-        {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
-        getNonOrphanVisits={getNonOrphanVisits}
-        cancelGetNonOrphanVisits={cancelGetNonOrphanVisits}
-        nonOrphanVisits={nonOrphanVisits}
-        settings={fromPartial({})}
-      />
+      <SettingsProvider value={fromPartial({})}>
+        <NonOrphanVisits
+          {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
+          getNonOrphanVisits={getNonOrphanVisits}
+          cancelGetNonOrphanVisits={cancelGetNonOrphanVisits}
+          nonOrphanVisits={nonOrphanVisits}
+        />
+      </SettingsProvider>
     </MemoryRouter>,
   );
 

shlink-web-component/test/visits/OrphanVisits.test.tsx

@@ -3,6 +3,7 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
 import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import { SettingsProvider } from '../../src/utils/settings';
 import { OrphanVisits as createOrphanVisits } from '../../src/visits/OrphanVisits';
 import type { VisitsInfo } from '../../src/visits/reducers/types';
 import { renderWithEvents } from '../__helpers__/setUpTest';
@@ -14,13 +15,14 @@ describe('<OrphanVisits />', () => {
   const OrphanVisits = createOrphanVisits(fromPartial({ exportVisits }));
   const setUp = () => renderWithEvents(
     <MemoryRouter>
-      <OrphanVisits
-        {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
-        getOrphanVisits={getOrphanVisits}
-        orphanVisits={orphanVisits}
-        cancelGetOrphanVisits={vi.fn()}
-        settings={fromPartial({})}
-      />
+      <SettingsProvider value={fromPartial({})}>
+        <OrphanVisits
+          {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
+          getOrphanVisits={getOrphanVisits}
+          orphanVisits={orphanVisits}
+          cancelGetOrphanVisits={vi.fn()}
+        />
+      </SettingsProvider>
     </MemoryRouter>,
   );
 

shlink-web-component/test/visits/ShortUrlVisits.test.tsx

@@ -4,6 +4,7 @@ import { formatISO } from 'date-fns';
 import { identity } from 'ramda';
 import { MemoryRouter } from 'react-router-dom';
 import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import { SettingsProvider } from '../../src/utils/settings';
 import type { ShortUrlVisits as ShortUrlVisitsState } from '../../src/visits/reducers/shortUrlVisits';
 import type { ShortUrlVisitsProps } from '../../src/visits/ShortUrlVisits';
 import { ShortUrlVisits as createShortUrlVisits } from '../../src/visits/ShortUrlVisits';
@@ -16,16 +17,17 @@ describe('<ShortUrlVisits />', () => {
   const ShortUrlVisits = createShortUrlVisits(fromPartial({ exportVisits }));
   const setUp = () => renderWithEvents(
     <MemoryRouter>
-      <ShortUrlVisits
-        {...fromPartial<ShortUrlVisitsProps>({})}
-        {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
-        getShortUrlDetail={identity}
-        getShortUrlVisits={getShortUrlVisitsMock}
-        shortUrlVisits={shortUrlVisits}
-        shortUrlDetail={fromPartial({})}
-        settings={fromPartial({})}
-        cancelGetShortUrlVisits={() => {}}
-      />
+      <SettingsProvider value={fromPartial({})}>
+        <ShortUrlVisits
+          {...fromPartial<ShortUrlVisitsProps>({})}
+          {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
+          getShortUrlDetail={identity}
+          getShortUrlVisits={getShortUrlVisitsMock}
+          shortUrlVisits={shortUrlVisits}
+          shortUrlDetail={fromPartial({})}
+          cancelGetShortUrlVisits={() => {}}
+        />
+      </SettingsProvider>
     </MemoryRouter>,
   );
 

shlink-web-component/test/visits/TagVisits.test.tsx

@@ -3,6 +3,7 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router';
 import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import { SettingsProvider } from '../../src/utils/settings';
 import type { TagVisits as TagVisitsStats } from '../../src/visits/reducers/tagVisits';
 import type { TagVisitsProps } from '../../src/visits/TagVisits';
 import { TagVisits as createTagVisits } from '../../src/visits/TagVisits';
@@ -23,14 +24,15 @@ describe('<TagVisits />', () => {
   );
   const setUp = () => renderWithEvents(
     <MemoryRouter>
-      <TagVisits
-        {...fromPartial<TagVisitsProps>({})}
-        {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
-        getTagVisits={getTagVisitsMock}
-        tagVisits={tagVisits}
-        settings={fromPartial({})}
-        cancelGetTagVisits={() => {}}
-      />
+      <SettingsProvider value={fromPartial({})}>
+        <TagVisits
+          {...fromPartial<TagVisitsProps>({})}
+          {...fromPartial<MercureBoundProps>({ mercureInfo: {} })}
+          getTagVisits={getTagVisitsMock}
+          tagVisits={tagVisits}
+          cancelGetTagVisits={() => {}}
+        />
+      </SettingsProvider>
     </MemoryRouter>,
   );
 

shlink-web-component/test/visits/VisitsStats.test.tsx

@@ -3,6 +3,7 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
 import { rangeOf } from '../../src/utils/helpers';
+import { SettingsProvider } from '../../src/utils/settings';
 import type { VisitsInfo } from '../../src/visits/reducers/types';
 import type { Visit } from '../../src/visits/types';
 import { VisitsStats } from '../../src/visits/VisitsStats';
@@ -20,13 +21,14 @@ describe('<VisitsStats />', () => {
       history,
       ...renderWithEvents(
         <Router location={history.location} navigator={history}>
-          <VisitsStats
-            getVisits={getVisitsMock}
-            visitsInfo={fromPartial(visitsInfo)}
-            cancelGetVisits={() => {}}
-            settings={fromPartial({})}
-            exportCsv={exportCsv}
-          />
+          <SettingsProvider value={fromPartial({})}>
+            <VisitsStats
+              getVisits={getVisitsMock}
+              visitsInfo={fromPartial(visitsInfo)}
+              cancelGetVisits={() => {}}
+              exportCsv={exportCsv}
+            />
+          </SettingsProvider>
         </Router>,
       ),
     };

shlink-web-component/test/visits/reducers/domainVisits.test.ts

@@ -1,9 +1,8 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../../src/container/types';
 import { rangeOf } from '../../../../src/utils/utils';
-import type { ShlinkVisits } from '../../../src/api/types';
+import type { ShlinkApiClient, ShlinkVisits } from '../../../src/api-contract';
+import type { RootState } from '../../../src/container/store';
 import type { ShortUrl } from '../../../src/short-urls/data';
 import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
 import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
@@ -151,7 +150,7 @@ describe('domainVisitsReducer', () => {
 
   describe('getDomainVisits', () => {
     const dispatchMock = vi.fn();
-    const getState = () => fromPartial<ShlinkState>({
+    const getState = () => fromPartial<RootState>({
       domainVisits: { cancelLoad: false },
     });
     const domain = 'foo.com';

shlink-web-component/test/visits/reducers/nonOrphanVisits.test.ts

@@ -1,9 +1,8 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../../src/container/types';
 import { rangeOf } from '../../../../src/utils/utils';
-import type { ShlinkVisits } from '../../../src/api/types';
+import type { ShlinkApiClient, ShlinkVisits } from '../../../src/api-contract';
+import type { RootState } from '../../../src/container/store';
 import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
 import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import {
@@ -118,7 +117,7 @@ describe('nonOrphanVisitsReducer', () => {
 
   describe('getNonOrphanVisits', () => {
     const dispatchMock = vi.fn();
-    const getState = () => fromPartial<ShlinkState>({
+    const getState = () => fromPartial<RootState>({
       orphanVisits: { cancelLoad: false },
     });
 

shlink-web-component/test/visits/reducers/orphanVisits.test.ts

@@ -1,9 +1,8 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../../src/container/types';
 import { rangeOf } from '../../../../src/utils/utils';
-import type { ShlinkVisits } from '../../../src/api/types';
+import type { ShlinkApiClient, ShlinkVisits } from '../../../src/api-contract';
+import type { RootState } from '../../../src/container/store';
 import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
 import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import {
@@ -118,7 +117,7 @@ describe('orphanVisitsReducer', () => {
 
   describe('getOrphanVisits', () => {
     const dispatchMock = vi.fn();
-    const getState = () => fromPartial<ShlinkState>({
+    const getState = () => fromPartial<RootState>({
       orphanVisits: { cancelLoad: false },
     });
 

shlink-web-component/test/visits/reducers/shortUrlVisits.test.ts

@@ -1,9 +1,8 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../../src/container/types';
 import { rangeOf } from '../../../../src/utils/utils';
-import type { ShlinkVisits } from '../../../src/api/types';
+import type { ShlinkApiClient, ShlinkVisits } from '../../../src/api-contract';
+import type { RootState } from '../../../src/container/store';
 import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
 import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import type {
@@ -142,7 +141,7 @@ describe('shortUrlVisitsReducer', () => {
 
   describe('getShortUrlVisits', () => {
     const dispatchMock = vi.fn();
-    const getState = () => fromPartial<ShlinkState>({
+    const getState = () => fromPartial<RootState>({
       shortUrlVisits: { cancelLoad: false },
     });
 

shlink-web-component/test/visits/reducers/tagVisits.test.ts

@@ -1,9 +1,8 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../../src/container/types';
 import { rangeOf } from '../../../../src/utils/utils';
-import type { ShlinkVisits } from '../../../src/api/types';
+import type { ShlinkApiClient, ShlinkVisits } from '../../../src/api-contract';
+import type { RootState } from '../../../src/container/store';
 import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
 import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import type {
@@ -142,7 +141,7 @@ describe('tagVisitsReducer', () => {
 
   describe('getTagVisits', () => {
     const dispatchMock = vi.fn();
-    const getState = () => fromPartial<ShlinkState>({
+    const getState = () => fromPartial<RootState>({
       tagVisits: { cancelLoad: false },
     });
     const tag = 'foo';

shlink-web-component/test/visits/reducers/visitsOverview.test.ts

@@ -1,7 +1,6 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../../src/container/types';
-import type { ShlinkVisitsOverview } from '../../../src/api/types';
+import type { ShlinkApiClient, ShlinkVisitsOverview } from '../../../src/api-contract';
+import type { RootState } from '../../../src/container/store';
 import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
 import type {
   PartialVisitsSummary,
@@ -25,7 +24,7 @@ describe('visitsOverviewReducer', () => {
     it('returns loading on GET_OVERVIEW_START', () => {
       const { loading } = reducer(
         state({ loading: false, error: false }),
-        loadVisitsOverview.pending(''),
+        loadVisitsOverview.pending('', {}),
       );
 
       expect(loading).toEqual(true);
@@ -34,7 +33,7 @@ describe('visitsOverviewReducer', () => {
     it('stops loading and returns error on GET_OVERVIEW_ERROR', () => {
       const { loading, error } = reducer(
         state({ loading: true, error: false }),
-        loadVisitsOverview.rejected(null, ''),
+        loadVisitsOverview.rejected(null, '', {}),
       );
 
       expect(loading).toEqual(false);
@@ -44,7 +43,7 @@ describe('visitsOverviewReducer', () => {
     it('return visits overview on GET_OVERVIEW', () => {
       const action = loadVisitsOverview.fulfilled(fromPartial({
         nonOrphanVisits: { total: 100 },
-      }), 'requestId');
+      }), 'requestId', {});
       const { loading, error, nonOrphanVisits } = reducer(state({ loading: true, error: false }), action);
 
       expect(loading).toEqual(false);
@@ -127,7 +126,7 @@ describe('visitsOverviewReducer', () => {
 
   describe('loadVisitsOverview', () => {
     const dispatchMock = vi.fn();
-    const getState = () => fromPartial<ShlinkState>({});
+    const getState = () => fromPartial<RootState>({});
 
     it.each([
       [
@@ -155,7 +154,7 @@ describe('visitsOverviewReducer', () => {
       const resolvedOverview = fromPartial<ShlinkVisitsOverview>(serverResult);
       getVisitsOverview.mockResolvedValue(resolvedOverview);
 
-      await loadVisitsOverview()(dispatchMock, getState, {});
+      await loadVisitsOverview(buildApiClientMock)(dispatchMock, getState, {});
 
       expect(dispatchMock).toHaveBeenCalledTimes(2);
       expect(dispatchMock).toHaveBeenNthCalledWith(2, expect.objectContaining({ payload: dispatchedPayload }));

shlink-web-component/test/visits/types/helpers.test.ts

@@ -1,5 +1,5 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShlinkVisitsParams } from '../../../src/api/types';
+import type { ShlinkVisitsParams } from '../../../src/api-contract';
 import { formatIsoDate, parseDate } from '../../../src/utils/dates/helpers/date';
 import type { CreateVisit, OrphanVisit, VisitsParams } from '../../../src/visits/types';
 import type { GroupedNewVisits } from '../../../src/visits/types/helpers';