Move flushPromises into testUtils file to avoid repeated mocks during…

… import #1379

package.json

@@ -125,4 +125,4 @@
     "wait-on": "7.2.0"
   },
   "packageManager": "[email protected]"
-}
+}

src/App.test.tsx

@@ -3,7 +3,7 @@ import { act, fireEvent, render, screen } from '@testing-library/react';
 import axios from 'axios';
 import { createRoot } from 'react-dom/client';
 import App, { AppSansHoc } from './App';
-import { flushPromises } from './setupTests';
+import { flushPromises } from './testUtils';
 import { RegisterRouteType } from './state/scigateway.types';
 
 vi.mock('./state/actions/loadMicroFrontends', () => ({

src/routing/authorisedRoute.component.test.tsx

@@ -15,7 +15,7 @@ import {
   siteLoadingUpdate,
   verifyUsernameAndPassword,
 } from '../state/actions/scigateway.actions';
-import { flushPromises } from '../setupTests';
+import { flushPromises } from '../testUtils';
 import { Provider } from 'react-redux';
 import {
   act,

src/setupTests.ts

@@ -22,9 +22,6 @@ Object.defineProperty(window, 'matchMedia', {
   })),
 });
 
-export const flushPromises = async (): Promise<unknown> =>
-  (await vi.importActual('timers')).setImmediate;
-
 // globally mock as we never want to actually call single-spa funcs in unit tests
 vi.mock('single-spa', () => ({
   unloadApplication: vi.fn(),

src/state/actions/scigateway.actions.test.tsx

@@ -46,7 +46,7 @@ import { StateType } from '../state.types';
 import loadMicroFrontends from './loadMicroFrontends';
 import log from 'loglevel';
 import { createLocation } from 'history';
-import { flushPromises } from '../../setupTests';
+import { flushPromises } from '../../testUtils';
 
 function mockAxiosGetResponse(message: string): void {
   vi.mocked(mockAxios.get).mockImplementationOnce(() =>

src/state/middleware/scigateway.middleware.test.tsx

@@ -25,7 +25,7 @@ import { toastr } from 'react-redux-toastr';
 import { AddHelpTourStepsType } from '../scigateway.types';
 import { StateType } from '../state.types';
 import TestAuthProvider from '../../authentication/testAuthProvider';
-import { flushPromises } from '../../setupTests';
+import { flushPromises } from '../../testUtils';
 import { authState, initialState } from '../reducers/scigateway.reducer';
 import { buildTheme } from '../../theming';
 import { thunk } from 'redux-thunk';

src/testUtils.tsx

@@ -0,0 +1,2 @@
+export const flushPromises = async (): Promise<unknown> =>
+  (await vi.importActual('timers')).setImmediate;

tsconfig.build.json

@@ -1,5 +1,5 @@
 {
   "extends": "./tsconfig.base.json",
   // Exclude test files from build
-  "exclude": ["**/?*test.*", "src/setupTests.ts"],
+  "exclude": ["**/?*test.*", "src/setupTests.ts", "src/testUtils.tsx"],
 }