Use workaround for ActivityBar in 2 places for UI tests

Signed-off-by: Aurélien Pupier <[email protected]>

Author: apupier

src/ui-test/tests/debugger.test.ts

@@ -45,7 +45,8 @@ import {
     DEFAULT_MESSAGE,
     isCamelVersionProductized,
     isVersionNewer,
-    DEBUG_ITEM_OPERATOR
+    DEBUG_ITEM_OPERATOR,
+    waitUntilViewOpened
 } from '../utils';
 import waitUntil from 'async-wait-until';
 
@@ -68,15 +69,7 @@ describe('Camel Debugger tests', function () {
         await VSBrowser.instance.openResources(path.resolve('src', 'ui-test', 'resources'));
         console.log('src/ui-test/resources opened');
 
-        // workaround: using waitUntil as sometimes the ActivityBar is not ready and then the View is redrawn causing staleElement error
-        await waitUntil(async() => {
-            try {
-                return await (await new ActivityBar().getViewControl('Explorer'))?.openView() !== undefined;
-            } catch {
-                return false;
-            }
-        }, 10000, 1000);
-
+        waitUntilViewOpened('Explorer');
         console.log('Explorer view opened');
 
         const section = await new SideBarView().getContent().getSection('resources');

src/ui-test/tests/pause.test.ts

@@ -35,6 +35,7 @@ import {
   disconnectDebugger,
   killTerminal,
   isCamelVersionProductized,
+  waitUntilViewOpened,
 } from "../utils";
 import { assert } from "chai";
 
@@ -51,7 +52,7 @@ describe("Support pause of Camel debugger", function () {
     }
     driver = VSBrowser.instance.driver;
     await VSBrowser.instance.openResources(RESOURCES_DIR);
-    await (await new ActivityBar().getViewControl('Explorer'))?.openView();
+    waitUntilViewOpened('Explorer');
   });
 
   afterEach(async function () {

src/ui-test/utils.ts

@@ -43,6 +43,7 @@ import * as path from 'path';
 import * as fs from 'fs-extra';
 import { ENABLING_CAMEL_DEBUGGER } from './variables';
 import { storageFolder } from "./uitest_runner";
+import waitUntil from 'async-wait-until';
 
 // the changes in debug side bar view were presented for new VS Code versions
 export const DEBUG_ITEM_OPERATOR = ' =';
@@ -638,3 +639,18 @@ async function getTerminalText() : Promise<string> {
     return await terminal.getText();
 }
 
+/**
+ * workaround to await (await new ActivityBar().getViewControl(viewName))?.openView()
+ * using waitUntil as sometimes the ActivityBar is not ready and then the View is redrawn causing staleElement error
+ * @param viewName 
+ */
+export async function waitUntilViewOpened(viewName :string) {
+    await waitUntil(async () => {
+        try {
+            return await (await new ActivityBar().getViewControl(viewName))?.openView() !== undefined;
+        } catch {
+            return false;
+        }
+    }, 10000, 1000);
+}
+