Merge branch 'master' into electron-11.4.3

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

integration/__tests__/cluster-pages.tests.ts

@@ -91,7 +91,7 @@ describe("Lens cluster pages", () => {
           name: "Cluster",
           href: "cluster",
           expectedSelector: "div.ClusterOverview div.label",
-          expectedText: "Master"
+          expectedText: "CPU"
         }]
       },
       {

integration/helpers/minikube.ts

@@ -40,7 +40,7 @@ export function minikubeReady(testNamespace: string): boolean {
 
 export async function addMinikubeCluster(app: Application) {
   await (await app.client.$("button.MuiSpeedDial-fab")).waitForDisplayed();
-  await app.client.elementClick("button.MuiSpeedDial-fab");
+  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");

integration/helpers/utils.ts

@@ -85,7 +85,7 @@ export async function clickWhatsNew(app: Application) {
 export async function clickWelcomeNotification(app: Application) {
   const itemsText = await app.client.getElementText("div.info-panel");
 
-  if (itemsText === "0 item") {
+  if (itemsText === "0 items") {
     // welcome notification should be present, dismiss it
     await app.client.waitUntilTextExists("div.message", "Welcome!");
     await app.client.elementClick(".notification i.Icon.close");