Fix tests broken by either renamed varible not being renamed properly…

… or module mock implementation being outdated
ral-facilities · Sep 25, 2024 · bbd11c6 · bbd11c6
1 parent 6259343
commit bbd11c6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/packages/datagateway-common/src/api/retryICATErrors.ts b/packages/datagateway-common/src/api/retryICATErrors.ts
@@ -1,7 +1,7 @@
 import { AxiosError } from 'axios';
 import { useQueryClient } from 'react-query';
 
-export const createRetryICATErrors = (
+const createRetryICATErrors = (
   retries: number
 ): ((failureCount: number, error: AxiosError) => boolean) => {
   return (failureCount: number, error: AxiosError) =>
@@ -26,17 +26,20 @@ const baseRetryICATErrors = (
   return true;
 };
 
-const useRetryICATErrors = (): ((
+export const useRetryICATErrors = (): ((
   failureCount: number,
   error: AxiosError
 ) => boolean) => {
   const queryClient = useQueryClient();
   const opts = queryClient.getDefaultOptions();
   // TODO: do we want to be more elegant in handling other types of retry...
   const retries =
-    typeof opts.queries?.retry === 'number' ? opts.queries.retry : 3;
+    typeof opts.queries?.retry === 'number'
+      ? opts.queries.retry
+      : // explicitly handle boolean case as we set this in tests
+      opts.queries?.retry === false
+      ? 0
+      : 3;
 
   return createRetryICATErrors(retries);
 };
-
-export { useRetryICATErrors };
diff --git a/packages/datagateway-common/src/setupTests.tsx b/packages/datagateway-common/src/setupTests.tsx
@@ -65,7 +65,7 @@ setLogger({
 // mock retry function to ensure it doesn't slow down query failure tests
 jest.mock('./api/retryICATErrors', () => ({
   __esModule: true,
-  default: jest.fn().mockReturnValue(false),
+  useRetryICATErrors: jest.fn(() => () => false),
 }));
 
 // Mock Date.toLocaleDateString so that it always uses en-GB as locale and UTC timezone

diff --git a/packages/datagateway-dataview/src/state/actions/actions.test.tsx b/packages/datagateway-dataview/src/state/actions/actions.test.tsx
@@ -102,7 +102,7 @@ describe('Actions', () => {
       features: {},
       idsUrl: 'ids',
       apiUrl: 'api',
-      retries: 1,
+      queryRetries: 1,
       breadcrumbs: [
         {
           matchEntity: 'test',

diff --git a/packages/datagateway-search/src/state/actions/actions.test.tsx b/packages/datagateway-search/src/state/actions/actions.test.tsx
@@ -62,7 +62,7 @@ describe('Actions', () => {
       apiUrl: 'api',
       downloadApiUrl: 'download-api',
       icatUrl: 'icat',
-      retries: 0,
+      queryRetries: 0,
       selectAllSetting: false,
       searchableEntities: ['investigation', 'dataset', 'datafile'],
       maxNumResults: 150,