From bad935e1b4d1cdf4aaca0b25c80bde55c8d3a812 Mon Sep 17 00:00:00 2001
From: Benjamin Kane <ben@voxel51.com>
Date: Fri, 27 Sep 2024 12:02:07 -0400
Subject: [PATCH] e2e fixes

---
 .../src/components/Sidebar/Entries/PathValueEntry.tsx    | 9 +++++----
 e2e-pw/src/oss/poms/modal/modal-sidebar.ts               | 6 +++---
 e2e-pw/src/oss/specs/smoke-tests/summary-fields.spec.ts  | 6 ++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx b/app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx
index 497622791c..d4114821fa 100644
--- a/app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx
+++ b/app/packages/core/src/components/Sidebar/Entries/PathValueEntry.tsx
@@ -197,6 +197,7 @@ const ListValueEntry = ({
           </span>
           <Arrow
             key="arrow"
+            data-cy={`sidebar-field-arrow-enabled-${path}`}
             style={{ cursor: "pointer", margin: 0 }}
             onClick={(event) => {
               event.preventDefault();
@@ -255,7 +256,7 @@ const ListLoadable = ({ path }: { path: string }) => {
   }, [data, field, fields, timeZone]);
 
   return (
-    <ListContainer>
+    <ListContainer data-cy={`sidebar-entry-${path}`}>
       {values.map((v, i) => (
         <div key={i.toString()} title={typeof v === "string" ? v : undefined}>
           {v === null ? "None" : v}
@@ -531,12 +532,12 @@ const formatObject = ({
 
       return (
         <div
-          data-cy={`${k}-${text}`}
+          data-cy={`key-value-${k}-${text}`}
           key={k}
           style={{ display: "flex", justifyContent: "space-between" }}
         >
-          <span data-cy={k}>{k}</span>
-          <span data-cy={text}>{text}</span>
+          <span data-cy={`key-${k}`}>{k}</span>
+          <span data-cy={`value-${text}`}>{text}</span>
         </div>
       );
     })
diff --git a/e2e-pw/src/oss/poms/modal/modal-sidebar.ts b/e2e-pw/src/oss/poms/modal/modal-sidebar.ts
index c1de8fc406..7a7ae699cc 100644
--- a/e2e-pw/src/oss/poms/modal/modal-sidebar.ts
+++ b/e2e-pw/src/oss/poms/modal/modal-sidebar.ts
@@ -131,10 +131,10 @@ class SidebarAsserter {
 
     for (const k in obj) {
       const v = obj[k];
-      const entry = locator.getByTestId(`${k}-${v}`);
+      const entry = locator.getByTestId(`key-value-${k}-${v}`);
 
-      await expect(entry.getByTestId(k)).toHaveText(k);
-      await expect(entry.getByTestId(v)).toHaveText(v);
+      await expect(entry.getByTestId(`key-${k}`)).toHaveText(k);
+      await expect(entry.getByTestId(`value-${v}`)).toHaveText(v);
     }
   }
 
diff --git a/e2e-pw/src/oss/specs/smoke-tests/summary-fields.spec.ts b/e2e-pw/src/oss/specs/smoke-tests/summary-fields.spec.ts
index 2d72eb3dfd..42d492153d 100644
--- a/e2e-pw/src/oss/specs/smoke-tests/summary-fields.spec.ts
+++ b/e2e-pw/src/oss/specs/smoke-tests/summary-fields.spec.ts
@@ -42,6 +42,7 @@ test.describe("summary fields", () => {
   });
 
   test("modal sidebar summary fields render", async ({
+    eventUtils,
     fiftyoneLoader,
     grid,
     modal,
@@ -54,7 +55,12 @@ test.describe("summary fields", () => {
       one: "two",
       three: "four",
     });
+    const entryExpandPromise = eventUtils.getEventReceivedPromiseForPredicate(
+      "animation-onRest",
+      () => true
+    );
     await modal.sidebar.clickFieldDropdown("summaries");
+    await entryExpandPromise;
     await modal.sidebar.assert.verifyObject("summaries", {
       five: "six",
       seven: "eight",