From e65b182a0db12b550b439ac6d7e6ecea2c34295a Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Mon, 12 Apr 2021 10:26:29 +0300
Subject: [PATCH] fix integration tests

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 integration/helpers/minikube.ts                         | 5 ++++-
 src/renderer/components/+catalog/catalog-add-button.tsx | 8 +++-----
 src/renderer/components/+catalog/catalog.tsx            | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/integration/helpers/minikube.ts b/integration/helpers/minikube.ts
index 2c62279e4b..4c7120c4c5 100644
--- a/integration/helpers/minikube.ts
+++ b/integration/helpers/minikube.ts
@@ -39,7 +39,10 @@ export function minikubeReady(testNamespace: string): boolean {
 }
 
 export async function addMinikubeCluster(app: Application) {
-  await app.client.click("button.add-button");
+  await app.client.waitForVisible("button.MuiSpeedDial-fab");
+  await app.client.click("button.MuiSpeedDial-fab");
+  await app.client.waitForVisible(`button[title="Add from kubeconfig"]`);
+  await app.client.click(`button[title="Add from kubeconfig"]`);
   await app.client.waitUntilTextExists("div", "Select kubeconfig file");
   await app.client.click("div.Select__control"); // show the context drop-down list
   await app.client.waitUntilTextExists("div", "minikube");
diff --git a/src/renderer/components/+catalog/catalog-add-button.tsx b/src/renderer/components/+catalog/catalog-add-button.tsx
index 381e2a36ea..6da733af7c 100644
--- a/src/renderer/components/+catalog/catalog-add-button.tsx
+++ b/src/renderer/components/+catalog/catalog-add-button.tsx
@@ -19,10 +19,8 @@ export class CatalogAddButton extends React.Component<CatalogAddButtonProps> {
   protected menuItems = observable.array<CatalogEntityContextMenu>([]);
 
   componentDidMount() {
-    const { category } = this.props;
-
     disposeOnUnmount(this, [
-      reaction(() => category, (category) => {
+      reaction(() => this.props.category, (category) => {
         this.menuItems.clear();
 
         if (category && category instanceof EventEmitter) {
@@ -65,8 +63,8 @@ export class CatalogAddButton extends React.Component<CatalogAddButtonProps> {
         { this.menuItems.map((menuItem, index) => {
           return <SpeedDialAction
             key={index}
-            icon={<Icon material="text_snippet" />}
-            tooltipTitle="Import Kubeconfig"
+            icon={<Icon material={menuItem.icon} />}
+            tooltipTitle={menuItem.title}
             onClick={() => menuItem.onClick()}
           />;
         })}
diff --git a/src/renderer/components/+catalog/catalog.tsx b/src/renderer/components/+catalog/catalog.tsx
index 46f56b7ee7..dfc40e62d1 100644
--- a/src/renderer/components/+catalog/catalog.tsx
+++ b/src/renderer/components/+catalog/catalog.tsx
@@ -161,7 +161,7 @@ export class Catalog extends React.Component {
         provideBackButtonNavigation={false}
         contentGaps={false}>
         <ItemListLayout
-          renderHeaderTitle="Catalog"
+          renderHeaderTitle={this.catalogEntityStore.activeCategory?.metadata.name}
           isClusterScoped
           isSearchable={true}
           isSelectable={false}