Merge branch 'master' into UISACQCOMP-218

folio-org · Sep 20, 2024 · ea94317 · ea94317
2 parents bfcf518 + 8a6d401
commit ea94317
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 40 deletions.
diff --git a/lib/AcqUnitFilter/AcqUnitFilter.test.js b/lib/AcqUnitFilter/AcqUnitFilter.test.js
@@ -1,5 +1,5 @@
 import { noop } from 'lodash';
-import { render, cleanup, screen } from '@testing-library/react';
+import { render, cleanup } from '@testing-library/react';
 import user from '@testing-library/user-event';
 
 import AcqUnitFilter from './AcqUnitFilter';
@@ -23,9 +23,11 @@ describe('AcqUnitFilter component', () => {
   afterEach(cleanup);
 
   it('should render all passed options', async () => {
-    const { findAllByText } = renderAcqUnitFilter(acqUnitsRecords);
+    const { findAllByText, getByText } = renderAcqUnitFilter(acqUnitsRecords);
 
-    user.click(screen.getByText('stripes-components.selection.controlLabel'));
+    await fireEvent.click(getByText('stripes-components.selection.controlLabel'));
+
+    user.click(getByText('stripes-components.selection.controlLabel'));
     const renderedFilterOptions = await findAllByText(/Unit #[0-9]/);
 
     expect(renderedFilterOptions.length).toBe(acqUnitsRecords.length);

diff --git a/lib/AffiliationsSelection/AffiliationsSelection.test.js b/lib/AffiliationsSelection/AffiliationsSelection.test.js
@@ -11,6 +11,17 @@ import { AffiliationsSelection } from './AffiliationsSelection';
 jest.unmock('@folio/stripes/components');
 jest.unmock('@folio/stripes/smart-components');
 
+jest.mock('@folio/stripes/components', () => ({
+  ...jest.requireActual('@folio/stripes/components'),
+  Selection: ({ id, dataOptions }) => (
+    <ul id={id}>
+      {
+        dataOptions.map((o) => <li>{o.label}</li>)
+      }
+    </ul>
+  ),
+}));
+
 const defaultProps = {
   id: 'test',
   affiliations,
@@ -37,7 +48,7 @@ describe('AffiliationsSelection', () => {
     await user.click(screen.getByText('stripes-components.selection.controlLabel'));
     affiliations.forEach(({ tenantName, isPrimary }) => {
       expect(
-        within(document.getElementById('sl-container-test-affiliations-select'))
+        within(document.getElementById('test-affiliations-select'))
           .getByText(isPrimary ? `${tenantName} stripes-acq-components.consortia.affiliations.primary.label` : tenantName),
       ).toBeInTheDocument();
     });

diff --git a/lib/ConsortiumFieldInventory/ConsortiumFieldInventory.test.js b/lib/ConsortiumFieldInventory/ConsortiumFieldInventory.test.js
@@ -59,12 +59,7 @@ describe('ConsortiumFieldInventory', () => {
 
     renderConsortiumFieldInventory({ onAffiliationChange });
 
-    const button = screen.getAllByText('stripes-components.selection.controlLabel');
-
-    expect(button[0]).toBeInTheDocument();
-
-    await userEvent.click(button[0]);
-    await screen.findByText(tenants[1].name);
+    await userEvent.click(screen.getAllByText('stripes-components.selection.controlLabel')[0]);
     await userEvent.click(screen.getByText(tenants[1].name));
 
     expect(onAffiliationChange).toHaveBeenCalled();

diff --git a/lib/CountryFilter/CountryFilter.test.js b/lib/CountryFilter/CountryFilter.test.js
@@ -27,10 +27,17 @@ describe('CountryFilter component', () => {
 
   it('should invoke onChange callback when something is selected', async () => {
     const onChangeFilter = jest.fn();
-    const { getByText, findByText } = renderFilter(false, onChangeFilter);
+    const { container, getByText } = renderFilter(false, onChangeFilter);
+    const button = container.querySelector('[id="org-filter-country-selection"]');
 
-    await user.click(getByText('stripes-components.selection.controlLabel'));
-    await user.click(await findByText('AF'));
+    fireEvent.click(button);
+
+    const afgOption = getByText('AF');
+
+    expect(button).toBeEnabled();
+    expect(onChangeFilter).not.toHaveBeenCalled();
+
+    fireEvent.click(afgOption);
 
     expect(onChangeFilter).toHaveBeenCalled();
   });

diff --git a/lib/Currency/FieldCurrency/FieldCurrency.test.js b/lib/Currency/FieldCurrency/FieldCurrency.test.js
@@ -31,11 +31,13 @@ const renderComponent = (props = {}) => (render(
 describe('FieldCurrency', () => {
   it('should display CurrencyValue if non-interactive', () => {
     renderComponent({ isNonInteractive: true, value: 'EUR' });
+
     expect(screen.getByText('EUR')).toBeDefined();
   });
 
   it('should display FieldCurrency', () => {
     renderComponent();
+
     expect(screen.getByText('stripes-acq-components.currency')).toBeDefined();
   });
 
@@ -46,6 +48,7 @@ describe('FieldCurrency', () => {
 
     user.click(screen.getByText('stripes-components.selection.controlLabel'));
     user.click(screen.getByText('USD (USD)'));
+
     expect(onChange).toHaveBeenCalled();
   });
 });
diff --git a/lib/DeleteHoldingsModal/DeleteHoldingsModal.test.js b/lib/DeleteHoldingsModal/DeleteHoldingsModal.test.js
@@ -46,7 +46,10 @@ describe('DeleteHoldingsModal', () => {
   it('should call onConfirm when \'Delete holdings\' btn was clicked', async () => {
     renderDeleteHoldingsModal();
 
-    const button = screen.getAllByText('stripes-acq-components.holdings.deleteModal.heading');
+    const deleteBtn = await screen.findByRole('button', {
+      name: 'stripes-acq-components.holdings.deleteModal.heading',
+      hidden: true,
+    });
 
     user.click(button[1]);
     expect(defaultProps.onConfirm).toHaveBeenCalled();

diff --git a/lib/DynamicSelection/DynamicSelection.test.js b/lib/DynamicSelection/DynamicSelection.test.js
@@ -64,9 +64,9 @@ describe('DynamicSelection', () => {
       await user.type(input, '1');
       jest.advanceTimersByTime(1500);
     });
-    await user.click(screen.getByText('stripes-components.selection.controlLabel'));
-
-    user.click(screen.getByText(/1111/));
+
+    user.click(screen.getByText('stripes-components.selection.controlLabel'));
+    user.click(screen.getByText(/11111/));
 
     expect(defaultProps.onChange).toHaveBeenCalled();
   });

diff --git a/lib/DynamicSelectionFilter/DynamicSelectionFilter.test.js b/lib/DynamicSelectionFilter/DynamicSelectionFilter.test.js
@@ -56,13 +56,7 @@ describe('DynamicSelectionFilter', () => {
       renderDynamicSelectionFilter();
     });
 
-    const input = screen.getByLabelText('stripes-components.selection.filterOptionsLabel', { selector: 'input' });
-
-    await act(async () => {
-      await user.type(input, '1');
-      jest.advanceTimersByTime(1500);
-    });
-    await user.click(screen.getByText('stripes-components.selection.controlLabel'));
+    user.click(screen.getByText('stripes-components.selection.controlLabel'));
     user.click(screen.getByText(/11111/));
 
     expect(defaultProps.onChange).toHaveBeenCalled();

diff --git a/lib/FieldHolding/FieldHolding.test.js b/lib/FieldHolding/FieldHolding.test.js
@@ -1,5 +1,5 @@
 import keyBy from 'lodash/keyBy';
-import { render, screen, within } from '@testing-library/react';
+import { fireEvent, render, screen, within } from '@testing-library/react';
 import user from '@testing-library/user-event';
 import { Form } from 'react-final-form';
 
@@ -59,7 +59,9 @@ describe('FieldHolding component', () => {
   });
 
   it('should render holding options', async () => {
-    const { findAllByText } = renderFieldHolding({});
+    const { findAllByText, getByText } = renderFieldHolding({});
+
+    fireEvent.click(getByText('stripes-components.selection.controlLabel'));
 
     const button = screen.getByText('stripes-components.selection.controlLabel');
 

diff --git a/lib/FieldLocation/FieldLocationFinal.test.js b/lib/FieldLocation/FieldLocationFinal.test.js
@@ -1,5 +1,4 @@
-import { render, cleanup, screen } from '@testing-library/react';
-import user from '@testing-library/user-event';
+import { render, cleanup, screen, fireEvent } from '@testing-library/react';
 import { Form } from 'react-final-form';
 
 import FieldLocationFinal from './FieldLocationFinal';
@@ -45,9 +44,7 @@ describe('FieldLocationFinal component', () => {
   it('should render all passed options', async () => {
     renderFieldLocationFinal();
 
-    const button = screen.getByText('stripes-components.selection.controlLabel');
-
-    await user.click(button);
+    fireEvent.click(screen.getByText('stripes-components.selection.controlLabel'));
 
     const renderedLocationOptions = await screen.findAllByText(/Location #[0-9]/);
 

diff --git a/lib/FieldLocation/FieldLocationFinalContainer.test.js b/lib/FieldLocation/FieldLocationFinalContainer.test.js
@@ -1,5 +1,4 @@
-import { render, screen } from '@testing-library/react';
-import user from '@testing-library/user-event';
+import { render, screen, fireEvent } from '@testing-library/react';
 import { Form } from 'react-final-form';
 
 import FieldLocationFinalContainer from './FieldLocationFinalContainer';
@@ -33,12 +32,12 @@ const renderFieldLocationFinalContainer = (props = {}, formProps = {}) => (rende
 ));
 
 describe('FieldLocationFinalContainer component', () => {
-  beforeEach(async () => {
+  beforeEach(() => {
     renderFieldLocationFinalContainer();
 
     const button = screen.getByText('stripes-components.selection.controlLabel');
 
-    await user.click(button);
+    fireEvent.click(button);
   });
 
   it('should display passed label', () => {
@@ -50,6 +49,8 @@ describe('FieldLocationFinalContainer component', () => {
   it('should render options based on passed locationIds', async () => {
     renderFieldLocationFinalContainer();
 
+    fireEvent.click(screen.getByText('stripes-components.selection.controlLabel'));
+
     const renderedLocationOptions = await screen.findAllByText(/Location #[0-9]/);
 
     expect(renderedLocationOptions.length).toBe(locationsIds.length);
@@ -60,6 +61,8 @@ describe('FieldLocationFinalContainer component', () => {
       filterLocations: (records) => records.slice(0, 2),
     });
 
+    fireEvent.click(screen.getByText('stripes-components.selection.controlLabel'));
+
     const renderedLocationOptions = await screen.findAllByText(/Location #[0-9]/);
 
     expect(renderedLocationOptions).toHaveLength(2);

diff --git a/lib/FindLocation/FindLocationLookup.test.js b/lib/FindLocation/FindLocationLookup.test.js
@@ -179,6 +179,8 @@ describe('FindLocationLookup', () => {
 
     await user.click(screen.getByText('stripes-components.selection.controlLabel'));
     expect(affiliationSelection).toBeInTheDocument();
+
+    await user.click(screen.getByText('stripes-components.selection.controlLabel'));
     await user.click(screen.getByText(mockTenants[1].name));
 
     expect(onTenantChange).toHaveBeenCalledWith(mockTenants[1].id);

diff --git a/lib/FundFilter/FundFilter.test.js b/lib/FundFilter/FundFilter.test.js
@@ -1,5 +1,5 @@
 import { noop } from 'lodash';
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import user from '@testing-library/user-event';
 import { IntlProvider } from 'react-intl';
 
@@ -47,9 +47,11 @@ describe('FundFilter component', () => {
   });
 
   it('should render all passed options', async () => {
-    const { findAllByText } = renderFundFilter(fundRecords);
+    const { findAllByText, getByText } = renderFundFilter(fundRecords);
 
-    user.click(screen.getByText('stripes-components.selection.controlLabel'));
+    fireEvent.click(getByText('stripes-components.selection.controlLabel'));
+
+    fireEvent.click(getByText('stripes-components.selection.controlLabel'));
     const renderedFilterOptions = await findAllByText(/Fund #[0-9]/);
 
     expect(renderedFilterOptions.length).toBe(fundRecords.length);

diff --git a/lib/LanguageFilter/LanguageFilter.test.js b/lib/LanguageFilter/LanguageFilter.test.js
@@ -25,7 +25,18 @@ describe('LanguageFilter component', () => {
 
   it('should invoke onChange callback when something is selected', async () => {
     const onChangeFilter = jest.fn();
-    const { findByText } = renderFilter(false, onChangeFilter);
+
+    const { container, getByText } = renderFilter(false, onChangeFilter);
+    const button = container.querySelector('[id="org-filter-language-selection"]');
+
+    fireEvent.click(button);
+
+    const option = getByText('Abkhazian');
+
+    expect(button).toBeEnabled();
+    expect(onChangeFilter).not.toHaveBeenCalled();
+
+    fireEvent.click(option);
 
     await user.click(screen.getByText('stripes-components.selection.controlLabel'));
     await user.click(await findByText('Zulu'));

diff --git a/lib/hooks/consortia/useConsortiumTenants/useConsortiumTenants.js b/lib/hooks/consortia/useConsortiumTenants/useConsortiumTenants.js
@@ -37,7 +37,7 @@ export const useConsortiumTenants = (options = {}) => {
   } = useQuery({
     queryKey: [namespace, consortium?.id],
     queryFn: ({ signal }) => ky.get(
-      `${CONSORTIA_API}/${consortium.id}/${CONSORTIA_CONSORTIUM_TENANTS_API}`,
+      `${CONSORTIA_API}/${consortium.id}/${CONSORTIA_CONSORTIUM_TENANTS_API}?limit=1000`,
       { signal },
     ).json(),
     enabled,