Refactor tests to use testHook and update to rtl

NIAEFEUP · Apr 11, 2023 · 83ec120 · 83ec120
1 parent f782aa1
commit 83ec120
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/src/components/HomePage/SearchResultsArea/Offer/useChipsFieldSearch.spec.js b/src/components/HomePage/SearchResultsArea/Offer/useChipsFieldSearch.spec.js
@@ -1,9 +1,8 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-import React from "react";
 import { MemoryRouter, useLocation } from "react-router-dom";
 import qs from "qs";
 
-import { renderWithStoreAndTheme, TestComponent } from "../../../../test-utils";
+import { testHookWithStoreAndTheme } from "../../../../test-utils";
 import { act } from "react-dom/test-utils";
 import useChipsFieldSearch from "./useChipsFieldSearch";
 import { createTheme } from "@material-ui/core";
@@ -28,14 +27,7 @@ describe("useChipsFieldSearch", () => {
             location = useLocation();
         };
 
-
-        renderWithStoreAndTheme(
-            <MemoryRouter initialEntries={["/"]}>
-                <TestComponent callback={callback} />
-            </MemoryRouter>,
-            { initialState, theme }
-        );
-
+        testHookWithStoreAndTheme(callback, initialState, theme, MemoryRouter);
 
         expect(location).toHaveProperty("search", "");
 
@@ -80,13 +72,7 @@ describe("useChipsFieldSearch", () => {
             location = useLocation();
         };
 
-
-        renderWithStoreAndTheme(
-            <MemoryRouter initialEntries={["/"]}>
-                <TestComponent callback={callback} />
-            </MemoryRouter>,
-            { initialState, theme }
-        );
+        testHookWithStoreAndTheme(callback, initialState, theme, MemoryRouter, { initialEntries: ["/"] });
 
 
         expect(location).toHaveProperty("search", "");

diff --git a/src/test-utils.js b/src/test-utils.js
@@ -44,13 +44,25 @@ export const TestComponent = ({ callback }) => {
 };
 
 export const testHook = (callback, Wrapper = React.Fragment, wrapperProps = {}) => {
-    mount(
+    defaultRender(
         <Wrapper {...wrapperProps}>
             <TestComponent callback={callback} />
         </Wrapper>
     );
 };
 
+export const testHookWithStoreAndTheme = (callback, initialState, theme, Wrapper = React.Fragment, wrapperProps = {}) => {
+    renderWithStoreAndTheme(
+        <Wrapper {...wrapperProps}>
+            <TestComponent callback={callback} />
+        </Wrapper>,
+        {
+            initialState,
+            theme,
+        }
+    );
+};
+
 const [queryDescriptionOf, , getDescriptionOf, , findDescriptionOf] = buildQueries(
     function queryAllDescriptionsOf(container, element) {
         return container.querySelectorAll(`#${element.getAttribute("aria-describedby")}`);