Merge branch 'master' into electron-11.4.3

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

integration/__tests__/app.tests.ts

@@ -1,5 +1,22 @@
 /**
- * @jest-environment node
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /*
@@ -8,7 +25,7 @@
   TEST_NAMESPACE namespace. This is done to minimize destructive impact of the cluster tests on an existing minikube
   cluster and vice versa.
 */
-import { Application } from "spectron";
+import type { Application } from "spectron";
 import * as utils from "../helpers/utils";
 import { listHelmRepositories } from "../helpers/utils";
 import { fail } from "assert";
@@ -32,6 +49,7 @@ describe("Lens integration tests", () => {
       }
     });
 
+<<<<<<< HEAD
     it('shows "whats new"', async () => {
       await utils.clickWhatsNew(app);
     });
@@ -40,11 +58,18 @@ describe("Lens integration tests", () => {
     //   await app.electron.ipcRenderer.send("test-menu-item-click", "File", "Add Cluster");
     //   await app.client.waitUntilTextExists("h2", "Add Clusters from Kubeconfig");
     // });
+=======
+    it('shows "add cluster"', async () => {
+      await app.electron.ipcRenderer.send("test-menu-item-click", "File", "Add Cluster");
+      await app.client.waitUntilTextExists("h2", "Add Clusters from Kubeconfig");
+    });
+>>>>>>> master
 
     describe("preferences page", () => {
       // it('shows "preferences"', async () => {
       //   const appName: string = process.platform === "darwin" ? "OpenLens" : "File";
 
+<<<<<<< HEAD
       //   await app.mainProcess.send("test-menu-item-click", appName, "Preferences");
       //   await app.client.waitUntilTextExists("[data-testid=application-header]", "APPLICATION");
       // });
@@ -57,6 +82,20 @@ describe("Lens integration tests", () => {
         await app.client.waitUntilTextExists("[data-testid=kubernetes-header]", "KUBERNETES");
         await app.client.elementClick("[data-testid=telemetry-tab]");
         await app.client.waitUntilTextExists("[data-testid=telemetry-header]", "TELEMETRY");
+=======
+        await app.electron.ipcRenderer.send("test-menu-item-click", appName, "Preferences");
+        await app.client.waitUntilTextExists("[data-testid=application-header]", "Application");
+      });
+
+      it("shows all tabs and their contents", async () => {
+        await app.client.click("[data-testid=application-tab]");
+        await app.client.click("[data-testid=proxy-tab]");
+        await app.client.waitUntilTextExists("[data-testid=proxy-header]", "Proxy");
+        await app.client.click("[data-testid=kube-tab]");
+        await app.client.waitUntilTextExists("[data-testid=kubernetes-header]", "Kubernetes");
+        await app.client.click("[data-testid=telemetry-tab]");
+        await app.client.waitUntilTextExists("[data-testid=telemetry-header]", "Telemetry");
+>>>>>>> master
       });
 
       it("ensures helm repos", async () => {

integration/__tests__/cluster-pages.tests.ts

@@ -1,12 +1,33 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 /*
   Cluster tests are run if there is a pre-existing minikube cluster. Before running cluster tests the TEST_NAMESPACE
   namespace is removed, if it exists, from the minikube cluster. Resources are created as part of the cluster tests in the
   TEST_NAMESPACE namespace. This is done to minimize destructive impact of the cluster tests on an existing minikube
   cluster and vice versa.
 */
-import { Application } from "spectron";
+import type { Application } from "spectron";
 import * as utils from "../helpers/utils";
-import { addMinikubeCluster, minikubeReady, waitForMinikubeDashboard } from "../helpers/minikube";
+import { minikubeReady, waitForMinikubeDashboard } from "../helpers/minikube";
 import { exec } from "child_process";
 import * as util from "util";
 
@@ -24,10 +45,7 @@ describe("Lens cluster pages", () => {
   utils.describeIf(ready)("test common pages", () => {
     let clusterAdded = false;
     const addCluster = async () => {
-      await utils.clickWhatsNew(app);
-      await utils.clickWelcomeNotification(app);
       await app.client.waitUntilTextExists("div", "Catalog");
-      await addMinikubeCluster(app);
       await waitForMinikubeDashboard(app);
       await app.client.elementClick('a[href="/nodes"]');
       await app.client.waitUntilTextExists("div.TableCell", "Ready");
@@ -380,7 +398,7 @@ describe("Lens cluster pages", () => {
         await app.client.elementClick(".list .TableRow:first-child");
         await (await app.client.$(".Drawer")).waitForDisplayed();
         await (await app.client.$(`ul.KubeObjectMenu li.MenuItem i[title="Logs"]`)).waitForDisplayed();
-        await app.client.elementClick(".drawer-title .Menu li:nth-child(2)");
+        await app.client.elementClick("ul.KubeObjectMenu li.MenuItem i[title='Logs']");
         // Check if controls are available
         await (await app.client.$(".LogList .VirtualList")).waitForDisplayed();
         await (await app.client.$(".LogResourceSelector")).waitForDisplayed();

integration/__tests__/command-palette.tests.ts

@@ -1,4 +1,25 @@
-import { Application } from "spectron";
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import type { Application } from "spectron";
 import * as utils from "../helpers/utils";
 
 jest.setTimeout(60000);
@@ -18,7 +39,6 @@ describe("Lens command palette", () => {
     });
 
     it("opens command dialog from menu", async () => {
-      await utils.clickWhatsNew(app);
       await app.electron.ipcRenderer.send("test-menu-item-click", "View", "Command Palette...");
       await app.client.waitUntilTextExists(".Select__option", "Preferences: Open");
       await app.client.keys("Escape");

integration/helpers/minikube.ts

@@ -1,5 +1,25 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 import { spawnSync } from "child_process";
-import { Application } from "spectron";
+import type { Application } from "spectron";
 
 export function minikubeReady(testNamespace: string): boolean {
   // determine if minikube is running
@@ -38,25 +58,14 @@ export function minikubeReady(testNamespace: string): boolean {
   return true;
 }
 
-export async function addMinikubeCluster(app: Application) {
-  await (await app.client.$("button.MuiSpeedDial-fab")).waitForDisplayed();
-  await app.client.moveToElement("button.MuiSpeedDial-fab");
-  await (await app.client.$(`button[title="Add from kubeconfig"]`)).waitForDisplayed();
-  await app.client.elementClick(`button[title="Add from kubeconfig"]`);
-  await app.client.waitUntilTextExists("div", "Select kubeconfig file");
-  await app.client.elementClick("div.Select__control"); // show the context drop-down list
-  await app.client.waitUntilTextExists("div", "minikube");
-
-  if (!await app.client.isElementEnabled("button.primary")) {
-    await app.client.elementClick("div.minikube"); // select minikube context
-  } // else the only context, which must be 'minikube', is automatically selected
-  await app.client.elementClick("div.Select__control"); // hide the context drop-down list (it might be obscuring the Add cluster(s) button)
-  await app.client.elementClick("button.primary"); // add minikube cluster
+export async function waitForMinikubeDashboard(app: Application) {
+  await app.client.waitUntilTextExists("div.TableCell", "minikube");
+  await (await app.client.$(".Input.SearchInput input")).waitForExist();
+  await (await app.client.$(".Input.SearchInput input")).setValue("minikube");
   await app.client.waitUntilTextExists("div.TableCell", "minikube");
   await app.client.elementClick("div.TableRow");
-}
-
-export async function waitForMinikubeDashboard(app: Application) {
+  await app.client.waitUntilTextExists("div.drawer-title-text", "KubernetesCluster: minikube");
+  await app.client.elementClick("div.EntityIcon div.HotbarIcon div div.MuiAvatar-root");
   await app.client.waitUntilTextExists("pre.kube-auth-out", "Authentication proxy started");
   await (await app.client.$(`iframe[name="minikube"]`)).waitForDisplayed();
   await (await app.client.$("iframe[name=minikube]")).waitForExist();

integration/helpers/utils.ts

@@ -1,3 +1,23 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 import { Application } from "spectron";
 import * as util from "util";
 import { exec } from "child_process";
@@ -72,6 +92,7 @@ export async function appStart() {
   while (await startedApp.client.getWindowCount() > 1);
   await startedApp.client.windowByIndex(0);
   await startedApp.client.waitUntilWindowLoaded();
+  await showCatalog(app);
 
   return startedApp;
 }
@@ -92,6 +113,11 @@ export async function clickWelcomeNotification(app: Application) {
   }
 }
 
+export async function showCatalog(app: Application) {
+  await app.client.waitUntilTextExists("[data-test-id=catalog-link]", "Catalog");
+  await app.client.elementClick("[data-test-id=catalog-link]");
+}
+
 type AsyncPidGetter = () => Promise<number>;
 
 export async function tearDown(app: Application) {