From a77f3a2026a1238f4fb7505642e7d06c33b2f6aa Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 17 Sep 2020 15:24:47 -0400
Subject: [PATCH] fix integration tests not deselecting dropdown

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 integration/specs/app_spec.ts | 56 +++++++++++++++++------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/integration/specs/app_spec.ts b/integration/specs/app_spec.ts
index c3e4044d3b..b91353017f 100644
--- a/integration/specs/app_spec.ts
+++ b/integration/specs/app_spec.ts
@@ -6,39 +6,39 @@ jest.setTimeout(30000)
 
 const BACKSPACE = "\uE003"
 
+async function clickWhatsNew(app: Application) {
+  await app.client.waitUntilTextExists("h1", "What's new")
+  await app.client.click("button.primary")
+  await app.client.waitUntilTextExists("h1", "Welcome")
+}
+
+async function addMinikubeCluster(app: Application) {
+  await app.client.click("div.add-cluster")
+  await app.client.waitUntilTextExists("div", "Select kubeconfig file")
+  await app.client.click("div.Select__control")
+  await app.client.waitUntilTextExists("div", "minikube")
+  await app.client.click("div.minikube")
+  await app.client.click("div.Select__control")
+  await app.client.click("button.primary")
+}
+
+async function waitForMinikubeDashboard(app: Application) {
+  await app.client.waitUntilTextExists("pre.kube-auth-out", "Authentication proxy started")
+  await app.client.getWindowCount()
+  await app.client.waitForExist(`iframe[name="minikube"]`)
+  await app.client.frame("minikube")
+  await app.client.waitUntilTextExists("span.link-text", "Cluster")
+}
+
 describe("app start", () => {
   let app: Application
-  const clickWhatsNew = async (app: Application) => {
-    await app.client.waitUntilTextExists("h1", "What's new")
-    await app.client.click("button.primary")
-    await app.client.waitUntilTextExists("h1", "Welcome")
-  }
-
-  const addMinikubeCluster = async (app: Application) => {
-    await app.client.click("div.add-cluster")
-    await app.client.waitUntilTextExists("div", "Select kubeconfig file")
-    await app.client.click("div.Select__control")
-    await app.client.waitUntilTextExists("div", "minikube")
-    await app.client.click("div.minikube")
-    await app.client.click("button.primary")
-  }
-
-  const waitForMinikubeDashboard = async (app: Application) => {
-    await app.client.waitUntilTextExists("pre.kube-auth-out", "Authentication proxy started")
-    let windowCount = await app.client.getWindowCount()
-    await app.client.waitForExist(`iframe[name="minikube"]`)
-    await app.client.frame("minikube")
-    await app.client.waitUntilTextExists("span.link-text", "Cluster")
-  }
 
   beforeEach(async () => {
     app = util.setup()
     await app.start()
     await app.client.waitUntilWindowLoaded()
-    let windowCount = await app.client.getWindowCount()
-    while (windowCount > 1) { // Wait for splash screen to be closed
-      windowCount = await app.client.getWindowCount()
-    }
+    // Wait for splash screen to be closed
+    while (await app.client.getWindowCount() > 1);
     await app.client.windowByIndex(0)
     await app.client.waitUntilWindowLoaded()
   }, 20000)
@@ -48,7 +48,7 @@ describe("app start", () => {
   })
 
   it('allows to add a cluster', async () => {
-    const status = spawnSync("minikube status", {shell: true})
+    const status = spawnSync("minikube status", { shell: true })
     if (status.status !== 0) {
       console.warn("minikube not running, skipping test")
       return
@@ -61,7 +61,7 @@ describe("app start", () => {
   })
 
   it('allows to create a pod', async () => {
-    const status = spawnSync("minikube status", {shell: true})
+    const status = spawnSync("minikube status", { shell: true })
     if (status.status !== 0) {
       console.warn("minikube not running, skipping test")
       return