@truedat/dd 7.5.7 → 7.5.10

package/src/components/__tests__/GrantApprovalRule.spec.js

@@ -1,69 +1,56 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { GrantApprovalRule } from "../GrantApprovalRule";
 import { GRANT_APPROVAL_RULE_QUERY } from "../../api/queries";
-import en from "../../messages/en";
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
   useParams: () => ({ id: 123 }),
 }));
 
 const grantApprovalRule = {
-  grantApprovalRule: {
-    __typename: "ApprovalRule",
-    id: "123",
-    name: "rule_name",
-    action: "approve",
-    role: "grants",
-    domainIds: ["1"],
-    userId: "1",
-    domains: [
-      {
-        __typename: "Domain",
-        name: "domain_test",
-      },
-    ],
-    conditions: [
-      {
-        __typename: "Condition",
-        field: "request.foo",
-        operator: "neq",
-        values: ["bar"],
-      },
-      {
-        __typename: "Condition",
-        field: "invalid_field",
-        operator: "eq",
-        values: ["baz"],
-      },
-    ],
-    comment: "comment invalid",
-  },
+  __typename: "ApprovalRule",
+  id: "123",
+  name: "rule_name",
+  action: "approve",
+  role: "grants",
+  domainIds: ["1"],
+  userId: "1",
+  domains: [
+    {
+      __typename: "Domain",
+      name: "domain_test",
+    },
+  ],
+  conditions: [
+    {
+      __typename: "Condition",
+      field: "request.foo",
+      operator: "neq",
+      values: ["bar"],
+    },
+    {
+      __typename: "Condition",
+      field: "invalid_field",
+      operator: "eq",
+      values: ["baz"],
+    },
+  ],
+  comment: "comment invalid",
 };
 
 const approvalRuleMock = {
   request: { query: GRANT_APPROVAL_RULE_QUERY, variables: { id: 123 } },
-  result: { data: grantApprovalRule },
+  result: { data: { grantApprovalRule } },
 };
 
 const renderOpts = {
   mocks: [approvalRuleMock],
-  messages: { en },
-  fallback: "lazy",
 };
 
 describe("<GrantApprovalRule />", () => {
   it("matches the last snapshot", async () => {
-    const { container, queryByText } = render(
-      <GrantApprovalRule />,
-      renderOpts
-    );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<GrantApprovalRule />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/__tests__/GrantApprovalRuleConditions.spec.js

@@ -1,7 +1,6 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { waitFor, within } from "@testing-library/react";
+import { render } from "@truedat/test/render";
 import GrantApprovalRuleConditions from "../GrantApprovalRuleConditions";
 import en from "../../messages/en";
 
@@ -28,11 +27,11 @@ describe("<GrantApprovalRuleConditions />", () => {
         },
       ],
     };
-    const { container } = render(
+    const rendered = render(
       <GrantApprovalRuleConditions {...props} />,
       renderOpts
     );
-    expect(container).toMatchSnapshot();
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("matches the last snapshot with empty values", () => {
@@ -40,22 +39,22 @@ describe("<GrantApprovalRuleConditions />", () => {
       onChange: jest.fn(),
       value: [{}],
     };
-    const { container } = render(
+    const rendered = render(
       <GrantApprovalRuleConditions {...props} />,
       renderOpts
     );
-    expect(container).toMatchSnapshot();
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("matches the last snapshot with no values", () => {
     const props = {
       onChange: jest.fn(),
     };
-    const { container } = render(
+    const rendered = render(
       <GrantApprovalRuleConditions {...props} />,
       renderOpts
     );
-    expect(container).toMatchSnapshot();
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("matches the last snapshot disable", () => {
@@ -64,11 +63,11 @@ describe("<GrantApprovalRuleConditions />", () => {
       value: [{}],
       disable: true,
     };
-    const { container } = render(
+    const rendered = render(
       <GrantApprovalRuleConditions {...props} />,
       renderOpts
     );
-    expect(container).toMatchSnapshot();
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("changing the form will trigger onChange function", async () => {
@@ -77,16 +76,17 @@ describe("<GrantApprovalRuleConditions />", () => {
       onChange,
       value: [{}],
     };
-    const { findByText, getByRole } = render(
+    const rendered = render(
       <GrantApprovalRuleConditions {...props} />,
       renderOpts
     );
 
-    userEvent.click(await findByText(/request metadata/i));
-    userEvent.type(getByRole("textbox", { name: /field/i }), "F");
-    userEvent.click(await findByText(/is equal/i));
-    userEvent.type(getByRole("combobox"), "V");
-    userEvent.click(within(getByRole("combobox")).getByText("Add"));
+    const user = userEvent.setup({ delay: null });
+    await user.click(await rendered.findByText(/request metadata/i));
+    await user.type(rendered.getByRole("textbox", { name: /field/i }), "F");
+    await user.click(await rendered.findByText(/is equal/i));
+    await user.type(rendered.getByRole("combobox"), "V");
+    await user.click(within(rendered.getByRole("combobox")).getByText("Add"));
 
     await waitFor(() => {
       expect(onChange.mock.calls.length).toBe(4);
@@ -105,13 +105,14 @@ describe("<GrantApprovalRuleConditions />", () => {
       onChange,
       value: [{}, {}],
     };
-    const { container, findByText } = render(
+    const rendered = render(
       <GrantApprovalRuleConditions {...props} />,
       renderOpts
     );
 
-    userEvent.click(await findByText(/add condition/i));
-    userEvent.click(container.querySelector("i.trash"));
+    const user = userEvent.setup({ delay: null });
+    await user.click(await rendered.findByText(/add condition/i));
+    await user.click(rendered.container.querySelector("i.trash"));
 
     await waitFor(() => {
       expect(onChange.mock.calls.length).toBe(2);

package/src/components/__tests__/GrantApprovalRuleDeleteButton.spec.js

@@ -1,39 +1,34 @@
-import React from "react";
-import { render } from "@truedat/test/render";
 import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
 import GrantApprovalRuleDeleteButton from "../GrantApprovalRuleDeleteButton";
 import { deleteGrantApprovalRule } from "../../routines";
-import en from "../../messages/en";
-
-const renderOpts = {
-  messages: {
-    en: { ...en, "confirmation.yes": "yes", "confirmation.no": "no" },
-  },
-};
 
 describe("<GrantApprovalRuleDeleteButton />", () => {
   const approvalRule = {
     __typename: "ApprovalRule",
     id: "123",
   };
-  it("matches the last snapshot", () => {
+
+  it("matches the last snapshot", async () => {
     const props = { deleteGrantApprovalRule, approvalRule };
-    const { container } = render(
-      <GrantApprovalRuleDeleteButton {...props} />,
-      renderOpts
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<GrantApprovalRuleDeleteButton {...props} />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
-  it("call deleteGrantApprovalRule routine on confirm", () => {
+  it("call deleteGrantApprovalRule routine on confirm", async () => {
     const dispatch = jest.fn();
     const props = { deleteGrantApprovalRule, approvalRule };
-    const { getByRole } = render(<GrantApprovalRuleDeleteButton {...props} />, {
-      ...renderOpts,
+    const rendered = render(<GrantApprovalRuleDeleteButton {...props} />, {
       dispatch,
     });
-    userEvent.click(getByRole("button", { name: /delete/i }));
-    userEvent.click(getByRole("button", { name: "modal-affirmative-action" }));
+    await waitForLoad(rendered);
+    const user = userEvent.setup({ delay: null });
+
+    await user.click(rendered.getByRole("button", { name: /delete/i }));
+    await user.click(
+      rendered.getByRole("button", { name: /modal-affirmative-action/i })
+    );
 
     expect(dispatch).toHaveBeenLastCalledWith({
       ...deleteGrantApprovalRule(),
@@ -41,15 +36,19 @@ describe("<GrantApprovalRuleDeleteButton />", () => {
     });
   });
 
-  it("do not call deleteGrantApprovalRule routine on cancel", () => {
+  it("do not call deleteGrantApprovalRule routine on cancel", async () => {
     const dispatch = jest.fn();
     const props = { deleteGrantApprovalRule, approvalRule };
-    const { getByRole } = render(<GrantApprovalRuleDeleteButton {...props} />, {
-      ...renderOpts,
+    const rendered = render(<GrantApprovalRuleDeleteButton {...props} />, {
       dispatch,
     });
-    userEvent.click(getByRole("button", { name: /delete/i }));
-    userEvent.click(getByRole("button", { name: "modal-negative-action" }));
+    await waitForLoad(rendered);
+    const user = userEvent.setup({ delay: null });
+
+    await user.click(rendered.getByRole("button", { name: /delete/i }));
+    await user.click(
+      rendered.getByRole("button", { name: /modal-negative-action/i })
+    );
 
     expect(dispatch).toHaveBeenCalledTimes(0);
   });

package/src/components/__tests__/GrantApprovalRuleEdit.spec.js

@@ -1,13 +1,10 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { domainsMock, rolesMock } from "@truedat/test/mocks";
 import { GrantApprovalRuleEdit } from "../GrantApprovalRuleEdit";
 import { GRANT_APPROVAL_RULE_QUERY } from "../../api/queries";
-import en from "../../messages/en";
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
   useParams: () => ({ id: 123 }),
 }));
 
@@ -49,28 +46,12 @@ const renderOpts = {
     domainsMock({ action: "approveGrantRequests" }),
     rolesMock({ domainId: "1", permission: "approve_grant_request" }),
   ],
-  messages: {
-    en: {
-      ...en,
-      "domain.selector.label": "Domain",
-      "domain.selector.placeholder": "Domain",
-      "actions.save": "Save",
-      "actions.cancel": "Cancel",
-    },
-  },
-  fallback: "lazy",
 };
 
 describe("<GrantApprovalRuleEdit />", () => {
   it("matches the last snapshot", async () => {
-    const { container, queryByText } = render(
-      <GrantApprovalRuleEdit />,
-      renderOpts
-    );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<GrantApprovalRuleEdit />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/__tests__/GrantApprovalRuleForm.spec.js

@@ -1,27 +1,17 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { waitFor, within } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { domainsMock, rolesMock } from "@truedat/test/mocks";
 import GrantApprovalRuleForm from "../GrantApprovalRuleForm";
-import en from "../../messages/en";
 
 const renderOpts = {
   mocks: [
     domainsMock({ action: "approveGrantRequests" }),
     rolesMock({ domainId: "1", permission: "approve_grant_request" }),
+    rolesMock({ domainId: null, permission: "approve_grant_request" }),
   ],
-  messages: {
-    en: {
-      ...en,
-      "domain.selector.label": "Domain",
-      "domain.selector.placeholder": "Domain",
-      "actions.save": "Save",
-      "actions.cancel": "Cancel",
-    },
-  },
-  fallback: "lazy",
 };
+
 const approvalRule = {
   __typename: "ApprovalRule",
   id: "123",
@@ -59,59 +49,63 @@ describe("<GrantApprovalRuleForm />", () => {
       onSubmit: jest.fn(),
       approvalRule,
     };
-    const { container, findByRole } = render(
-      <GrantApprovalRuleForm {...props} />,
-      renderOpts
-    );
-    await findByRole("button", { name: /save/i });
-    expect(container).toMatchSnapshot();
+    const rendered = render(<GrantApprovalRuleForm {...props} />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("matches the last snapshot for new rule", async () => {
     const props = { onSubmit: jest.fn() };
-    const { container, findByRole } = render(
-      <GrantApprovalRuleForm {...props} />,
-      renderOpts
-    );
-    await findByRole("button", { name: /save/i });
-    expect(container).toMatchSnapshot();
+    const rendered = render(<GrantApprovalRuleForm {...props} />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("call onSubmit with data", async () => {
     const onSubmit = jest.fn();
     const props = { onSubmit };
-    const { getByRole, findByText } = render(
-      <GrantApprovalRuleForm {...props} />,
-      renderOpts
-    );
+    const rendered = render(<GrantApprovalRuleForm {...props} />, renderOpts);
+    await waitForLoad(rendered);
+    const user = userEvent.setup({ delay: null });
+
     await waitFor(() =>
-      expect(getByRole("button", { name: /save/i })).toBeDisabled()
+      expect(rendered.getByRole("button", { name: /save/i })).toBeDisabled()
     );
 
-    userEvent.type(getByRole("textbox", { name: /name/i }), "rule_name");
+    await user.type(
+      rendered.getByRole("textbox", { name: /grantapprovalrule.name/i }),
+      "rule_name"
+    );
 
-    userEvent.click(await findByText(/fooDomain/));
+    await user.click(await rendered.findByText(/foodomain/i));
 
     await waitFor(() =>
-      expect(getByRole("textbox", { name: /comment/i })).not.toBeDisabled()
+      expect(
+        rendered.getByRole("textbox", { name: /comment/i })
+      ).not.toBeDisabled()
     );
 
-    userEvent.click(await findByText(/role1/i));
-    userEvent.click(await findByText(/reject/i));
+    await user.click(await rendered.findByText(/role1/i));
+    await user.click(await rendered.findByText(/reject/i));
 
-    userEvent.type(getByRole("textbox", { name: /comment/i }), "rule_comment");
+    await user.type(
+      rendered.getByRole("textbox", { name: /comment/i }),
+      "rule_comment"
+    );
 
-    userEvent.click(await findByText(/request metadata/i));
-    userEvent.type(getByRole("textbox", { name: /field/i }), "field");
-    userEvent.click(await findByText(/is equal/i));
-    userEvent.type(getByRole("combobox"), "value");
-    userEvent.click(within(getByRole("combobox")).getByText("Add"));
+    await user.click(
+      await rendered.findByText(/conditions.field_prefix.request/i)
+    );
+    await user.type(rendered.getByRole("textbox", { name: /field/i }), "field");
+    await user.click(await rendered.findByText("eq"));
+    await user.type(rendered.getByRole("combobox"), "value");
+    await user.click(within(rendered.getByRole("combobox")).getByText(/add/i));
 
     await waitFor(() =>
-      expect(getByRole("button", { name: /save/i })).not.toBeDisabled()
+      expect(rendered.getByRole("button", { name: /save/i })).not.toBeDisabled()
     );
 
-    userEvent.click(getByRole("button", { name: /save/i }));
+    await user.click(rendered.getByRole("button", { name: /save/i }));
 
     await waitFor(() => {
       expect(onSubmit.mock.calls.length).toBe(1);

package/src/components/__tests__/GrantApprovalRuleNew.spec.js

@@ -1,9 +1,6 @@
-import React from "react";
-import { render } from "@truedat/test/render";
-import { waitFor } from "@testing-library/react";
+import { render, waitForLoad } from "@truedat/test/render";
 import { domainsMock, rolesMock } from "@truedat/test/mocks";
 import { GrantApprovalRuleNew } from "../GrantApprovalRuleNew";
-import en from "../../messages/en";
 
 const createGrantApprovalRule = jest.fn();
 
@@ -12,29 +9,13 @@ const renderOpts = {
     domainsMock({ action: "approveGrantRequests" }),
     rolesMock({ domainId: "1", permission: "approve_grant_request" }),
   ],
-  messages: {
-    en: {
-      ...en,
-      "domain.selector.label": "Domain",
-      "domain.selector.placeholder": "Domain",
-      "actions.save": "Save",
-      "actions.cancel": "Cancel",
-    },
-  },
-  fallback: "lazy",
 };
 
 describe("<GrantApprovalRuleNew />", () => {
   it("matches the last snapshot", async () => {
     const props = { createGrantApprovalRule };
-    const { container, queryByText } = render(
-      <GrantApprovalRuleNew {...props} />,
-      renderOpts
-    );
-    await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    await waitFor(() =>
-      expect(queryByText(/loading/i)).not.toBeInTheDocument()
-    );
-    expect(container).toMatchSnapshot();
+    const rendered = render(<GrantApprovalRuleNew {...props} />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/__tests__/GrantApprovalRules.spec.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import { waitFor } from "@testing-library/react";
 import GrantApprovalRules from "../GrantApprovalRules";
@@ -48,7 +47,6 @@ const approvalRulesMock = (data) => ({
 const renderOpts = (data) => ({
   mocks: [approvalRulesMock(data)],
   messages: { en },
-  fallback: "lazy",
 });
 
 describe("<GrantApprovalRules />", () => {

package/src/components/__tests__/GrantCrumbs.spec.js

@@ -1,4 +1,3 @@
-import React from "react";
 import { render } from "@truedat/test/render";
 import GrantCrumbs from "../GrantCrumbs";
 

package/src/components/__tests__/GrantDateFilter.spec.js

@@ -1,11 +1,15 @@
-import React from "react";
-import { shallow } from "enzyme";
+import { render, waitForLoad } from "@truedat/test/render";
 import { GrantDateFilter } from "../GrantDateFilter";
 
-describe("<GrantDateFilter/>", () => {
-  it("matches the latest snapshot", () => {
-    const props = { active: true };
-    const wrapper = shallow(<GrantDateFilter {...props} />);
-    expect(wrapper).toMatchSnapshot();
+describe("<GrantDateFilter />", () => {
+  it("matches the latest snapshot", async () => {
+    const renderOpts = {
+      state: {
+        userPermissions: { update: true },
+      },
+    };
+    const rendered = render(<GrantDateFilter active={true} />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

package/src/components/__tests__/GrantRemoval.spec.js

@@ -1,5 +1,4 @@
-import React from "react";
-import { render } from "@truedat/test/render";
+import { render, waitForLoad } from "@truedat/test/render";
 import GrantRemoval from "../GrantRemoval";
 
 describe("<GrantRemoval />", () => {
@@ -11,23 +10,29 @@ describe("<GrantRemoval />", () => {
     manage_grant_removal: {},
   };
 
-  it("Mounts grant removal/reactivation button if user has permissions, remove", () => {
-    const { queryByText } = render(
+  it("Mounts grant removal/reactivation button if user has permissions, remove", async () => {
+    const rendered = render(
       <GrantRemoval
         grant={{ ...grant, pending_removal: false }}
         actions={actions_with_request_cancel}
       />
     );
-    expect(queryByText(/Remove/)).toBeInTheDocument();
+    await waitForLoad(rendered);
+    expect(
+      rendered.queryByText(/grant.actions.markPendingRemoval.button/i)
+    ).toBeInTheDocument();
   });
 
-  it("Mounts grant removal/reactivation button if user has permissions, reactivate", () => {
-    const { queryByText } = render(
+  it("Mounts grant removal/reactivation button if user has permissions, reactivate", async () => {
+    const rendered = render(
       <GrantRemoval
         grant={{ ...grant, pending_removal: true }}
         actions={actions_with_request_cancel}
       />
     );
-    expect(queryByText(/Reactivate/)).toBeInTheDocument();
+    await waitForLoad(rendered);
+    expect(
+      rendered.queryByText(/grant.actions.unmarkPendingRemoval.button/i)
+    ).toBeInTheDocument();
   });
 });