diff --git a/src/ui-test/tests/camel.settings.test.ts b/src/ui-test/tests/camel.settings.test.ts index e7f67c85..2269a46a 100644 --- a/src/ui-test/tests/camel.settings.test.ts +++ b/src/ui-test/tests/camel.settings.test.ts @@ -151,7 +151,10 @@ describe('Camel User Settings', function () { await executeCommand(CAMEL_RUN_ACTION_QUICKPICKS_LABEL); await waitUntilTerminalHasText(driver, [defaultExtraLaunchParameterSetting, newParameter, `Tracing is enabled on CamelContext`], 15000, 180000); - + + // cleaning for next test + await killTerminal(); + await new BottomBarPanel().toggle(false); }); it('Should remove parameter', async function () { @@ -162,7 +165,7 @@ describe('Camel User Settings', function () { await waitUntilItemNotExists(newParameter, arraySetting); const values = await arraySetting.getValues(); - expect(values.length).is.lessThan(3); + expect(values.length, `Current parameters are ${values}, we are expecting them to not contain ${newParameter}`).is.lessThan(3); expect(values).not.includes(newParameter); await cleanEnvironment(); }); diff --git a/src/ui-test/tests/tasks.json.launch.test.ts b/src/ui-test/tests/tasks.json.launch.test.ts index 73f2c21f..9936fb83 100644 --- a/src/ui-test/tests/tasks.json.launch.test.ts +++ b/src/ui-test/tests/tasks.json.launch.test.ts @@ -36,7 +36,12 @@ describe('Launch configuration from tasks.json autocompletion', function () { async function setupEnvironment(resourceDir: string, vscodeDir: string, launch: boolean = false) { driver = VSBrowser.instance.driver; await VSBrowser.instance.openResources(resourceDir); - await (await new ActivityBar().getViewControl('Explorer'))?.openView(); + try { + await (await new ActivityBar().getViewControl('Explorer'))?.openView(); + } catch { + // workaround: retry in case of StaleElementReferenceError + await (await new ActivityBar().getViewControl('Explorer'))?.openView(); + } await deleteResource(vscodeDir); await createFolder(vscodeDir); diff --git a/src/ui-test/utils.ts b/src/ui-test/utils.ts index 23dca6f2..532d89d7 100644 --- a/src/ui-test/utils.ts +++ b/src/ui-test/utils.ts @@ -149,8 +149,7 @@ export async function waitUntilTerminalHasText(driver: WebDriver, textArray: str await driver.sleep(interval); await driver.wait(async function () { try { - const terminal = await activateTerminalView(); - const terminalText = await terminal.getText(); + const terminalText = await getTerminalText(); for await (const text of textArray) { if (!(terminalText.includes(text))) { return false; @@ -160,7 +159,7 @@ export async function waitUntilTerminalHasText(driver: WebDriver, textArray: str } catch (err) { return false; } - }, timeout, undefined, interval); + }, timeout, `Expecting texts in terminal ${textArray} were not found in ${await getTerminalText()}`, interval); } /** @@ -633,3 +632,9 @@ export async function waitUntilNotificationShows(driver: WebDriver, notification } }, timeout, "Required notification not available", interval); } + +async function getTerminalText() : Promise { + const terminal = await activateTerminalView(); + return await terminal.getText(); +} +