fixup! fixup! fixup! ✅(frontend) make tests work with react-query v4 …

…and react 18
openfun · Nov 14, 2022 · 4eb9dc7 · 4eb9dc7
1 parent cbbfc22
commit 4eb9dc7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/frontend/js/components/DashboardAddressesManagement/index.spec.tsx b/src/frontend/js/components/DashboardAddressesManagement/index.spec.tsx
@@ -17,7 +17,7 @@ import { DashboardTest } from 'components/Dashboard/DashboardTest';
 import { DashboardPaths } from 'utils/routers/dashboard';
 import * as Joanie from 'types/Joanie';
 import { expectBreadcrumbsToEqualParts } from 'utils/test/expectBreadcrumbsToEqualParts';
-import { asyncForEach } from 'utils/asyncForEach';
+import { resolveAll } from 'utils/resolveAll';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { expectBannerError } from 'utils/test/expectBannerError';
 
@@ -85,7 +85,7 @@ describe('<DashAddressesManagement/>', () => {
     // No error is shown.
     expect(screen.queryByText('An error occurred', { exact: false })).toBeNull();
     // Each addresses is displayed.
-    await asyncForEach(addresses, async (address: Joanie.Address) => {
+    await resolveAll(addresses, async (address: Joanie.Address) => {
       await screen.findByText(address.title);
     });
   });

diff --git a/src/frontend/js/components/LtiConsumer/index.spec.tsx b/src/frontend/js/components/LtiConsumer/index.spec.tsx
@@ -13,7 +13,7 @@ import {
 import BaseSessionProvider from 'data/SessionProvider/BaseSessionProvider';
 import { RICHIE_LTI_ANONYMOUS_USER_ID_CACHE_KEY } from 'settings';
 import { handle } from 'utils/errors/handle';
-import { asyncForEach } from 'utils/asyncForEach';
+import { resolveAll } from 'utils/resolveAll';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import LtiConsumer from '.';
 
@@ -99,7 +99,7 @@ describe('components/LtiConsumer', () => {
     await act(async () => ltiContextDeferred.resolve(ltiContextResponse));
 
     // check form inputs
-    await asyncForEach(
+    await resolveAll(
       Object.entries(ltiContextResponse.content_parameters),
       async ([name, value]) => {
         await waitFor(() => {
@@ -166,7 +166,7 @@ describe('components/LtiConsumer', () => {
     await act(async () => ltiContextDeferred.resolve(ltiContextResponse));
 
     // check form inputs
-    await asyncForEach(
+    await resolveAll(
       Object.entries(ltiContextResponse.content_parameters),
       async ([name, value]) => {
         await waitFor(() => {

diff --git a/src/frontend/js/components/SearchFilterGroupModal/index.spec.tsx b/src/frontend/js/components/SearchFilterGroupModal/index.spec.tsx
@@ -7,7 +7,7 @@ import { IntlProvider } from 'react-intl';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { History, HistoryContext } from 'data/useHistory';
 import { Deferred } from 'utils/test/deferred';
-import { asyncForEach } from 'utils/asyncForEach';
+import { resolveAll } from 'utils/resolveAll';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { SearchFilterGroupModal } from '.';
 
@@ -131,7 +131,7 @@ describe('<SearchFilterGroupModal />', () => {
       screen.getByPlaceholderText('Search in Universities');
 
       // Default search results are shown with their facet counts;
-      await asyncForEach(range(0, 21), async (value) => {
+      await resolveAll(range(0, 21), async (value) => {
         await screen.findByText(
           (content) =>
             content.startsWith(`Value #${value} `) && content.includes(String(value * 100)),
@@ -176,7 +176,7 @@ describe('<SearchFilterGroupModal />', () => {
       );
 
       // Search results including top 21 and next 21 are shown with their facet counts
-      await asyncForEach(range(0, 42), async (value) => {
+      await resolveAll(range(0, 42), async (value) => {
         await screen.findByText(
           (content) =>
             content.startsWith(`Value #${value} `) && content.includes(String(value * 100)),
@@ -220,7 +220,7 @@ describe('<SearchFilterGroupModal />', () => {
       );
 
       // All three batches of search results are displayed along with facet counts
-      await asyncForEach(range(0, 46), async (value) => {
+      await resolveAll(range(0, 46), async (value) => {
         await screen.findByText(
           (content) =>
             content.startsWith(`Value #${value} `) && content.includes(String(value * 100)),

diff --git a/src/frontend/js/utils/asyncForEach.ts → src/frontend/js/utils/resolveAll.ts b/src/frontend/js/utils/asyncForEach.ts → src/frontend/js/utils/resolveAll.ts
@@ -1,4 +1,4 @@
-export async function asyncForEach<T>(
+export async function resolveAll<T>(
   array: Array<T>,
   callback: (item: T, index: number) => Promise<void>,
 ) {