From 1fe80e2c072f0c1600f1af9336fa9d9cf8588a4a Mon Sep 17 00:00:00 2001
From: Robert Gabriel Macalintal <robertgabriel.macalintal@agr.gc.ca>
Date: Mon, 6 Jan 2025 09:04:01 -0500
Subject: [PATCH] Migrated object-store/object-subtype/edit.test.tsx to RTL

---
 .../object-store/object-subtype/edit.test.tsx | 66 +++++++++++--------
 .../object/__tests__/view.test.tsx            |  2 -
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/packages/dina-ui/page-tests/object-store/object-subtype/edit.test.tsx b/packages/dina-ui/page-tests/object-store/object-subtype/edit.test.tsx
index 963384fc23..2827a4a01f 100644
--- a/packages/dina-ui/page-tests/object-store/object-subtype/edit.test.tsx
+++ b/packages/dina-ui/page-tests/object-store/object-subtype/edit.test.tsx
@@ -1,7 +1,9 @@
 import { OperationsResponse } from "common-ui";
 import { ObjectSubtypeEditPage } from "../../../pages/object-store/object-subtype/edit";
-import { mountWithAppContext } from "../../../test-util/mock-app-context";
+import { mountWithAppContext2 } from "../../../test-util/mock-app-context";
 import { ObjectSubtype } from "../../../types/objectstore-api/resources/ObjectSubtype";
+import { fireEvent } from "@testing-library/react";
+import "@testing-library/jest-dom";
 
 // Mock out the Link component, which normally fails when used outside of a Next app.
 jest.mock("next/link", () => ({ children }) => <div>{children}</div>);
@@ -46,26 +48,31 @@ describe("Object subtype edit page", () => {
       ] as OperationsResponse
     });
 
-    const wrapper = mountWithAppContext(
+    const wrapper = mountWithAppContext2(
       <ObjectSubtypeEditPage router={{ query: {}, push: mockPush } as any} />,
       { apiContext }
     );
 
-    expect(wrapper.find(".acSubtype-field input")).toHaveLength(1);
+    expect(
+      wrapper.getAllByRole("textbox", { name: /object subtype/i })
+    ).toHaveLength(1);
 
     // Edit the subtype name.
-
-    wrapper.find(".acSubtype-field input").simulate("change", {
-      target: {
-        name: "acSubtype",
-        value: "libre office word"
+    fireEvent.change(
+      wrapper.getByRole("textbox", { name: /object subtype/i }),
+      {
+        target: {
+          name: "acSubtype",
+          value: "libre office word"
+        }
       }
-    });
+    );
 
     // Submit the form.
-    wrapper.find("form").simulate("submit");
+    fireEvent.submit(wrapper.container.querySelector("form")!);
     await new Promise(setImmediate);
 
+    // Test expected response
     expect(mockPatch).lastCalledWith(
       "/objectstore-api/operations",
       [
@@ -102,7 +109,7 @@ describe("Object subtype edit page", () => {
       ] as OperationsResponse
     });
 
-    const wrapper = mountWithAppContext(
+    const wrapper = mountWithAppContext2(
       <ObjectSubtypeEditPage
         router={{ query: { id: 1 }, push: mockPush } as any}
       />,
@@ -110,24 +117,29 @@ describe("Object subtype edit page", () => {
     );
 
     // The page should load initially with a loading spinner.
-    expect(wrapper.find(".spinner-border").exists()).toEqual(true);
+    expect(wrapper.getByText(/loading\.\.\./i)).toBeInTheDocument();
 
     // Wait for the form to load.
     await new Promise(setImmediate);
-    wrapper.update();
 
     // Check that the existing existing subtype value is in the field.
-    expect(wrapper.find(".acSubtype-field input").prop("value")).toEqual(
-      "word file"
-    );
+    expect(
+      wrapper.getByRole("textbox", { name: /object subtype/i })
+    ).toHaveValue("word file");
 
     // Modify the acSubtype value.
-    wrapper.find(".acSubtype-field input").simulate("change", {
-      target: { name: "acSubtype", value: "new subtype value" }
-    });
+    fireEvent.change(
+      wrapper.getByRole("textbox", { name: /object subtype/i }),
+      {
+        target: {
+          name: "acSubtype",
+          value: "new subtype value"
+        }
+      }
+    );
 
     // Submit the form.
-    wrapper.find("form").simulate("submit");
+    fireEvent.submit(wrapper.container.querySelector("form")!);
 
     await new Promise(setImmediate);
 
@@ -172,20 +184,22 @@ describe("Object subtype edit page", () => {
       ] as OperationsResponse
     }));
 
-    const wrapper = mountWithAppContext(
+    const wrapper = mountWithAppContext2(
       <ObjectSubtypeEditPage router={{ query: {}, push: mockPush } as any} />,
       { apiContext }
     );
 
     // Submit the form.
-    wrapper.find("form").simulate("submit");
+    fireEvent.submit(wrapper.container.querySelector("form")!);
 
     await new Promise(setImmediate);
 
-    wrapper.update();
-    expect(wrapper.find(".alert.alert-danger").text()).toEqual(
-      "Constraint violation: DcType and subtype combination should be unique"
-    );
+    // Test expected error
+    expect(
+      wrapper.getByText(
+        "Constraint violation: DcType and subtype combination should be unique"
+      )
+    ).toBeInTheDocument();
     expect(mockPush).toBeCalledTimes(0);
   });
 });
diff --git a/packages/dina-ui/page-tests/object-store/object/__tests__/view.test.tsx b/packages/dina-ui/page-tests/object-store/object/__tests__/view.test.tsx
index 31b37521c6..a69409e9f3 100644
--- a/packages/dina-ui/page-tests/object-store/object/__tests__/view.test.tsx
+++ b/packages/dina-ui/page-tests/object-store/object/__tests__/view.test.tsx
@@ -2,9 +2,7 @@ import { PersistedResource } from "kitsu";
 import MetadataViewPage from "../../../../pages/object-store/object/view";
 import { mountWithAppContext2 } from "../../../../test-util/mock-app-context";
 import { Metadata } from "../../../../types/objectstore-api";
-import { fireEvent, screen } from "@testing-library/react";
 import "@testing-library/jest-dom";
-import userEvent from "@testing-library/user-event";
 
 const TEST_METADATA: PersistedResource<Metadata> = {
   acTags: ["tag1", "tag2"],