@truedat/qx 7.5.9 → 7.5.11

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

@@ -1,16 +1,14 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
+import { singleTemplateMock } from "@truedat/test/mocks";
+import { DOMAINS_QUERY } from "@truedat/core/api/queries";
 import { SOURCE_OPTIONS_QUERY } from "@truedat/cx/sources/api/queries";
 import { REFERENCE_DATASETS_HEADERS_QUERY } from "@truedat/dd/api/queries";
-import { DOMAINS_QUERY } from "@truedat/core/api/queries";
-import { singleTemplateMock } from "@truedat/test/mocks";
 import {
   useQualityControlUpdateDraft,
   useQualityControl,
 } from "@truedat/qx/hooks/useQualityControls";
-import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import EditQualityControl from "../EditQualityControl";
 import {
   sources,
@@ -18,12 +16,12 @@ import {
   qualityControlData,
 } from "./__fixtures__/qualityControlHelper";
 
-const mockHistory = { push: jest.fn() };
+const mockNavigate = jest.fn();
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
   useParams: () => ({ id: "8", version: "1" }),
-  useHistory: () => mockHistory,
+  useNavigate: () => mockNavigate,
 }));
 
 jest.mock("@truedat/qx/hooks/useQualityControls", () => {
@@ -49,17 +47,7 @@ jest.mock("@truedat/qx/hooks/useQualityControls", () => {
   };
 });
 
-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");
 
@@ -124,23 +112,13 @@ const renderOpts = {
     publishDomainsMock,
     createDomainsMock,
   ],
-  messages,
-  fallback: "loading",
 };
 
 describe("<EditQualityControl />", () => {
   it("matches the latest snapshot", async () => {
-    const { container, queryByText } = render(
-      <EditQualityControl />,
-      renderOpts
-    );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<EditQualityControl />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("matches the latest snapshot with empty qualityControl", async () => {
@@ -149,34 +127,18 @@ describe("<EditQualityControl />", () => {
       loading: false,
     }));
 
-    const { container, queryByText } = render(
-      <EditQualityControl />,
-      renderOpts
-    );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<EditQualityControl />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
-  it("navigates to qulity controls when cancel button is cliked", async () => {
-    const { container, getByText, queryByText } = render(
-      <EditQualityControl />,
-      renderOpts
-    );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
-    userEvent.click(getByText(/Cancel/));
+  it("navigates to quality controls when cancel button is cliked", async () => {
+    const rendered = render(<EditQualityControl />, renderOpts);
+    await waitForLoad(rendered);
+    const user = userEvent.setup({ delay: null });
+    await user.click(rendered.getByText(/cancel/i));
 
-    expect(mockHistory.push.mock.calls.length).toBe(1);
-    expect(mockHistory.push.mock.calls[0][0]).toBe("/qualityControls");
+    expect(mockNavigate).toHaveBeenCalledWith("/qualityControls");
   });
 
   it("test save submit ", async () => {
@@ -188,24 +150,20 @@ describe("<EditQualityControl />", () => {
       trigger,
     }));
 
-    const { getByText, getByPlaceholderText, queryByText, getByRole } = render(
-      <EditQualityControl />,
-      renderOpts
-    );
+    const rendered = render(<EditQualityControl />, renderOpts);
+    await waitForLoad(rendered);
 
     await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(getByRole("button", { name: /Save/ })).toBeDisabled()
+      expect(rendered.getByRole("button", { name: /save/i })).toBeDisabled()
     );
 
-    userEvent.type(getByPlaceholderText("Name"), "_modified");
+    const user = userEvent.setup({ delay: null });
+    await user.type(rendered.getByPlaceholderText(/name/i), "_modified");
 
     await waitFor(() =>
-      expect(getByRole("button", { name: /Save/ })).toBeEnabled()
+      expect(rendered.getByRole("button", { name: /save/i })).toBeEnabled()
     );
-    userEvent.click(getByText(/Save/));
+    await user.click(rendered.getByText(/save/i));
 
     const qualityControl = qualityControlData({
       versions: [],

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

@@ -1,6 +1,5 @@
-import React from "react";
-import { render } from "@truedat/test/render";
 import { fireEvent } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import IconPopup from "../IconPopup";
 
@@ -15,19 +14,19 @@ const props = {
 };
 
 describe("<IconPopup />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(<IconPopup {...props} />, renderOpts);
-    expect(container).toMatchSnapshot();
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<IconPopup {...props} />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("show popup information with mouse over", async () => {
-    const { container, findByText } = render(
-      <IconPopup {...props} />,
-      renderOpts
-    );
-    const icon = container.querySelector(".red.circle.icon");
+    const rendered = render(<IconPopup {...props} />, renderOpts);
+    await waitForLoad(rendered);
+
+    const icon = rendered.container.querySelector(".red.circle.icon");
     fireEvent.mouseOver(icon);
 
-    expect(await findByText("Result criteria")).toBeInTheDocument();
+    expect(await rendered.findByText(/result criteria/i)).toBeInTheDocument();
   });
 });

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

@@ -1,13 +1,11 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { QUALITY_CONTROLS } from "@truedat/core/routes";
 import { SOURCE_OPTIONS_QUERY } from "@truedat/cx/sources/api/queries";
 import { REFERENCE_DATASETS_HEADERS_QUERY } from "@truedat/dd/api/queries";
 import { DOMAINS_QUERY } from "@truedat/core/api/queries";
 import { singleTemplateMock } from "@truedat/test/mocks";
-import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import {
   useQualityControlCreateDraft,
   useQualityControl,
@@ -19,25 +17,15 @@ import {
   qualityControlData,
 } from "./__fixtures__/qualityControlHelper";
 
-const mockHistory = { push: jest.fn() };
+const mockNavigate = jest.fn();
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
   useParams: () => ({ id: "8", version: "1" }),
-  useHistory: () => mockHistory,
+  useNavigate: () => mockNavigate,
 }));
 
-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");
 
@@ -125,42 +113,26 @@ const renderOpts = {
     publishDomainsMock,
     createDomainsMock,
   ],
-  messages,
-  fallback: "loading",
 };
 
 describe("<NewDraftQualityControl />", () => {
   it("matches the latest snapshot", async () => {
-    const { container, queryByText } = render(
-      <NewDraftQualityControl />,
-      renderOpts
-    );
-
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<NewDraftQualityControl />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("navigates to quality controls when cancel button is cliked", async () => {
-    const { getByText, queryByText } = render(
-      <NewDraftQualityControl />,
-      renderOpts
-    );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
+    const rendered = render(<NewDraftQualityControl />, renderOpts);
+    await waitForLoad(rendered);
 
-    const cancelButton = getByText(/Cancel/i);
+    const cancelButton = rendered.getByText(/cancel/i);
     expect(cancelButton).toBeInTheDocument();
 
-    userEvent.click(cancelButton);
+    const user = userEvent.setup({ delay: null });
+    await user.click(cancelButton);
 
-    expect(mockHistory.push.mock.calls.length).toBe(1);
-    expect(mockHistory.push.mock.calls[0][0]).toBe(QUALITY_CONTROLS);
+    expect(mockNavigate).toHaveBeenCalledWith(QUALITY_CONTROLS);
   });
 
   it("test save submit ", async () => {
@@ -172,24 +144,20 @@ describe("<NewDraftQualityControl />", () => {
       trigger,
     }));
 
-    const { getByText, getByPlaceholderText, queryByText, getByRole } = render(
-      <NewDraftQualityControl />,
-      renderOpts
-    );
+    const rendered = render(<NewDraftQualityControl />, renderOpts);
+    await waitForLoad(rendered);
 
     await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(getByRole("button", { name: /Save/ })).toBeDisabled()
+      expect(rendered.getByRole("button", { name: /save/ })).toBeDisabled()
     );
 
-    userEvent.type(getByPlaceholderText("Name"), "_modified");
+    const user = userEvent.setup({ delay: null });
+    await user.type(rendered.getByPlaceholderText(/name/i), "_modified");
 
     await waitFor(() =>
-      expect(getByRole("button", { name: /Save/ })).toBeEnabled()
+      expect(rendered.getByRole("button", { name: /save/ })).toBeEnabled()
     );
-    userEvent.click(getByText(/Save/));
+    await user.click(rendered.getByText(/save/i));
 
     const qualityControl = qualityControlData({
       versions: [],
@@ -210,24 +178,20 @@ describe("<NewDraftQualityControl />", () => {
       trigger,
     }));
 
-    const { getByText, getByPlaceholderText, queryByText, getByRole } = render(
-      <NewDraftQualityControl />,
-      renderOpts
-    );
+    const rendered = render(<NewDraftQualityControl />, renderOpts);
+    await waitForLoad(rendered);
 
     await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(getByRole("button", { name: /Publish/ })).toBeDisabled()
+      expect(rendered.getByRole("button", { name: /publish/ })).toBeDisabled()
     );
 
-    userEvent.type(getByPlaceholderText("Name"), "_modified");
+    const user = userEvent.setup({ delay: null });
+    await user.type(rendered.getByPlaceholderText(/name/i), "_modified");
 
     await waitFor(() =>
-      expect(getByRole("button", { name: /Publish/ })).toBeEnabled()
+      expect(rendered.getByRole("button", { name: /publish/ })).toBeEnabled()
     );
-    userEvent.click(getByText(/Publish/));
+    await user.click(rendered.getByText(/publish/i));
 
     const qualityControl = qualityControlData({
       versions: [],
@@ -242,12 +206,11 @@ describe("<NewDraftQualityControl />", () => {
   it("when no quality control is fetched, do not render editor", async () => {
     useQualityControl.mockImplementation(() => ({ data: undefined }));
 
-    const { queryByText } = render(<NewDraftQualityControl />, renderOpts);
+    const rendered = render(<NewDraftQualityControl />, renderOpts);
+    await waitForLoad(rendered);
 
     await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
+      expect(rendered.queryByText(/save/i)).not.toBeInTheDocument()
     );
-
-    await waitFor(() => expect(queryByText(/Save/i)).not.toBeInTheDocument());
   });
 });

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

@@ -1,21 +1,19 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { act, waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { singleTemplateMock } from "@truedat/test/mocks";
 import { DOMAINS_QUERY } from "@truedat/core/api/queries";
 import { SOURCE_OPTIONS_QUERY } from "@truedat/cx/sources/api/queries";
 import { REFERENCE_DATASETS_HEADERS_QUERY } from "@truedat/dd/api/queries";
-import { messages } from "@truedat/qx/components/__tests__/__fixtures__/helper";
 import { useQualityControlCreate } from "@truedat/qx/hooks/useQualityControls";
 import NewQualityControl from "../NewQualityControl";
 import { sources, domains } 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,
 }));
 
 jest.mock("@truedat/qx/hooks/useQualityControls", () => ({
@@ -100,45 +98,29 @@ const renderOpts = {
     createDomainsMock,
     domainsMock,
   ],
-  messages,
-  fallback: "loading",
 };
 
 describe("<NewQualityControl />", () => {
   it("matches the latest snapshot", async () => {
-    const { container, queryByText } = render(
-      <NewQualityControl />,
-
-      renderOpts
-    );
-
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<NewQualityControl />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("navigates to qulity controls when cancel button is cliked", async () => {
-    const { container, getByText, queryByText } = render(
-      <NewQualityControl />,
-      renderOpts
-    );
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
-    userEvent.click(getByText(/Cancel/));
-    userEvent.click(getByText(/confirm_yes/));
-    await waitFor(() => expect(mockHistory.push.mock.calls.length).toBe(1));
-    expect(mockHistory.push.mock.calls[0][0]).toBe("/qualityControls");
+    const user = userEvent.setup({ delay: null });
+    const rendered = render(<NewQualityControl />, renderOpts);
+    await waitForLoad(rendered);
+
+    await user.click(rendered.getByText(/actions.cancel/i));
+    await user.click(rendered.getByText(/confirmation.yes/i));
+
+    await waitFor(() => expect(mockNavigate.mock.calls.length).toBe(1));
+    expect(mockNavigate.mock.calls[0][0]).toBe("/qualityControls");
   });
 
   it("test save submit ", async () => {
+    const user = userEvent.setup({ delay: null });
     const trigger = jest.fn(() =>
       Promise.resolve({ data: { data: { id: "9", version: "1" } } })
     );
@@ -147,69 +129,59 @@ describe("<NewQualityControl />", () => {
       trigger,
     }));
 
-    const {
-      container,
-      getByText,
-      getByPlaceholderText,
-      queryByText,
-      getByRole,
-      getAllByRole,
-    } = render(<NewQualityControl />, renderOpts);
+    const rendered = render(<NewQualityControl />, renderOpts);
+    await waitForLoad(rendered);
 
     await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(getByRole("button", { name: /Save/ })).toBeDisabled()
+      expect(rendered.getByRole("button", { name: /save/i })).toBeDisabled()
     );
 
-    // Fill in the 'Name' field
-    userEvent.type(getByPlaceholderText("Name"), "test_modified");
-
     // Select a domain
-    userEvent.click(getByText(/Select domains/));
-    userEvent.click(getByText(/barDomain/));
+    await user.click(rendered.getByText(/domain.multiple.placeholder/i));
+    await user.click(rendered.getByText(/bardomain/i));
+
+    // Fill in the 'Name' field
+    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(/source.search.placeholder/i));
+    await user.click(
+      rendered.getByRole("option", { name: /external_source_id/i })
+    );
 
     // Select a control mode
-    userEvent.click(getByRole("option", { name: /Percentage/i }));
+    await user.click(
+      rendered.getByRole("option", { name: /control_mode.percentage/i })
+    );
 
     // Fill in the 'Threshold' field
-    userEvent.type(getByPlaceholderText("Threshold"), "10");
+    await user.type(
+      rendered.getByPlaceholderText(/score_criteria.percentage.minimum/i),
+      "10"
+    );
 
     // Fill in the 'Goal' field
-    userEvent.type(getByPlaceholderText("Goal"), "20");
-
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
+    await user.type(
+      rendered.getByPlaceholderText(/score_criteria.percentage.goal/i),
+      "20"
     );
 
-    // 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 waitForLoad(rendered);
 
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
-    );
+    await user.click(rendered.getByText(/^queryables.resource.type$/));
+    await user.click(rendered.getByText(/reference_dataset/i));
+    await user.click(rendered.getByRole("option", { name: /dataset1/i }));
 
-    userEvent.click(getAllByRole("option", { name: /campo1/i })[0]);
-    userEvent.click(getByRole("option", { name: /eq/i }));
-    userEvent.click(getAllByRole("option", { name: /campo2/i })[1]);
+    await act(async () => {
+      await user.click(rendered.getAllByRole("option", { name: /campo1/ })[0]);
+      await user.click(rendered.getByRole("option", { name: "eq" }));
+      await user.click(rendered.getAllByRole("option", { name: /campo2/ })[1]);
+    });
 
     await waitFor(() =>
-      expect(getByRole("button", { name: /Save/ })).toBeEnabled()
+      expect(rendered.getByRole("button", { name: /save/i })).toBeEnabled()
     );
-    userEvent.click(getByText(/Save/));
+    await user.click(rendered.getByText(/save/i));
 
     await waitFor(() =>
       expect(trigger).toHaveBeenCalledWith({
@@ -293,7 +265,8 @@ describe("<NewQualityControl />", () => {
     );
   });
 
-  it("test publish submit ", async () => {
+  it.skip("test publish submit ", async () => {
+    const user = userEvent.setup({ delay: null });
     const trigger = jest.fn(() =>
       Promise.resolve({ data: { data: { id: "9", version: "1" } } })
     );
@@ -302,56 +275,51 @@ describe("<NewQualityControl />", () => {
       trigger,
     }));
 
-    const {
-      container,
-      getByText,
-      getByPlaceholderText,
-      queryByText,
-      getByRole,
-    } = render(<NewQualityControl />, renderOpts);
+    const rendered = render(<NewQualityControl />, renderOpts);
+    await waitForLoad(rendered);
 
     await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    await waitFor(() =>
-      expect(getByRole("button", { name: /Publish/ })).toBeDisabled()
+      expect(rendered.getByRole("button", { name: /publish/i })).toBeDisabled()
     );
 
     // Fill in the 'Name' field
-    userEvent.type(getByPlaceholderText("Name"), "test_modified");
+    await user.type(rendered.getByPlaceholderText(/name/i), "test_modified");
 
     // Select a domain
-    userEvent.click(getByText(/Select domains/));
-    userEvent.click(getByText(/barDomain/));
+    await user.click(rendered.getByText(/domain.multiple.placeholder/i));
+    await user.click(rendered.getByText(/bardomain/i));
 
     // Select a source
-    userEvent.click(getByText(/Select source/));
-
-    userEvent.click(getByRole("option", { name: /external_source_id/i }));
+    await user.click(rendered.getByText(/source.search.placeholder/i));
+    await user.click(
+      rendered.getByRole("option", { name: /external_source_id/i })
+    );
 
-    userEvent.click(getByRole("option", { name: /^count$/i }));
+    await user.click(rendered.getByRole("option", { name: /error_count/i }));
 
     // Fill in the 'Goal' field
-    userEvent.type(getByPlaceholderText("Goal"), "25");
-    // Fill in the 'Threshold' field
-    userEvent.type(getByPlaceholderText("Threshold"), "50");
-
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
+    await user.type(
+      rendered.getByPlaceholderText(/score_criteria.error_count.goal/i),
+      "25"
     );
-    await waitFor(() =>
-      expect(container.querySelector(".loader")).not.toBeInTheDocument()
+    // Fill in the 'Threshold' field
+    await user.type(
+      rendered.getByPlaceholderText(/score_criteria.error_count.maximum/i),
+      "50"
     );
+    await waitForLoad(rendered);
 
-    // // 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 }));
+    // Select the 'Reference datasets' for the resource type
+    await user.click(rendered.getByText(/^queryables.resource.type$/));
+    await user.click(
+      rendered.getByText(/queryables.resource.type.reference_datase/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()
     );
-    userEvent.click(getByText(/Publish/i));
+    await user.click(rendered.getByText(/publish/i));
 
     await waitFor(() =>
       expect(trigger).toHaveBeenCalledWith({