Merge pull request #4064 from ProjectMirador/test-warnings

Clean up some test warnings
ProjectMirador · Dec 18, 2024 · 01ebfc1 · 01ebfc1
2 parents 8302554 + d85dadc
commit 01ebfc1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/__tests__/src/components/SearchPanelControls.test.js b/__tests__/src/components/SearchPanelControls.test.js
@@ -1,3 +1,4 @@
+import { cloneElement } from 'react';
 import { render, screen } from '@tests/utils/test-utils';
 import userEvent from '@testing-library/user-event';
 
@@ -7,13 +8,16 @@ import { SearchPanelControls } from '../../../src/components/SearchPanelControls
  * Helper function to create a shallow wrapper around AttributionPanel
  */
 function createWrapper(props) {
-  return render(
+  const component = (
     <SearchPanelControls
       companionWindowId="cw"
       windowId="window"
+      fetchSearch={vi.fn()}
+      searchService={{ id: 'http://example.com/search' }}
       {...props}
-    />,
+    />
   );
+  return { component, ...render(component) };
 }
 
 describe('SearchPanelControls', () => {
@@ -110,16 +114,10 @@ describe('SearchPanelControls', () => {
     });
 
     it('clears the local search state/input when the incoming query prop has been cleared', () => {
-      const wrapper = createWrapper({ query: 'Wolpertinger' });
+      const { component, rerender } = createWrapper({ query: 'Wolpertinger' });
       expect(screen.getByRole('combobox')).toHaveValue('Wolpertinger');
 
-      wrapper.rerender((
-        <SearchPanelControls
-          companionWindowId="cw"
-          windowId="window"
-          query=""
-        />
-      ));
+      rerender(cloneElement(component, { query: '' }));
 
       expect(screen.getByRole('combobox')).toHaveValue('');
     });

diff --git a/__tests__/src/components/SidebarIndexList.test.js b/__tests__/src/components/SidebarIndexList.test.js
@@ -16,6 +16,7 @@ function createWrapper(props) {
       id="asdf"
       canvases={canvases}
       classes={{}}
+      containerRef={{ current: null }}
       windowId="xyz"
       setCanvas={() => {}}
       config={{ canvasNavigation: { height: 100 } }}

diff --git a/src/components/ScrollTo.js b/src/components/ScrollTo.js
@@ -16,7 +16,7 @@ function usePrevious(value) {
  * ScrollTo ~
 */
 export function ScrollTo({
-  children, containerRef, offsetTop = 0, scrollTo, nodeId, ...otherProps
+  children, containerRef, offsetTop = 0, scrollTo, ...otherProps
 }) {
   const scrollToRef = useRef();
   const prevScrollTo = usePrevious(scrollTo);
@@ -60,7 +60,6 @@ ScrollTo.propTypes = {
     PropTypes.func,
     PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
   ]).isRequired,
-  nodeId: PropTypes.string.isRequired,
   offsetTop: PropTypes.number,
   scrollTo: PropTypes.bool.isRequired,
 };
diff --git a/src/components/SearchPanelControls.js b/src/components/SearchPanelControls.js
@@ -26,7 +26,7 @@ const getMatch = (option) => (isObject(option) ? option.match : option);
 /** */
 export function SearchPanelControls({
   autocompleteService = undefined, companionWindowId, fetchSearch, query = '',
-  searchIsFetching, searchService, windowId,
+  searchIsFetching = false, searchService, windowId,
 }) {
   const { t } = useTranslation();
   const [input, setInput] = useState(query);
@@ -157,7 +157,7 @@ SearchPanelControls.propTypes = {
   companionWindowId: PropTypes.string.isRequired,
   fetchSearch: PropTypes.func.isRequired,
   query: PropTypes.string,
-  searchIsFetching: PropTypes.bool.isRequired,
+  searchIsFetching: PropTypes.bool,
   searchService: PropTypes.shape({
     id: PropTypes.string,
   }).isRequired,

diff --git a/src/components/SearchPanelNavigation.js b/src/components/SearchPanelNavigation.js
@@ -74,9 +74,6 @@ SearchPanelNavigation.propTypes = {
   direction: PropTypes.string.isRequired,
   numTotal: PropTypes.number,
   searchHits: PropTypes.arrayOf(PropTypes.object), // eslint-disable-line react/forbid-prop-types
-  searchService: PropTypes.shape({
-    id: PropTypes.string,
-  }).isRequired,
   selectAnnotation: PropTypes.func.isRequired,
   selectedContentSearchAnnotation: PropTypes.arrayOf(PropTypes.string).isRequired,
   windowId: PropTypes.string.isRequired, // eslint-disable-line react/no-unused-prop-types

diff --git a/src/components/SidebarIndexList.js b/src/components/SidebarIndexList.js
@@ -76,7 +76,10 @@ export function SidebarIndexList({
 
 SidebarIndexList.propTypes = {
   canvases: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
-  containerRef: PropTypes.oneOf([PropTypes.func, PropTypes.object]).isRequired,
+  containerRef: PropTypes.oneOfType([
+    PropTypes.func,
+    PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
+  ]).isRequired,
   selectedCanvasIds: PropTypes.arrayOf(PropTypes.string),
   setCanvas: PropTypes.func.isRequired,
   variant: PropTypes.oneOf(['item', 'thumbnail']),