From 0350fa53ff1a2552305ae64a06b9e1ecdb200178 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Mon, 11 Oct 2021 17:30:12 +0300
Subject: [PATCH] fix integration tests

Signed-off-by: Roman <ixrock@gmail.com>
---
 integration/__tests__/cluster-pages.tests.ts | 54 ++++++++++----------
 src/renderer/components/dock/logs.tsx        |  2 +-
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/integration/__tests__/cluster-pages.tests.ts b/integration/__tests__/cluster-pages.tests.ts
index 1fa5970bc1..63dab255ca 100644
--- a/integration/__tests__/cluster-pages.tests.ts
+++ b/integration/__tests__/cluster-pages.tests.ts
@@ -364,9 +364,11 @@ utils.describeIf(minikubeReady(TEST_NAMESPACE))("Minikube based tests", () => {
     await kubeApiServerRow.click();
     await frame.waitForSelector(".Drawer", { state: "visible" });
 
-    const logButton = await frame.waitForSelector("ul.KubeObjectMenu li.MenuItem i.Icon span[data-icon-name='subject']");
+    const podLogsIcon = await frame.waitForSelector(".Drawer .drawer-title .Icon >> text=subject");
 
-    await logButton.click();
+    await podLogsIcon.click();
+
+    await frame.waitForSelector(".Dock.isOpen");
 
     // Check if controls are available
     await frame.waitForSelector(".LogList .VirtualList");
@@ -433,31 +435,31 @@ utils.describeIf(minikubeReady(TEST_NAMESPACE))("Minikube based tests", () => {
       await frame.waitForTimeout(100_000);
     }
 
-    const inputField = await frame.waitForSelector(".CreateResource .MonacoEditor");
+    const testPodName = "nginx-create-pod-test";
+    const monacoEditor = await frame.waitForSelector(".DockTabContent .MonacoEditor");
 
-    await inputField.click();
-    await inputField.type("apiVersion: v1", { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
-    await inputField.type("kind: Pod", { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
-    await inputField.type("metadata:", { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
-    await inputField.type("  name: nginx-create-pod-test", { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
-    await inputField.type(`namespace: ${TEST_NAMESPACE}`, { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
-    await inputField.press("Backspace", { delay: 10 });
-    await inputField.type("spec:", { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
-    await inputField.type("  containers:", { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
-    await inputField.type("- name: nginx-create-pod-test", { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
-    await inputField.type("  image: nginx:alpine", { delay: 10 });
-    await inputField.press("Enter", { delay: 10 });
+    await monacoEditor.click();
+    await monacoEditor.type("apiVersion: v1", { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
+    await monacoEditor.type("kind: Pod", { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
+    await monacoEditor.type("metadata:", { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
+    await monacoEditor.type(`  name: ${testPodName}`, { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
+    await monacoEditor.type(`namespace: ${TEST_NAMESPACE}`, { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
+    await monacoEditor.press("Backspace", { delay: 10 });
+    await monacoEditor.type("spec:", { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
+    await monacoEditor.type("  containers:", { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
+    await monacoEditor.type(`- name: ${testPodName}`, { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
+    await monacoEditor.type("  image: nginx:alpine", { delay: 10 });
+    await monacoEditor.press("Enter", { delay: 10 });
 
-    await frame.click("button.Button >> text='Create & Close'");
-    await frame.click("div.TableCell >> text=nginx-create-pod-test");
-    await frame.waitForSelector("div.drawer-title-text >> text='Pod: nginx-create-pod-test'");
+    await frame.click(".Dock .Button >> text='Create'");
+    await frame.waitForSelector(`.TableCell >> text=${testPodName}`);
   }, 10*60*1000);
 });
diff --git a/src/renderer/components/dock/logs.tsx b/src/renderer/components/dock/logs.tsx
index d8bc4850a7..7fd5311e4a 100644
--- a/src/renderer/components/dock/logs.tsx
+++ b/src/renderer/components/dock/logs.tsx
@@ -143,7 +143,7 @@ export class Logs extends React.Component<Props> {
     }
 
     return (
-      <div className="PodLogs flex column">
+      <div className="PodLogs flex column box grow">
         {this.renderResourceSelector(data)}
         <LogList
           logs={logs}