From eb9932796185502fb9abb1471be8eaad1e88251e Mon Sep 17 00:00:00 2001
From: Jackson Morgan <jacksonmorgan@jackson-mac.local>
Date: Sat, 9 Mar 2024 17:14:51 -0500
Subject: [PATCH] Completed tests for jsonld-dataset-proxy context upgrade

---
 packages/solid-react/src/util/TrackingProxyContext.ts | 5 +++--
 packages/solid-react/test/Integration.test.tsx        | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/solid-react/src/util/TrackingProxyContext.ts b/packages/solid-react/src/util/TrackingProxyContext.ts
index de94629..1b97717 100644
--- a/packages/solid-react/src/util/TrackingProxyContext.ts
+++ b/packages/solid-react/src/util/TrackingProxyContext.ts
@@ -50,12 +50,13 @@ export class TrackingProxyContext extends ProxyContext {
       receiver,
     ) => {
       const subject = target["@id"];
+      const rdfTypes = this.getRdfType(subject);
       if (typeof key === "symbol") {
         // Do Nothing
       } else if (key === "@id") {
         this.addListener([subject, null, null, null]);
-      } else if (!this.contextUtil.isArray(key)) {
-        const predicate = namedNode(this.contextUtil.keyToIri(key));
+      } else if (!this.contextUtil.isArray(key, rdfTypes)) {
+        const predicate = namedNode(this.contextUtil.keyToIri(key, rdfTypes));
         this.addListener([subject, predicate, null, null]);
       }
       return oldGetFunction && oldGetFunction(target, key, receiver);
diff --git a/packages/solid-react/test/Integration.test.tsx b/packages/solid-react/test/Integration.test.tsx
index 8ab44cc..4d2d28e 100644
--- a/packages/solid-react/test/Integration.test.tsx
+++ b/packages/solid-react/test/Integration.test.tsx
@@ -96,7 +96,9 @@ describe("Integration Tests", () => {
       await screen.findByText("Hidden");
       fireEvent.click(screen.getByText("Show Component"));
       await screen.findByText("Loading");
-      const resourceStatus2 = await screen.findByRole("status");
+      const resourceStatus2 = await screen.findByRole("status", undefined, {
+        timeout: 5000,
+      });
       expect(resourceStatus2.innerHTML).toBe("dataReadSuccess");
     });