Merge branch 'master' into release-v12.0.4

CHANGELOG.md

@@ -7,6 +7,7 @@
 * *BREAKING* Provide necessary props for browse lookup facets. Remove the facets state reset functionality. Refs UIIN-3099.
 * React v19: refactor away from default props for functional components. Refs UIIN-2890.
 * User can edit Source consortium "Holdings sources" in member tenant but not in Consortia manager. Refs UIIN-3147.
+* React 19: refactor away from react-dom/test-utils. Refs UIIN-2888.
 
 ## [12.0.5] (IN PROGRESS)
 

src/Instance/InstanceEdit/InstanceField/InstanceField.test.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import { act, screen } from '@folio/jest-config-stripes/testing-library/react';
 import { noop, keyBy } from 'lodash';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { act } from 'react-dom/test-utils';
+
 import '../../../../test/jest/__mock__';
 
 import { StripesContext } from '@folio/stripes/core';

src/Instance/ItemsList/ItemsListContainer.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { act } from 'react-dom/test-utils';
+import { act } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../test/jest/__mock__';
 

src/Instance/ItemsList/tests/ItemsList.test.js

@@ -1,8 +1,7 @@
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { act } from 'react-dom/test-utils';
-import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import { act, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 

src/components/ViewSource/ViewSource.test.js

@@ -3,9 +3,9 @@ import {
   BrowserRouter as Router,
   useHistory,
 } from 'react-router-dom';
-import { act } from 'react-dom/test-utils';
 
 import {
+  act,
   screen,
   waitFor,
   fireEvent,
@@ -27,7 +27,6 @@ jest.mock('react-router-dom', () => ({
     push: jest.fn(),
   }),
 }));
-
 jest.mock('../../common/hooks/useGoBack', () => jest.fn());
 jest.mock('../../hooks', () => ({
   ...jest.requireActual('../../hooks'),