Merge pull request #1107 from folio-org/UIREQ-996

UIREQ-996: Update Jest/RTL tests
folio-org · Nov 17, 2023 · 2d67e36 · 2d67e36
2 parents 2c40d08 + 70974fc
commit 2d67e36
Show file tree

Hide file tree

Showing 47 changed files with 56 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Hide all actions except "Cancel Request" in Action menu and DCB item links (Pickup library). Refs UIREQ-1035.
 * Request Action - Create new option Print search slips. Refs UIREQ-1039.
 * Hide Actions menu on closed request of DCB Transaction. Refs UIREQ-1040.
+* Update Jest/RTL tests, remove outdated imports. Refs UIREQ-996.
 
 ## [9.0.0](https://github.com/folio-org/ui-requests/tree/v9.0.0) (2023-10-12)
 [Full Changelog](https://github.com/folio-org/ui-requests/compare/v8.0.2...v9.0.0)

diff --git a/src/CancelRequestDialog.test.js b/src/CancelRequestDialog.test.js
@@ -4,8 +4,6 @@ import {
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../test/jest/__mock__';
-
 import CancelRequestDialog from './CancelRequestDialog';
 
 const labelIds = {

diff --git a/src/ChooseRequestTypeDialog.test.js b/src/ChooseRequestTypeDialog.test.js
@@ -1,11 +1,8 @@
-import React from 'react';
 import {
   render,
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../test/jest/__mock__';
-
 import { Button } from '@folio/stripes/components';
 
 import { Loading } from './components';

diff --git a/src/ItemDetail.test.js b/src/ItemDetail.test.js
@@ -1,13 +1,11 @@
-import React from 'react';
 import {
   render,
   screen,
   within,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../test/jest/__mock__';
-
 import ItemDetail from './ItemDetail';
+
 import { INVALID_REQUEST_HARDCODED_ID } from './constants';
 
 jest.mock('react-router-dom', () => ({

diff --git a/src/ItemsDialog.test.js b/src/ItemsDialog.test.js
@@ -1,11 +1,8 @@
-import React from 'react';
 import {
   render,
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../test/jest/__mock__';
-
 import {
   Modal,
   MultiColumnList,
@@ -137,7 +134,7 @@ describe('ItemsDialog', () => {
     });
 
     it('should render Modal', () => {
-      expect(Modal).toHaveBeenLastCalledWith(
+      expect(Modal).toHaveBeenCalledWith(
         expect.objectContaining({
           'data-test-move-request-modal': true,
           label: labelIds.selectItem,

diff --git a/src/MoveRequestManager.test.js b/src/MoveRequestManager.test.js
@@ -7,8 +7,6 @@ import {
 } from '@folio/jest-config-stripes/testing-library/react';
 import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
-import '../test/jest/__mock__';
-
 import MoveRequestManager from './MoveRequestManager';
 import ItemsDialog from './ItemsDialog';
 import ChooseRequestTypeDialog from './ChooseRequestTypeDialog';

diff --git a/src/PatronBlockModal.test.js b/src/PatronBlockModal.test.js
@@ -5,8 +5,6 @@ import {
   fireEvent,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../test/jest/__mock__';
-
 import { Modal } from '@folio/stripes/components';
 
 import PatronBlockModal from './PatronBlockModal';

diff --git a/src/PositionLink.test.js b/src/PositionLink.test.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   render,
   screen,
@@ -8,8 +7,6 @@ import {
   requestStatuses,
 } from './constants';
 
-import '../test/jest/__mock__';
-
 import PositionLink from './PositionLink';
 
 jest.mock('react-router-dom', () => ({

diff --git a/src/RequestForm.test.js b/src/RequestForm.test.js
@@ -1,6 +1,7 @@
-import React from 'react';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
+import { Field } from 'react-final-form';
+
 import {
   render,
   screen,
@@ -9,10 +10,6 @@ import {
   waitFor,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../test/jest/__mock__';
-
-import { Field } from 'react-final-form';
-
 import {
   Checkbox,
   CommandList,

diff --git a/src/RequestFormContainer.test.js b/src/RequestFormContainer.test.js
@@ -1,17 +1,15 @@
-import React from 'react';
 import {
   Router,
 } from 'react-router-dom';
 import {
   createMemoryHistory,
 } from 'history';
+
 import {
   render,
   act,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../test/jest/__mock__';
-
 import RequestFormContainer from './RequestFormContainer';
 import RequestForm from './RequestForm';
 

diff --git a/src/UserDetail.test.js b/src/UserDetail.test.js
@@ -4,8 +4,6 @@ import {
   cleanup,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../test/jest/__mock__';
-
 import { NoValue } from '@folio/stripes/components';
 
 import UserDetail from './UserDetail';

diff --git a/src/UserForm.test.js b/src/UserForm.test.js
@@ -2,6 +2,7 @@ import {
   render,
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
+
 import { ProxyManager } from '@folio/stripes/smart-components';
 
 import UserForm from './UserForm';

diff --git a/src/ViewRequest.test.js b/src/ViewRequest.test.js
@@ -1,14 +1,11 @@
-import React from 'react';
+import moment from 'moment-timezone';
+
 import {
   render,
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
-import moment from 'moment-timezone';
-
-import '../test/jest/__mock__';
 
 import {
-  Pane,
   CommandList,
   defaultKeyboardShortcuts,
 } from '@folio/stripes/components';
@@ -34,12 +31,6 @@ jest.mock('./UserDetail', () => jest.fn(() => null));
 jest.mock('./CancelRequestDialog', () => jest.fn(() => null));
 jest.mock('./PositionLink', () => jest.fn(() => null));
 jest.mock('./components/TitleInformation', () => jest.fn(() => null));
-Pane.mockImplementation(({ children, actionMenu }) => (
-  <div>
-    {children}
-    {actionMenu({ onToggle: jest.fn() })}
-  </div>
-));
 
 describe('ViewRequest', () => {
   const labelIds = {

diff --git a/src/components/ComponentToPrint/ComponentToPrint.test.js b/src/components/ComponentToPrint/ComponentToPrint.test.js
@@ -1,5 +1,5 @@
-import React from 'react';
 import { Parser } from 'html-to-react';
+
 import {
   render,
   screen,

diff --git a/src/components/ErrorModal/ErrorModal.test.js b/src/components/ErrorModal/ErrorModal.test.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   render,
   screen,
@@ -7,8 +6,6 @@ import {
 
 import { runAxeTest } from '@folio/stripes-testing';
 
-import '../../../test/jest/__mock__';
-
 import ErrorModal from './ErrorModal';
 
 describe('ErrorModal', () => {

diff --git a/src/components/FulfilmentPreference/FulfilmentPreference.test.js b/src/components/FulfilmentPreference/FulfilmentPreference.test.js
@@ -1,14 +1,12 @@
+import { FormattedMessage } from 'react-intl';
+
 import {
   render,
   screen,
   fireEvent,
   cleanup,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../../../test/jest/__mock__';
-
-import { FormattedMessage } from 'react-intl';
-
 import FulfilmentPreference, {
   validate,
 } from './FulfilmentPreference';

diff --git a/src/components/InstanceInformation/InstanceInformation.test.js b/src/components/InstanceInformation/InstanceInformation.test.js
@@ -1,4 +1,6 @@
 import { useState } from 'react';
+import { Field } from 'react-final-form';
+
 import {
   render,
   screen,
@@ -7,9 +9,6 @@ import {
   waitFor,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../../../test/jest/__mock__';
-
-import { Field } from 'react-final-form';
 import {
   Icon,
   TextField,

diff --git a/src/components/ItemInformation/ItemInformation.test.js b/src/components/ItemInformation/ItemInformation.test.js
@@ -1,15 +1,13 @@
 import { useState } from 'react';
+import { Field } from 'react-final-form';
+
 import {
   render,
   screen,
   fireEvent,
   cleanup,
   waitFor,
 } from '@folio/jest-config-stripes/testing-library/react';
-
-import '../../../test/jest/__mock__';
-
-import { Field } from 'react-final-form';
 import {
   Icon,
   TextField,

diff --git a/src/components/Loading/Loading.test.js b/src/components/Loading/Loading.test.js
@@ -3,8 +3,6 @@ import {
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../../../test/jest/__mock__';
-
 import { Layout } from '@folio/stripes/components';
 
 import Loading from './Loading';

diff --git a/src/components/LoadingButton/LoadingButton.test.js b/src/components/LoadingButton/LoadingButton.test.js
@@ -3,8 +3,6 @@ import {
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '__mock__';
-
 import {
   Button,
   Icon,

diff --git a/src/components/PrintButton/PrintButton.test.js b/src/components/PrintButton/PrintButton.test.js
@@ -1,12 +1,10 @@
+import ReactToPrint from 'react-to-print';
+
 import {
   render,
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../../../test/jest/__mock__';
-
-import ReactToPrint from 'react-to-print';
-
 import PrintButton from './PrintButton';
 
 const testIds = {

diff --git a/src/components/PrintContent/PrintContent.test.js b/src/components/PrintContent/PrintContent.test.js
@@ -4,8 +4,6 @@ import {
   cleanup,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../../../test/jest/__mock__';
-
 import PrintContent from './PrintContent';
 import ComponentToPrint from '../ComponentToPrint';
 

diff --git a/src/components/ReferredRecord/ReferredRecord.test.js b/src/components/ReferredRecord/ReferredRecord.test.js
@@ -1,5 +1,3 @@
-import '../../../test/jest/__mock__';
-
 import {
   render,
   screen,

diff --git a/src/components/RequestFormShortcutsWrapper/RequestsFormShortcutsWrapper.test.js b/src/components/RequestFormShortcutsWrapper/RequestsFormShortcutsWrapper.test.js
@@ -1,8 +1,5 @@
-import React from 'react';
 import { render } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../../../test/jest/__mock__';
-
 import {
   CommandList,
   defaultKeyboardShortcuts,

diff --git a/src/components/RequestInformation/RequestInformation.test.js b/src/components/RequestInformation/RequestInformation.test.js
@@ -1,15 +1,13 @@
 import { useState } from 'react';
+import { Field } from 'react-final-form';
+
 import {
   render,
   screen,
   fireEvent,
   cleanup,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import '../../../test/jest/__mock__';
-
-import { Field } from 'react-final-form';
-
 import { Select } from '@folio/stripes/components';
 
 import RequestInformation, {

diff --git a/src/components/RequesterInformation/RequesterInformation.test.js b/src/components/RequesterInformation/RequesterInformation.test.js
@@ -1,4 +1,6 @@
 import { useState } from 'react';
+import { Field } from 'react-final-form';
+
 import {
   render,
   screen,
@@ -7,7 +9,6 @@ import {
   waitFor,
 } from '@folio/jest-config-stripes/testing-library/react';
 
-import { Field } from 'react-final-form';
 import {
   Icon,
   TextField,

diff --git a/src/components/RequestsFilters/PickupServicePointFilter/PickupServicePointFilter.test.js b/src/components/RequestsFilters/PickupServicePointFilter/PickupServicePointFilter.test.js
@@ -4,8 +4,6 @@ import {
 } from '@folio/jest-config-stripes/testing-library/react';
 import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
-import '__mock__';
-
 import {
   Accordion,
   FilterAccordionHeader,

diff --git a/src/components/RequestsFilters/RequestLevelFilter/RequestLevelFilter.js b/src/components/RequestsFilters/RequestLevelFilter/RequestLevelFilter.js
@@ -40,6 +40,7 @@ const RequestLevelFilter = ({
     <Accordion
       displayClearButton={!isEmpty(activeValues)}
       id={name}
+      data-testid="requestLevelFilter"
       header={FilterAccordionHeader}
       label={formatMessage({ id: 'ui-requests.requestLevel' })}
       name={name}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ import { @@
       render,
       screen,
     } from '@folio/jest-config-stripes/testing-library/react';
     import { ProxyManager } from '@folio/stripes/smart-components';
     import UserForm from './UserForm';
@@ Expand Down @@