@truedat/audit 7.5.9 → 7.5.11

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

@@ -1,7 +1,6 @@
-import React from "react";
-import { waitFor } from "@testing-library/react";
-import { render } from "@truedat/test/render";
 import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
+import { waitFor } from "@testing-library/react";
 import {
   domainsMock,
   mockUseStructures,
@@ -9,10 +8,10 @@ import {
 } from "@truedat/test/mocks";
 import SearchContextWrapper from "@truedat/core/components/common/SearchContextWrapper";
 import SubscriptionForm from "../SubscriptionForm";
-import en from "../../messages/en";
 
 mockUseStructures();
 mockUseConcepts();
+jest.mock("@truedat/core/hooks/useUserFilters");
 
 const structureActiveFilters = {};
 const roles = [{ name: "role1" }, { name: "role2" }];
@@ -47,28 +46,9 @@ const state = {
   structureActiveFilters,
 };
 
-const messages = {
-  en: {
-    ...en,
-    "actions.save": "Save",
-    "actions.cancel": "Cancel",
-    "role.search.placeholder": "Search Roles...",
-    "concepts.search.results.empty": "No concepts found",
-    "user.search.placeholder": "Search users...",
-    "domain.selector.placeholder": "Select a domain...",
-    "domain.selector.label": "Domain",
-    "structures.not_found.body":
-      "No structures have been found matching these filters.",
-    "structures.not_found.header": "Nothing found...",
-    "structures.search.placeholder": "Search structures...",
-    "search.placeholder": "Search...",
-    "structures.loading.header": "Loading structures...",
-  },
-};
-
 const variables = { action: "manageSubscriptions" };
 const mocks = [domainsMock(variables), domainsMock(variables)];
-const renderOpts = { state, mocks, messages };
+const renderOpts = { state, mocks };
 const searchProps = {
   loading: false,
   searchParams: {},
@@ -77,99 +57,124 @@ const searchProps = {
 
 describe("<SubscriptionForm />", () => {
   it("matches the latest snapshot", async () => {
-    const { container, findByRole } = render(<SubscriptionForm />, renderOpts);
-    await findByRole("button", { name: "Save" });
-    expect(container).toMatchSnapshot();
+    const rendered = render(<SubscriptionForm />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
   it("test SubscriptionForm functionality", async () => {
     const onSubmit = jest.fn();
     const props = { onSubmit };
-    const { container, getByRole, findByText, queryByTestId, queryByText } =
-      render(
-        <SearchContextWrapper props={searchProps}>
-          <SubscriptionForm {...props} />
-        </SearchContextWrapper>,
-        renderOpts
-      );
-    await waitFor(() => {
-      expect(getByRole("button", { name: "Save" })).toBeDisabled();
-    });
+    const rendered = render(
+      <SearchContextWrapper props={searchProps}>
+        <SubscriptionForm {...props} />
+      </SearchContextWrapper>,
+      renderOpts
+    );
+    await waitForLoad(rendered);
+
+    const user = userEvent.setup({ delay: null });
+
+    expect(
+      rendered.getByRole("button", { name: "actions.save" })
+    ).toBeDisabled();
 
     // Select role
-    userEvent.click(await findByText("Role"));
-    await waitFor(() => {
-      expect(queryByText(/Search Roles/)).toBeInTheDocument();
-    });
-    userEvent.click(await findByText("role2"));
+    await user.click(rendered.getByText("role"));
+
+    await waitFor(() =>
+      expect(rendered.getByText(/role.search.placeholder/i)).toBeInTheDocument()
+    );
+
+    await user.click(await rendered.findByText(/role2/i));
 
     // Select email
-    userEvent.click(await findByText("Email"));
-    await waitFor(() => {
-      expect(queryByTestId("email-input")).toBeInTheDocument();
-    });
-    userEvent.type(queryByTestId("email-input"), "foo");
+    await user.click(rendered.getByText(/email/i));
+
+    await waitFor(() =>
+      expect(rendered.getByTestId("email-input")).toBeInTheDocument()
+    );
+
+    await user.type(rendered.getByTestId("email-input"), "foo");
 
     // Select concept and taxonomy_role
-    userEvent.click(await findByText("Concept"));
-    await waitFor(() => {
-      expect(queryByText("No concepts found")).toBeInTheDocument();
-    });
+    await user.click(rendered.getByText("concept"));
 
-    userEvent.click(await findByText("Role in taxonomy"));
-    await waitFor(() => {
-      expect(queryByText(/Search Roles/)).toBeInTheDocument();
-    });
-    await waitFor(() => {
-      expect(queryByText("No concepts found")).toBeFalsy();
-    });
-    userEvent.click(await findByText("role2"));
+    await waitFor(() =>
+      expect(
+        rendered.getByText(/concepts.search.results.empty/i)
+      ).toBeInTheDocument()
+    );
+
+    await user.click(rendered.getByText("taxonomy_role"));
+
+    await waitFor(() =>
+      expect(rendered.getByText(/role.search.placeholder/i)).toBeInTheDocument()
+    );
+
+    // Wait for concepts.search.results.empty to disappear
+    await rendered.findByText(/role2/i);
+    expect(rendered.queryByText(/concepts.search.results.empty/i)).toBeFalsy();
+
+    await user.click(await rendered.findByText(/role2/i));
 
     // Select user
-    userEvent.click(await findByText("User"));
-    await waitFor(() => {
-      expect(queryByText(/Search users/)).toBeInTheDocument();
-    });
-    userEvent.click(await findByText("user2"));
+    await user.click(rendered.getByText(/user/i));
+
+    await waitFor(() =>
+      expect(rendered.getByText(/user.search.placeholder/i)).toBeInTheDocument()
+    );
+
+    await user.click(await rendered.findByText(/user2/i));
 
     // Test concepts
-    userEvent.click(await findByText("Concept"));
-    await waitFor(() => {
-      expect(queryByText("No concepts found")).toBeInTheDocument();
-    });
+    await user.click(rendered.getByText("concept"));
+
+    await waitFor(() =>
+      expect(
+        rendered.getByText(/concepts.search.results.empty/i)
+      ).toBeInTheDocument()
+    );
 
     // Test structures
-    userEvent.click(await findByText("Structure"));
-    await waitFor(() => {
-      expect(container.querySelector(".loading")).toBeNull();
-    });
-    await waitFor(() => {
+    await user.click(rendered.getByText(/structure/i));
+
+    // Wait for loading to disappear
+    await waitFor(() =>
       expect(
-        queryByText("No structures have been found matching these filters.")
-      ).toBeInTheDocument();
-    });
+        rendered.getByText(/structures.not_found.body/i)
+      ).toBeInTheDocument()
+    );
+
+    expect(rendered.container.querySelector(".loading")).toBeNull();
 
     // Select domains
-    userEvent.click(await findByText("Domain and children"));
-    await waitFor(() => {
-      expect(queryByText(/Select a domain/)).toBeInTheDocument();
-    });
+    await user.click(rendered.getByText(/domains/i));
+
+    await waitFor(() =>
+      expect(
+        rendered.getByText(/domain.selector.placeholder/i)
+      ).toBeInTheDocument()
+    );
 
-    userEvent.click(await findByText("fooDomain"));
-    userEvent.click(await findByText("Daily"));
-    userEvent.click(await findByText("Rule result created"));
-    userEvent.click(await findByText("Goal"));
+    await user.click(await rendered.findByText(/foodomain/i));
 
-    await waitFor(() => {
-      expect(getByRole("button", { name: "Save" })).toBeEnabled();
-    });
+    await user.click(rendered.getByText(/daily/i));
+
+    await user.click(rendered.getByText(/rule_result_created/i));
+
+    await user.click(rendered.getByText(/success/i));
+
+    // Wait for save button to be enabled
+    const saveButton = rendered.getByRole("button", { name: "actions.save" });
+
+    await waitFor(() => expect(saveButton).toBeEnabled());
 
     // Submit
-    await waitFor(() => {
-      userEvent.click(getByRole("button", { name: "Save" }));
-    });
+    await user.click(saveButton);
 
-    await waitFor(() =>
+    // Check that onSubmit was called with the right arguments
+    await waitFor(() => {
       expect(onSubmit).toHaveBeenCalledWith({
         subscriber: { type: "user", identifier: "2" },
         scope: {
@@ -180,54 +185,65 @@ describe("<SubscriptionForm />", () => {
           filters: null,
         },
         periodicity: "daily",
-      })
-    );
+      });
+    });
   });
 
   it("test SubscriptionForm filters functionality", async () => {
     const onSubmit = jest.fn();
     const props = { onSubmit };
 
-    const { getByRole, findByText, queryByText } = render(
-      <SubscriptionForm {...props} />,
-      renderOpts
-    );
+    const rendered = render(<SubscriptionForm {...props} />, renderOpts);
+    await waitForLoad(rendered);
 
-    await waitFor(() => {
-      expect(getByRole("button", { name: "Save" })).toBeDisabled();
-    });
+    const user = userEvent.setup({ delay: null });
+
+    expect(
+      rendered.getByRole("button", { name: "actions.save" })
+    ).toBeDisabled();
 
     // Select user
-    userEvent.click(await findByText("User"));
-    await waitFor(() => {
-      expect(queryByText(/Search users/)).toBeInTheDocument();
-    });
-    userEvent.click(await findByText("user2"));
+    await user.click(rendered.getByText(/user/i));
+
+    await waitFor(() =>
+      expect(rendered.getByText(/user.search.placeholder/i)).toBeInTheDocument()
+    );
+
+    await user.click(await rendered.findByText(/user2/i));
 
     // Select domains
-    userEvent.click(await findByText("Domain and children"));
-    await waitFor(() => {
-      expect(queryByText(/Select a domain/)).toBeInTheDocument();
-    });
+    await user.click(rendered.getByText(/domains/i));
 
-    userEvent.click(await findByText("fooDomain"));
-    userEvent.click(await findByText("Daily"));
-    userEvent.click(await findByText("Comment created"));
-    userEvent.click(await queryByText("Filters to subscription"));
-    userEvent.click(await findByText("Foo"));
-    userEvent.click(await findByText("Xyz"));
-    userEvent.click(await findByText("baz"));
+    await waitFor(() =>
+      expect(
+        rendered.getByText(/domain.selector.placeholder/i)
+      ).toBeInTheDocument()
+    );
 
-    await waitFor(() => {
-      expect(getByRole("button", { name: "Save" })).toBeEnabled();
-    });
+    await user.click(await rendered.findByText(/foodomain/i));
+
+    await user.click(rendered.getByText(/daily/i));
+
+    await user.click(rendered.getByText(/comment_created/i));
+
+    await user.click(rendered.getByText(/subscriptions.selectFilters/i));
+
+    await user.click(await rendered.findByText("Foo"));
+
+    await user.click(rendered.getByText(/xyz/i));
+
+    await user.click(rendered.getByText("baz"));
+
+    // Wait for save button to be enabled
+    const saveButton = rendered.getByRole("button", { name: "actions.save" });
+
+    await waitFor(() => expect(saveButton).toBeEnabled());
 
     // Submit
-    await waitFor(() => {
-      userEvent.click(getByRole("button", { name: "Save" }));
-    });
+    await user.click(saveButton);
 
-    await waitFor(() =>
+    // Check that onSubmit was called with the right arguments
+    await waitFor(() => {
       expect(onSubmit).toHaveBeenCalledWith({
         subscriber: { type: "user", identifier: "2" },
         scope: {
@@ -241,7 +257,7 @@ describe("<SubscriptionForm />", () => {
           },
         },
         periodicity: "daily",
-      })
-    );
+      });
+    });
   });
 });

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

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

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

@@ -1,5 +1,4 @@
-import React from "react";
-import { render } from "@truedat/test/render";
+import { render, waitForLoad } from "@truedat/test/render";
 import SubscriptionNew from "../SubscriptionNew";
 
 const renderOpts = {
@@ -7,8 +6,9 @@ const renderOpts = {
 };
 
 describe("<SubscriptionNew />", () => {
-  it("matches the latest snapshot", () => {
-    const { container } = render(<SubscriptionNew />, renderOpts);
-    expect(container).toMatchSnapshot();
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<SubscriptionNew />, renderOpts);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

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

@@ -1,10 +1,48 @@
-import React from "react";
-import { shallow } from "enzyme";
-import SubscriptionRoutes from "../SubscriptionRoutes";
+import { render, waitForLoad } from "@truedat/test/render";
+import {
+  SUBSCRIPTION,
+  SUBSCRIPTIONS,
+  SUBSCRIPTION_NEW,
+  SUBSCRIPTION_EDIT,
+} from "@truedat/core/routes";
+import { SubscriptionRoutes } from "../SubscriptionRoutes";
 
 describe("<SubscriptionRoutes />", () => {
-  it("matches the latest snapshot", () => {
-    const wrapper = shallow(<SubscriptionRoutes />);
-    expect(wrapper).toMatchSnapshot();
+  it("matches the latest snapshot for route SUBSCRIPTIONS", async () => {
+    const rendered = render(<SubscriptionRoutes />, {
+      routes: [SUBSCRIPTIONS],
+    });
+
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("matches the latest snapshot for route SUBSCRIPTION_NEW", async () => {
+    const rendered = render(<SubscriptionRoutes />, {
+      routes: [SUBSCRIPTION_NEW],
+      state: { templates: [] },
+    });
+
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("matches the latest snapshot for route SUBSCRIPTION_EDIT", async () => {
+    const rendered = render(<SubscriptionRoutes />, {
+      routes: [SUBSCRIPTION_EDIT],
+      state: { templates: [] },
+    });
+
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("matches the latest snapshot for route SUBSCRIPTION", async () => {
+    const rendered = render(<SubscriptionRoutes />, {
+      routes: [SUBSCRIPTION],
+    });
+
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 });

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

@@ -1,5 +1,5 @@
-import React from "react";
-import { shallow } from "enzyme";
+import userEvent from "@testing-library/user-event";
+import { render, waitForLoad } from "@truedat/test/render";
 import { SubscriptionWatchForm } from "../SubscriptionWatchForm";
 
 describe("<SubscriptionWatchForm />", () => {
@@ -10,13 +10,13 @@ describe("<SubscriptionWatchForm />", () => {
       status: ["warn"],
       events: ["rule_result_created"],
       resource_id: 2,
-      resource_type: "rule"
+      resource_type: "rule",
     },
     subscriber: {
       id: 3,
       identifier: "2",
-      type: "user"
-    }
+      type: "user",
+    },
   };
 
   const handleChange = jest.fn();
@@ -30,43 +30,46 @@ describe("<SubscriptionWatchForm />", () => {
     handleChange,
     handleSubmit,
     handleDelete,
-    subscriptionUpdating
+    subscriptionUpdating,
   };
 
-  it("matches the latest snapshot", () => {
-    const wrapper = shallow(<SubscriptionWatchForm {...props} />);
-    expect(wrapper).toMatchSnapshot();
+  it("matches the latest snapshot", async () => {
+    const rendered = render(<SubscriptionWatchForm {...props} />);
+    await waitForLoad(rendered);
+    expect(rendered.container).toMatchSnapshot();
   });
 
-  it("calls handleChange when periodicity field changes", () => {
-    const wrapper = shallow(<SubscriptionWatchForm {...props} />);
-    const name = "periodicity";
-    const e = { preventDefault: jest.fn() };
+  it("calls handleChange when periodicity field changes", async () => {
+    const rendered = render(<SubscriptionWatchForm {...props} />);
+    await waitForLoad(rendered);
+
+    const user = userEvent.setup({ delay: null });
+    const comboBoxes = await rendered.getAllByRole("radio");
+    const periodicityField = comboBoxes.find((el) => el.name === "periodicity");
+    await user.click(periodicityField);
 
-    wrapper
-      .find({ name })
-      .at(1)
-      .simulate("change", e, { name });
-    expect(handleChange.mock.calls.length).toBe(1);
+    expect(handleChange).toHaveBeenCalledTimes(1);
   });
 
-  it("calls handleSubmit on click", () => {
-    const wrapper = shallow(<SubscriptionWatchForm {...props} />);
-    const type = "submit";
-    wrapper
-      .find({ type })
-      .at(0)
-      .simulate("click");
-    expect(handleSubmit.mock.calls.length).toBe(1);
+  it("calls handleSubmit on click", async () => {
+    const rendered = render(<SubscriptionWatchForm {...props} />);
+    await waitForLoad(rendered);
+
+    const user = userEvent.setup({ delay: null });
+    const submitButton = await rendered.getByRole("button", { name: /save/i });
+    await user.click(submitButton);
+
+    expect(handleSubmit).toHaveBeenCalledTimes(1);
   });
 
-  it("calls handleDelete", () => {
-    const wrapper = shallow(<SubscriptionWatchForm {...props} />);
-    const type = "submit";
-    wrapper
-      .find({ type })
-      .at(1)
-      .simulate("click");
-    expect(handleDelete.mock.calls.length).toBe(1);
+  it("calls handleDelete", async () => {
+    const rendered = render(<SubscriptionWatchForm {...props} />);
+    await waitForLoad(rendered);
+
+    const user = userEvent.setup({ delay: null });
+    const deleteButton = rendered.getByRole("button", { name: /remove/i });
+    await user.click(deleteButton);
+
+    expect(handleDelete).toHaveBeenCalledTimes(1);
   });
 });

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

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

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

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

package/src/components/__tests__/__snapshots__/NotificationEvent.spec.js.snap

@@ -9,9 +9,9 @@ exports[`<NotificationEvent /> matches the latest snapshot 1`] = `
       <div
         class="ui orange mini basic label"
       >
-        New
+        notifications.new
       </div>
-      🖋 Alert: New comments added
+      notifications.events.comments
     </h4>
     <p>
       event name
@@ -19,12 +19,12 @@ exports[`<NotificationEvent /> matches the latest snapshot 1`] = `
     <div
       class="ui label"
     >
-      Comment created
+      comment_created
     </div>
     <time
       datetime="1577836800000"
     >
-      2 years ago
+      5 years ago
     </time>
   </div>
 </div>
@@ -39,7 +39,7 @@ exports[`<NotificationEvent /> matches the latest snapshot for external notifica
       <div
         class="ui orange mini basic label"
       >
-        New
+        notifications.new
       </div>
       ↗  Test external notification
     </h4>
@@ -54,7 +54,7 @@ exports[`<NotificationEvent /> matches the latest snapshot for external notifica
     <time
       datetime="1577836800000"
     >
-      2 years ago
+      5 years ago
     </time>
   </div>
 </div>

package/src/components/__tests__/__snapshots__/NotificationsMenu.spec.js.snap

@@ -18,7 +18,7 @@ exports[`<NotificationsMenu /> matches the latest snapshot 1`] = `
       <div
         class="header"
       >
-        Notifications
+        navigation.notifications
       </div>
       <div
         class="divider"
@@ -35,9 +35,9 @@ exports[`<NotificationsMenu /> matches the latest snapshot 1`] = `
             <div
               class="ui orange mini basic label"
             >
-              New
+              notifications.new
             </div>
-            ⚡ Alert: New notifications
+            notifications.events.default
           </h4>
           <p>
             bar
@@ -48,7 +48,7 @@ exports[`<NotificationsMenu /> matches the latest snapshot 1`] = `
             foo
           </div>
           <time
-            datetime="1641034918135"
+            datetime="1735689600000"
           >
             a few seconds ago
           </time>
@@ -77,7 +77,7 @@ exports[`<NotificationsMenu /> matches the latest snapshot with external notific
       <div
         class="header"
       >
-        Notifications
+        navigation.notifications
       </div>
       <div
         class="divider"
@@ -95,7 +95,7 @@ exports[`<NotificationsMenu /> matches the latest snapshot with external notific
             <div
               class="ui orange mini basic label"
             >
-              New
+              notifications.new
             </div>
             ↗  undefined
           </h4>
@@ -108,7 +108,7 @@ exports[`<NotificationsMenu /> matches the latest snapshot with external notific
             external_notification
           </div>
           <time
-            datetime="1641034918135"
+            datetime="1735689600000"
           >
             a few seconds ago
           </time>