[test] Fix Public UI tests

Stabilizing the Public UI tests after update to vscode-extension-tester@8.23.0

- Extension test
- Project test
- Create Component test

Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>

Author: vrubezhny

test/ui/suite/createComponent.ts

@@ -13,10 +13,9 @@ import {
     InputBox,
     NotificationType,
     SideBarView,
-    ViewSection,
     VSBrowser,
     WelcomeContentButton,
-    Workbench,
+    Workbench
 } from 'vscode-extension-tester';
 import { notificationExists } from '../common/conditions';
 import { BUTTONS, INPUTS, MENUS, NOTIFICATIONS, VIEWS } from '../common/constants';
@@ -36,7 +35,6 @@ import {
 export function testCreateComponent(path: string) {
     describe('Create Component Wizard', function () {
         let view: SideBarView;
-        let section: ViewSection;
         let button: WelcomeContentButton;
         let componentName: string;
         let dlt = true;
@@ -83,14 +81,16 @@ export function testCreateComponent(path: string) {
             await createComponent(createCompView);
 
             componentName = 'node-js-runtime';
-            expect(await section.findItem(componentName)).to.be.not.undefined;
+
+            const item = await waitForItem(componentName);
+            expect(item).to.be.not.undefined;
 
             dlt = false;
         });
 
         it('Create component from local folder', async function test() {
             this.timeout(25_000);
-            const component = await section.findItem(componentName);
+            const component = await waitForItem(componentName);
             const contextMenu = await component.openContextMenu();
             await contextMenu.select(MENUS.deleteConfiguration);
 
@@ -127,11 +127,10 @@ export function testCreateComponent(path: string) {
                 setTimeout(res, 500);
             });
             await localCodeBasePage.clickCreateComponent();
-            await new Promise((res) => {
-                setTimeout(res, 6_000);
-            });
 
-            expect(await section.findItem(componentName)).to.be.not.undefined;
+            const item = await waitForItem(componentName);
+            expect(item).to.be.not.undefined;
+
             dlt = true;
         });
 
@@ -163,7 +162,8 @@ export function testCreateComponent(path: string) {
 
             //check if component is in component view
             componentName = 'nodejs-starter';
-            expect(await section.findItem(componentName)).to.be.not.undefined;
+            const item = await waitForItem(componentName);
+            expect(item).to.be.not.undefined;
 
             dlt = false;
         });
@@ -172,7 +172,7 @@ export function testCreateComponent(path: string) {
         afterEach(async function context() {
             this.timeout(30_000);
             if (componentName && dlt) {
-                const component = await section.findItem(componentName);
+                const component = await waitForItem(componentName);
                 const contextMenu = await component.openContextMenu();
                 await contextMenu.select(MENUS.deleteSourceCodeFolder);
                 const notification = await notificationExists(
@@ -212,9 +212,6 @@ export function testCreateComponent(path: string) {
             await page.clearProjectFolderPath();
             await page.insertProjectFolderPath(path);
             await page.clickCreateComponentButton();
-            await new Promise((res) => {
-                setTimeout(res, 6_000);
-            });
         }
 
         async function initializeEditor(): Promise<CreateComponentWebView> {
@@ -224,13 +221,16 @@ export function testCreateComponent(path: string) {
         }
 
         async function refreshView() {
+            let section = await view.getContent().getSection(VIEWS.components);
+
             await section.collapse();
             await section.expand();
+            await new Promise(res => setTimeout(res, 1_000));
+
+            section = await view.getContent().getSection(VIEWS.components);
             const refresh = await section.getAction('Refresh Components View');
             await refresh.click();
-            await new Promise((res) => {
-                setTimeout(res, 1_000);
-            });
+            await new Promise((res) => setTimeout(res, 1_000));
         }
 
         async function clickCreateComponent() {
@@ -241,7 +241,7 @@ export function testCreateComponent(path: string) {
         }
 
         async function loadCreateComponentButton() {
-            section = await view.getContent().getSection(VIEWS.components);
+            const section = await view.getContent().getSection(VIEWS.components);
             await VSBrowser.instance.driver.wait(async () => {
                 const buttons = await (await section.findWelcomeContent()).getButtons();
                 for (const btn of buttons) {
@@ -252,5 +252,26 @@ export function testCreateComponent(path: string) {
                 }
             }, 10_000);
         }
+
+        async function waitForItem(label, timeout = 15000) {
+            const section = await view.getContent().getSection(VIEWS.components);
+
+            const start = Date.now();
+
+            while (Date.now() - start < timeout) {
+                try {
+                    const item = await section.findItem(label);
+                    if (item) {
+                        return item;
+                    }
+                } catch {
+                    // ignore transient errors
+                }
+
+                await new Promise(res => setTimeout(res, 500));
+            }
+
+            throw new Error(`Item "${label}" not found in section within ${timeout}ms`);
+        }
     });
 }

test/ui/suite/extension.ts

@@ -4,46 +4,46 @@
  *-----------------------------------------------------------------------------------------------*/
 
 import { expect } from 'chai';
-import { ActivityBar, ExtensionsViewItem, ExtensionsViewSection, SideBarView } from 'vscode-extension-tester';
+import { ActivityBar, ExtensionsViewItem, SideBarView } from 'vscode-extension-tester';
 import * as pjson from '../../../package.json';
 import { VIEWS } from '../common/constants';
 
 export function checkExtension() {
     describe('Extensions view check', () => {
-        let extView: ExtensionsViewSection;
-        let item: ExtensionsViewItem;
-
-        before(async function () {
-            this.timeout(15_000);
-            const btn = await new ActivityBar().getViewControl(VIEWS.extensions);
-            await btn.openView();
-            extView = await new SideBarView().getContent().getSection(VIEWS.installed);
-            item = await extView.findItem(`@installed ${pjson.displayName}`);
+
+        beforeEach(async function () {
+            this.timeout(15000);
+
+            const view = await new ActivityBar().getViewControl(VIEWS.extensions);
+            await view.openView();
+
+            await new Promise(res => setTimeout(res, 500));
         });
 
-        it('Openshift Toolkit is installed', () => {
+        it('Openshift Toolkit is installed', async function () {
+            this.timeout(30000);
+
+            const item = await getItem();
             expect(item).not.undefined;
         });
 
-        it('Openshift toolkit has the correct attributes', async function() {
-            this.timeout(15_000)
-            let version: string;
-            let author: string;
-            let desc: string;
-            try{
-                version = await item.getVersion();
-                author = await item.getAuthor();
-                desc = await item.getDescription();
-            } catch {
-                await new Promise(res => setTimeout(res, 5_000));
-                version = await item.getVersion();
-                author = await item.getAuthor();
-                desc = await item.getDescription();
-            }
+        it('Openshift toolkit has the correct attributes', async function () {
+            this.timeout(30000);
+
+            const item = await getItem();
+
+            const version = await item.getVersion();
+            const author = await item.getAuthor();
+            const desc = await item.getDescription();
 
             expect(version).equals(pjson.version);
             expect(author).equals(pjson.author);
             expect(desc).equals(pjson.description);
         });
+
+        async function getItem(): Promise<ExtensionsViewItem> {
+            const section = await new SideBarView().getContent().getSection(VIEWS.installed);
+            return await section.findItem(`@installed ${pjson.displayName}`) as ExtensionsViewItem;
+        }
     });
-}
+}

test/ui/suite/project.ts

@@ -4,22 +4,21 @@
  *-----------------------------------------------------------------------------------------------*/
 
 import {
-    SideBarView,
-    ViewSection,
+    ActivityBar,
     EditorView,
     InputBox,
-    ActivityBar,
-    NotificationType,
-    Workbench,
+    SideBarView,
     TreeItem,
     VSBrowser,
-    before,
-    beforeEach,
+    ViewSection,
+    Workbench,
     after,
+    before,
+    beforeEach
 } from 'vscode-extension-tester';
+import { activateCommand } from '../common/command-activator';
 import { itemExists, notificationExists } from '../common/conditions';
 import { INPUTS, MENUS, NOTIFICATIONS, VIEWS } from '../common/constants';
-import { activateCommand } from '../common/command-activator';
 
 export function projectTest(isOpenshiftCluster: boolean) {
     describe('Work with project', function () {
@@ -33,25 +32,25 @@ export function projectTest(isOpenshiftCluster: boolean) {
         const deleteProject = isOpenshiftCluster ? MENUS.deleteProject : MENUS.deleteNamespace;
 
         let view: SideBarView;
-        let explorer: ViewSection;
 
         let projectName: string;
         let anotherProjectName: string;
 
         before(async function () {
             this.timeout(10_000);
             view = await (await new ActivityBar().getViewControl(VIEWS.openshift)).openView();
-            explorer = await view.getContent().getSection(VIEWS.appExplorer);
+            try {
+                const notifications = await new Workbench().getNotifications();
+                for (const n of notifications) {
+                    try { await n.dismiss(); } catch { /* Ignore */ }
+                }
+            } catch { /* Ignore */ }
+            const explorer = await getExplorer();
             await explorer.expand();
             await itemExists(clusterName, explorer);
         });
 
         beforeEach(async function () {
-            const notificationCenter = await new Workbench().openNotificationsCenter();
-            const notifications = await notificationCenter.getNotifications(NotificationType.Any);
-            if (notifications.length > 0) {
-                await notificationCenter.close();
-            }
             await new EditorView().closeAllEditors();
         });
 
@@ -65,12 +64,13 @@ export function projectTest(isOpenshiftCluster: boolean) {
             await input.setText(anotherProjectName);
             await input.confirm();
 
+            const explorer = await getExplorer();
             (await itemExists(anotherProjectName, explorer)) as TreeItem;
         });
 
         it('Create a new project', async function () {
             this.timeout(30_000);
-            const clusterItem = (await explorer.findItem(clusterName)) as TreeItem;
+            const clusterItem = (await (await getExplorer()).findItem(clusterName)) as TreeItem;
             await clusterItem.expand();
             const contextMenu = await clusterItem.openContextMenu();
             await contextMenu.select(newProject);
@@ -84,14 +84,15 @@ export function projectTest(isOpenshiftCluster: boolean) {
             await input.setText(projectName);
             await input.confirm();
 
+            const explorer = await getExplorer();
             await itemExists(projectName, explorer);
         });
 
         it('Project can be changed', async function () {
             this.timeout(30_000);
             anotherProjectName = getProjectName();
 
-            const clusterItem = (await explorer.findItem(clusterName)) as TreeItem;
+            const clusterItem = (await (await getExplorer()).findItem(clusterName)) as TreeItem;
             await clusterItem.expand();
             const contextMenu = await clusterItem.openContextMenu();
             await contextMenu.select(newProject);
@@ -100,6 +101,7 @@ export function projectTest(isOpenshiftCluster: boolean) {
             await input.setText(anotherProjectName);
             await input.confirm();
 
+            let explorer = await getExplorer();
             const item = (await itemExists(anotherProjectName, explorer)) as TreeItem;
 
             const changeActiveProjectButton = await item.getActionButton(changeProject);
@@ -112,15 +114,15 @@ export function projectTest(isOpenshiftCluster: boolean) {
             await input.setText(projectName);
             await input.confirm();
 
+            explorer = await getExplorer();
             await itemExists(projectName, explorer);
         });
 
         it('Delete a project', async function () {
             this.timeout(30_000);
-            const projectItem = await explorer.findItem(projectName);
-            const contextMenu = await projectItem.openContextMenu();
 
-            await contextMenu.select(deleteProject);
+            const projectItem = await (await getExplorer()).findItem(projectName);
+            const contextMenu = await projectItem.openContextMenu();
 
             await contextMenu.select(deleteProject);
 
@@ -156,5 +158,9 @@ export function projectTest(isOpenshiftCluster: boolean) {
         function getProjectName() {
             return `project${Math.floor(Math.random() * 100)}`;
         }
+
+        async function getExplorer(): Promise<ViewSection> {
+            return await view.getContent().getSection(VIEWS.appExplorer);
+        }
     });
 }