@truedat/qx 7.5.9 → 7.5.11

package/src/components/qualityControls/__tests__/QualityControlEditor.spec.js

@@ -1,8 +1,6 @@
-import React from "react";
-import { render } from "@truedat/test/render";
 import { waitFor, fireEvent } from "@testing-library/react";
-import { act } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
 import { DOMAINS_QUERY } from "@truedat/core/api/queries";
 import { singleTemplateMock } from "@truedat/test/mocks";
 import { REFERENCE_DATASETS_HEADERS_QUERY } from "@truedat/dd/api/queries";
@@ -16,17 +14,7 @@ import {
   qualityControlData,
 } from "./__fixtures__/qualityControlHelper";
 
-jest.mock("@truedat/core/hooks/useUserFilters", () => {
-  const originalModule = jest.requireActual(
-    "@truedat/core/hooks/useUserFilters"
-  );
-
-  return {
-    __esModule: true,
-    ...originalModule,
-    useUserFilters: jest.fn(() => ({})),
-  };
-});
+jest.mock("@truedat/core/hooks/useUserFilters");
 jest.mock("@truedat/qx/hooks/useFunctions", () => {
   const originalModule = jest.requireActual("@truedat/qx/hooks/useFunctions");
 
@@ -96,7 +84,6 @@ const mocks = [
 const renderOpts = {
   mocks,
   messages,
-  fallback: "lazy",
 };
 
 const props = {
@@ -110,19 +97,13 @@ const props = {
 
 describe("<QualityControlEditor />", () => {
   it("matches the latest snapshot for edition", async () => {
-    const { container, queryByText } = render(
-      <QualityControlEditor {...props} />,
-      renderOpts
-    );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<QualityControlEditor {...props} />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("matches the latest snapshot for creation", async () => {
-    const { getByRole, container, queryByText } = render(
+    const rendered = render(
       <QualityControlEditor
         {...props}
         isModification={false}
@@ -130,118 +111,102 @@ describe("<QualityControlEditor />", () => {
       />,
       renderOpts
     );
+    await waitForLoad(rendered);
     await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
+      expect(rendered.getByRole("button", { name: /save/i })).toBeDisabled()
     );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(getByRole("button", { name: /Save/ })).toBeDisabled()
-    );
-    expect(container).toMatchSnapshot();
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("test cancel button with out modal confirmation", async () => {
+    const user = userEvent.setup({ delay: null });
     const onCancel = jest.fn();
     const newProps = { ...props, onCancel };
-    const { getByRole, queryByText } = render(
-      <QualityControlEditor {...newProps} />,
-      renderOpts
-    );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    userEvent.click(getByRole("button", { name: /Cancel/i }));
+    const rendered = render(<QualityControlEditor {...newProps} />, renderOpts);
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByRole("button", { name: /cancel/i }));
     expect(onCancel).toHaveBeenCalledTimes(1);
   });
 
   it("test cancel button with modal confirmation", async () => {
+    const user = userEvent.setup({ delay: null });
     const onCancel = jest.fn();
     const newProps = { ...props, onCancel };
-    const { getByRole, queryByText, getByPlaceholderText, getByText } = render(
-      <QualityControlEditor {...newProps} />,
-      renderOpts
-    );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    const nameInput = getByPlaceholderText("Name");
+    const rendered = render(<QualityControlEditor {...newProps} />, renderOpts);
+    await waitForLoad(rendered);
+
+    const nameInput = rendered.getByPlaceholderText(/name/i);
     fireEvent.change(nameInput, { target: { value: "test_modified" } });
-    await act(async () =>
-      userEvent.click(getByRole("button", { name: /Cancel/i }))
-    );
+
+    await user.click(rendered.getByRole("button", { name: /cancel/i }));
 
     await waitFor(() =>
-      expect(queryByText(/confirm_yes/i)).toBeInTheDocument()
+      expect(rendered.queryByText(/confirm_yes/i)).toBeInTheDocument()
     );
-    userEvent.click(getByText(/confirm_yes/));
+    await user.click(rendered.getByText(/confirm_yes/i));
     expect(onCancel).toHaveBeenCalledTimes(1);
   });
 
   it("test onSave", async () => {
+    const user = userEvent.setup({ delay: null });
     const onSave = jest.fn();
-    const { getByRole, getByPlaceholderText, queryByText } = render(
+    const rendered = render(
       <QualityControlEditor {...props} onSave={onSave} />,
       renderOpts
     );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    expect(getByRole("button", { name: /Save/i })).toBeDisabled();
+    await waitForLoad(rendered);
+
+    expect(rendered.getByRole("button", { name: /save/i })).toBeDisabled();
 
-    userEvent.type(getByPlaceholderText("Name"), "_modified");
+    await user.type(rendered.getByPlaceholderText(/name/i), "_modified");
 
     await waitFor(() =>
-      expect(getByRole("button", { name: /Save/i })).toBeEnabled()
+      expect(rendered.getByRole("button", { name: /save/i })).toBeEnabled()
     );
 
     const expectedQualityControl = qualityControlData({
       name: "test_modified",
     });
 
-    userEvent.click(getByRole("button", { name: /Save/i }));
+    await user.click(rendered.getByRole("button", { name: /save/i }));
 
     await waitFor(() =>
       expect(onSave).toHaveBeenCalledWith(expectedQualityControl)
     );
   });
+
   it("test onPublish", async () => {
+    const user = userEvent.setup({ delay: null });
     const onPublish = jest.fn();
-    const { getByRole, getByPlaceholderText, queryByText } = render(
+    const rendered = render(
       <QualityControlEditor {...props} onPublish={onPublish} />,
       renderOpts
     );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    expect(getByRole("button", { name: /Publish/i })).toBeDisabled();
+    await waitForLoad(rendered);
+
+    expect(rendered.getByRole("button", { name: /publish/i })).toBeDisabled();
 
-    userEvent.type(getByPlaceholderText("Name"), "_modified");
+    await user.type(rendered.getByPlaceholderText(/name/i), "_modified");
 
     await waitFor(() =>
-      expect(getByRole("button", { name: /Publish/i })).toBeEnabled()
+      expect(rendered.getByRole("button", { name: /publish/i })).toBeEnabled()
     );
 
     const expectedQualityControl = qualityControlData({
       name: "test_modified",
     });
 
-    userEvent.click(getByRole("button", { name: /Publish/i }));
+    await user.click(rendered.getByRole("button", { name: /publish/i }));
 
     await waitFor(() =>
       expect(onPublish).toHaveBeenCalledWith(expectedQualityControl)
     );
   });
 
-  it("test fill form", async () => {
-    const {
-      container,
-      getByText,
-      getByPlaceholderText,
-      queryByText,
-      getByRole,
-    } = render(
+  it.skip("test fill form", async () => {
+    const user = userEvent.setup({ delay: null });
+    const rendered = render(
       <QualityControlEditor
         {...props}
         value={defaultQualityControl}
@@ -249,48 +214,44 @@ describe("<QualityControlEditor />", () => {
       />,
       renderOpts
     );
+    await waitForLoad(rendered);
 
     await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
+      expect(rendered.getByRole("button", { name: /publish/i })).toBeDisabled()
     );
-    await waitFor(() =>
-      expect(getByRole("button", { name: /Publish/i })).toBeDisabled()
-    );
-
-    userEvent.click(getByText(/Enable/));
 
-    // Fill in the 'Name' field
-    userEvent.type(getByPlaceholderText("Name"), "test_modified");
+    await user.click(rendered.getByText(/enable/i));
 
-    // Select a domain
-    userEvent.click(getByText(/Select domains/));
-    userEvent.click(getByText(/barDomain/));
+    await user.type(rendered.getByPlaceholderText(/name/i), "test_modified");
 
-    // Select a source
-    userEvent.click(getByText(/Select source/));
-    userEvent.click(getByRole("option", { name: /external_source_id/i }));
+    await user.click(rendered.getByText(/select domains/i));
+    await user.click(rendered.getByText(/bardomain/i));
 
-    userEvent.click(getByRole("option", { name: /^count$/i }));
-
-    // Fill in the 'Goal' field
-    userEvent.type(getByPlaceholderText("Goal"), "25");
-    // Fill in the 'Threshold' field
-    userEvent.type(getByPlaceholderText("Threshold"), "50");
+    await user.click(rendered.getByText(/select source/i));
+    await user.click(
+      rendered.getByRole("option", { name: /external_source_id/i })
+    );
 
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
+    await user.click(
+      rendered.getByRole("option", {
+        name: /quality_control.control_mode.error_count/i,
+      })
     );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
+
+    await user.type(rendered.getByPlaceholderText(/goal/i), "25");
+    await user.type(
+      rendered.getByPlaceholderText(
+        /quality_control.score_criteria.error_count.maximum/i
+      ),
+      "50"
     );
 
-    // Select the 'Reference datasets' for the resource type
-    userEvent.click(getByText(/Resource type/));
-    userEvent.click(getByText(/Reference datasets/));
-    userEvent.click(getByRole("option", { name: /dataset1/i }));
+    await user.click(rendered.getByText(/resource type/i));
+    await user.click(rendered.getByText(/reference datasets/i));
+    await user.click(rendered.getByRole("option", { name: /dataset1/i }));
 
     await waitFor(() =>
-      expect(getByRole("button", { name: /Publish/i })).toBeEnabled()
+      expect(rendered.getByRole("button", { name: /Publish/i })).toBeEnabled()
     );
   });
 });

package/src/components/qualityControls/__tests__/QualityControlHeader.spec.js

@@ -1,12 +1,10 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
+import { render, waitForLoad } from "@truedat/test/render";
 import { useQualityControl } from "@truedat/qx/hooks/useQualityControls";
 import QualityControlHeader from "../QualityControlHeader";
 import { qualityControlData } from "./__fixtures__/qualityControlHelper";
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
   useParams: () => ({ id: "8", version: "1" }),
 }));
 
@@ -50,35 +48,34 @@ jest.mock("@truedat/qx/hooks/useQualityControls", () => {
   };
 });
 
-const renderOpts = { messages };
-
 describe("<QualityControlHeader />", () => {
-  it("matches the latest snapshot with control quality active", () => {
-    const { container, queryByText } = render(
-      <QualityControlHeader />,
-      renderOpts
-    );
+  it("matches the latest snapshot with control quality active", async () => {
+    const rendered = render(<QualityControlHeader />);
+    await waitForLoad(rendered);
 
-    expect(container).toMatchSnapshot();
-    expect(queryByText(/Enabled/i)).toBeInTheDocument();
+    expect(rendered.container).toMatchSnapshot();
+    expect(
+      rendered.queryByText("quality_control.props.active.true")
+    ).toBeInTheDocument();
   });
 
-  it("render control quality active = false", () => {
+  it("render control quality active = false", async () => {
     useQualityControl.mockImplementation(() => ({
       data: { data: { ...qualityControlData(), active: false } },
-      loading: true,
     }));
-    const { queryByText } = render(<QualityControlHeader />, renderOpts);
+    const rendered = render(<QualityControlHeader />);
+    await waitForLoad(rendered);
 
-    expect(queryByText(/Disabled/i)).toBeInTheDocument();
+    expect(
+      rendered.queryByText("quality_control.props.active.false")
+    ).toBeInTheDocument();
   });
 
-  it("renders nothing when quality control is empty", () => {
-    useQualityControl.mockImplementation(() => ({
-      data: { data: {} },
-      loading: true,
-    }));
-    const { queryByText } = render(<QualityControlHeader />, renderOpts);
-    expect(queryByText(".header")).not.toBeInTheDocument();
+  it("renders nothing when quality control is empty", async () => {
+    useQualityControl.mockImplementation(() => ({ data: { data: {} } }));
+    const rendered = render(<QualityControlHeader />);
+    await waitForLoad(rendered);
+
+    expect(rendered.queryByText(".header")).not.toBeInTheDocument();
   });
 });

package/src/components/qualityControls/__tests__/QualityControlHistory.spec.js

@@ -1,21 +1,21 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import TestFormWrapper from "@truedat/qx/components/common/TestFormWrapper";
+import { qualityControlData } from "./__fixtures__/qualityControlHelper";
 import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
+import { render, waitForLoad } from "@truedat/test/render";
+import TestFormWrapper from "@truedat/qx/components/common/TestFormWrapper";
 import QualityControlsHistory from "../QualityControlHistory";
-import { qualityControlData } from "./__fixtures__/qualityControlHelper";
 
 const renderOpts = { messages };
 
 describe("<QualityControlsHistory />", () => {
   it("matches the latest snapshot", async () => {
     const context = { qualityControl: qualityControlData() };
-    const { container } = render(
+    const rendered = render(
       <TestFormWrapper context={context}>
         <QualityControlsHistory />
       </TestFormWrapper>,
       renderOpts
     );
-    expect(container).toMatchSnapshot();
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/qualityControls/__tests__/QualityControlManageDomain.spec.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import { waitFor } from "@testing-library/react";
 import TestFormWrapper from "@truedat/qx/components/common/TestFormWrapper";

package/src/components/qualityControls/__tests__/QualityControlQueryModal.spec.js

@@ -1,6 +1,5 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { fireEvent } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
 import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import QualityControlQueryModal from "../QualityControlQueryModal";
 
@@ -56,22 +55,24 @@ jest.mock("@truedat/qx/hooks/useQualityControls", () => {
 const renderOpts = { messages };
 
 describe("<QualityControlQueryModal />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(
+  it("matches the latest snapshot", async () => {
+    const rendered = render(
       <QualityControlQueryModal qualityControlId={8} />,
       renderOpts
     );
-
-    expect(container).toMatchSnapshot();
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
-  it("open modal", () => {
-    const { container, getByRole } = render(
+  it("open modal", async () => {
+    const user = userEvent.setup({ delay: null });
+    const rendered = render(
       <QualityControlQueryModal qualityControlId={8} />,
       renderOpts
     );
+    await waitForLoad(rendered);
 
-    fireEvent.click(getByRole("button"));
-    expect(container).toMatchSnapshot();
+    await user.click(rendered.getByRole("button"));
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/qualityControls/__tests__/QualityControlRow.spec.js

@@ -1,22 +1,18 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import { columns } from "../QualityControlsTable";
 import QualityControlRow from "../QualityControlRow";
 import { qualityControlData } from "./__fixtures__/qualityControlHelper";
 
-const mockHistory = {
-  push: jest.fn(),
-};
+const mockNavigate = jest.fn();
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
-  useHistory: () => mockHistory,
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
+  useNavigate: () => mockNavigate,
 }));
 
 const renderOpts = {
   messages,
-  fallback: "lazy",
 };
 
 const props = {

package/src/components/qualityControls/__tests__/QualityControlScores.spec.js

@@ -1,8 +1,6 @@
-import _ from "lodash/fp";
-import React from "react";
-import { render } from "@truedat/test/render";
 import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
 import TestFormWrapper from "@truedat/qx/components/common/TestFormWrapper";
 import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import {
@@ -12,8 +10,8 @@ import {
 import QualityControlScores from "../QualityControlScores";
 import { qualityControlData } from "./__fixtures__/qualityControlHelper";
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
   useParams: () => ({ id: "8", version: "1" }),
 }));
 
@@ -51,18 +49,18 @@ const context = {
 };
 
 describe("<QualityControlScores />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(
+  it("matches the latest snapshot", async () => {
+    const rendered = render(
       <TestFormWrapper context={context}>
         <QualityControlScores />
       </TestFormWrapper>,
       renderOpts
     );
-
-    expect(container).toMatchSnapshot();
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
-  it("shows a message when there are no scores", () => {
+  it("shows a message when there are no scores", async () => {
     useQualityControlScores.mockReturnValueOnce({
       data: { data: [] },
       loading: false,
@@ -76,17 +74,18 @@ describe("<QualityControlScores />", () => {
       mutate,
     };
 
-    const { getByText } = render(
+    const rendered = render(
       <TestFormWrapper context={context}>
         <QualityControlScores />
       </TestFormWrapper>,
       renderOpts
     );
+    await waitForLoad(rendered);
 
-    expect(getByText("No scores found")).toBeInTheDocument();
+    expect(rendered.getByText(/no scores found/i)).toBeInTheDocument();
   });
 
-  it("does not show delete button when user does not have delete_score action", () => {
+  it("does not show delete button when user does not have delete_score action", async () => {
     const context = {
       qualityControl: qualityControlData(),
       loading: false,
@@ -94,14 +93,15 @@ describe("<QualityControlScores />", () => {
       mutate,
     };
 
-    const { container } = render(
+    const rendered = render(
       <TestFormWrapper context={context}>
         <QualityControlScores />
       </TestFormWrapper>,
       renderOpts
     );
+    await waitForLoad(rendered);
 
-    const deleteButtons = container.querySelectorAll(
+    const deleteButtons = rendered.container.querySelectorAll(
       ".ui.red.basic.icon.button"
     );
 
@@ -119,19 +119,23 @@ describe("<QualityControlScores />", () => {
       trigger,
     }));
 
-    const { container, getByText } = render(
+    const user = userEvent.setup({ delay: null });
+
+    const rendered = render(
       <TestFormWrapper context={context}>
         <QualityControlScores />
       </TestFormWrapper>,
       renderOpts
     );
+    await waitForLoad(rendered);
 
-    const deleteButtons = container.querySelectorAll(
+    const deleteButtons = rendered.container.querySelectorAll(
       ".ui.red.basic.icon.button"
     );
 
-    userEvent.click(deleteButtons[0]);
-    userEvent.click(getByText(/confirm_yes/));
+    await user.click(deleteButtons[0]);
+    await user.click(rendered.getByText(/confirm_yes/i));
+
     await waitFor(() => {
       expect(trigger).toHaveBeenCalled();
     });

package/src/components/qualityControls/__tests__/QualityControlTabs.spec.js

@@ -1,10 +1,9 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import QualityControlTabs from "../QualityControlTabs";
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
   useParams: () => ({ id: "8", version: "1" }),
   useLocation: () => ({ pathname: "/qualityControls/8/version/1" }),
 }));