From fc57049b8f7d3eea44d2a5d8419612eca9249bf6 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Fri, 29 Apr 2022 14:06:02 -0400
Subject: [PATCH] try and fix test again

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../kube-object-menu/kube-object-menu.test.tsx   |  2 +-
 .../kube-object-menu/kube-object-menu.tsx        | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx
index a73553c5cb..b2ca15ae89 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx
@@ -170,7 +170,7 @@ describe("kube-object-menu", () => {
 
       it("renders", async () => {
         await screen.findByTestId("confirmation-dialog");
-        expect(baseElement).toMatchSnapshot();
+        await waitFor(() => expect(baseElement).toMatchSnapshot());
       });
 
       describe("when remove is confirmed", () => {
diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
index 7ac820f057..9e29093b38 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.tsx
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
@@ -134,17 +134,23 @@ class NonInjectedKubeObjectMenu<Kube extends KubeObject> extends React.Component
   private renderContextMenuItems = (object: KubeObject) => (
     [...this.menuItems]
       .reverse() // This is done because the order that we "grow" is right->left
+      .map(({ icon, ...rest }) => ({
+        ...rest,
+        icon: typeof icon === "string"
+          ? { material: icon }
+          : icon,
+      }))
       .map((item, index) => (
         <MenuItem
           key={`context-menu-item-${index}`}
           onClick={() => item.onClick(object)}
           data-testid={`menu-action-${item.title.toLowerCase().replace(/\s+/, "-")}`}
         >
-          {
-            typeof item.icon === "string"
-              ? <Icon material={item.icon} interactive={this.props.toolbar} tooltip={item.title} />
-              : <Icon {...item.icon} interactive={this.props.toolbar} tooltip={item.title} />
-          }
+          <Icon
+            {...item.icon}
+            interactive={this.props.toolbar}
+            tooltip={item.title}
+          />
           <span className="title">
             {item.title}
           </span>