@eclipse-che/che-e2e 7.75.0-next-b6eb83e → 7.75.0-next-2113c0d

package/pageobjects/ide/CheCodeLocatorLoader.ts

@@ -39,7 +39,7 @@ export class CheCodeLocatorLoader extends LocatorLoader {
 			locators: {
 				WelcomeContent: {
 					text: By.xpath('//*[@class="dialog-message-text" and contains(text(), "trust")]'),
-					button: By.xpath('//a[contains(., "trust")]')
+					button: By.xpath('//div[@class="monaco-dialog-box"]//a[@class="monaco-button monaco-text-button"]')
 				}
 			},
 			extras: {

package/specs/MochaHooks.ts

@@ -18,15 +18,17 @@ import { e2eContainer } from '../configs/inversify.config';
 import { DriverHelper } from '../utils/DriverHelper';
 import { ITestWorkspaceUtil } from '../utils/workspace/ITestWorkspaceUtil';
 import { Logger } from '../utils/Logger';
+import { allure } from 'allure-mocha/runtime';
 import { BASE_TEST_CONSTANTS } from '../constants/BASE_TEST_CONSTANTS';
-import { CHROME_DRIVER_CONSTANTS } from '../constants/CHROME_DRIVER_CONSTANTS';
 import { MONACO_CONSTANTS } from '../constants/MONACO_CONSTANTS';
+import { CHROME_DRIVER_CONSTANTS } from '../constants/CHROME_DRIVER_CONSTANTS';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 let latestWorkspace: string = '';
 
 export function registerRunningWorkspace(workspaceName: string): void {
-	Logger.debug(`with workspaceName:${workspaceName}`);
+	workspaceName !== '' ? Logger.debug(`with workspaceName:${workspaceName}`) : Logger.debug('delete workspace name');
+
 	latestWorkspace = workspaceName;
 }
 
@@ -63,6 +65,16 @@ exports.mochaHooks = {
 		}
 	],
 	afterEach: [
+		async function (this: Mocha.Context): Promise<void> {
+			if (this.currentTest?.state === 'failed') {
+				try {
+					const screenshot: string = await driverHelper.getDriver().takeScreenshot();
+					allure.attachment('Screenshot', Buffer.from(screenshot, 'base64'), 'image/png');
+				} catch (e) {
+					allure.attachment('No screenshot', 'Could not take a screenshot', 'text/plain');
+				}
+			}
+		},
 		// stop and remove running workspace
 		function deleteWorkspaceOnFailedTest(this: Mocha.Context): void {
 			if (this.currentTest?.state === 'failed') {
@@ -75,6 +87,7 @@ exports.mochaHooks = {
 		}
 	],
 	afterAll: [
+		// stop and remove running workspace
 		async function stopTheDriver(): Promise<void> {
 			if (!BASE_TEST_CONSTANTS.TS_DEBUG_MODE && CHROME_DRIVER_CONSTANTS.TS_USE_WEB_DRIVER_FOR_TEST) {
 				// ensure that fired events done

package/specs/dashboard-samples/RecommendedExtensions.spec.ts

@@ -16,10 +16,8 @@ import {
 	ExtensionsViewItem,
 	ExtensionsViewSection,
 	Locators,
-	ModalDialog,
 	SideBarView,
 	TextEditor,
-	ViewItem,
 	ViewSection
 } from 'monaco-page-objects';
 import { registerRunningWorkspace } from '../MochaHooks';
@@ -35,36 +33,36 @@ import { expect } from 'chai';
 import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 import { PLUGIN_TEST_CONSTANTS } from '../../constants/PLUGIN_TEST_CONSTANTS';
-import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 
 const samples: string[] = PLUGIN_TEST_CONSTANTS.TS_SAMPLE_LIST.split(',');
 
-suite(`Check if recommended extensions installed for ${samples}`, function (): void {
-	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-	const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
-	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-	const cheCodeLocatorLoader: CheCodeLocatorLoader = e2eContainer.get(CLASSES.CheCodeLocatorLoader);
-	const webCheCodeLocators: Locators = cheCodeLocatorLoader.webCheCodeLocators;
+for (const sample of samples) {
+	suite(`Check if recommended extensions installed for ${sample}`, function (): void {
+		const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+		const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+		const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+		const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+		const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+		const cheCodeLocatorLoader: CheCodeLocatorLoader = e2eContainer.get(CLASSES.CheCodeLocatorLoader);
+		const webCheCodeLocators: Locators = cheCodeLocatorLoader.webCheCodeLocators;
 
-	let projectSection: ViewSection;
-	let extensionsView: SideBarView | undefined;
-	let extensionSection: ExtensionsViewSection;
+		let projectSection: ViewSection;
+		let extensionSection: ExtensionsViewSection;
+		let extensionsView: SideBarView | undefined;
 
-	const extensionsListFileName: string = 'extensions.json';
-	let recommendedExtensions: any = {
-		recommendations: []
-	};
+		const [pathToExtensionsListFileName, extensionsListFileName]: string[] = ['.vscode', 'extensions.json'];
+		let recommendedExtensions: any = {
+			recommendations: []
+		};
 
-	loginTests.loginIntoChe();
+		loginTests.loginIntoChe();
 
-	for (const sample of samples) {
 		test(`Create and open new workspace, stack:${sample}`, async function (): Promise<void> {
 			await workspaceHandlingTests.createAndOpenWorkspace(sample);
 		});
 		test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
 			await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+			expect(WorkspaceHandlingTests.getWorkspaceName(), 'Workspace name was not fetched from the loading page').not.undefined;
 		});
 
 		test('Registering the running workspace', function (): void {
@@ -75,31 +73,20 @@ suite(`Check if recommended extensions installed for ${samples}`, function (): v
 			await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
 		});
 
-		test('Wait until the project will be imported and accept it as trusted one', async function (): Promise<void> {
-			[projectSection] = await new SideBarView().getContent().getSections();
-			const label: string = BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
-			Logger.debug(`projectSection.findItem: find ${label}`);
-			const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
-			expect(isFileImported).not.eqls(undefined);
-			try {
-				const buttonYesITrustTheAuthors: string = 'Yes, I trust the authors';
-				await driverHelper.waitVisibility(
-					webCheCodeLocators.WelcomeContent.button,
-					TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT
-				);
-				const trustedProjectDialog: ModalDialog = new ModalDialog();
-				Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
-				await trustedProjectDialog.pushButton(buttonYesITrustTheAuthors);
-			} catch (e) {
-				Logger.debug(`Welcome modal dialog was not shown: ${e}`);
-			}
+		test('Check the project files were imported', async function (): Promise<void> {
+			const [projectSection]: ViewSection[] = await new SideBarView().getContent().getSections();
+			expect(await projectSection.findItem(pathToExtensionsListFileName), 'Files not imported').not.undefined;
+		});
+
+		test('Accept the project as a trusted one', async function (): Promise<void> {
+			await projectAndFileTests.performTrustAuthorDialog();
 		});
 
 		test(`Get recommended extensions list from ${extensionsListFileName}`, async function (): Promise<void> {
 			Logger.debug('projectSection.findItem(item))?.select(): expand .vscode folder and open extensions.json.');
-			await (await projectSection.findItem('.vscode'))?.select();
-			// time to expand project tree
-			await driverHelper.wait(TIMEOUT_CONSTANTS.TS_EXPAND_PROJECT_TREE_ITEM_TIMEOUT);
+			[projectSection] = await new SideBarView().getContent().getSections();
+			await (await projectSection.findItem(pathToExtensionsListFileName))?.select();
+			await driverHelper.waitVisibility(webCheCodeLocators.DefaultTreeItem.ctor(extensionsListFileName));
 			await (await projectSection.findItem(extensionsListFileName))?.select();
 			Logger.debug(`EditorView().openEditor(${extensionsListFileName})`);
 			const editor: TextEditor = (await new EditorView().openEditor(extensionsListFileName)) as TextEditor;
@@ -113,69 +100,77 @@ suite(`Check if recommended extensions installed for ${samples}`, function (): v
 					return { publisher, name };
 				}
 			);
-			Logger.info(`Recommended extension for this workspace:\n${JSON.stringify(recommendedExtensions.recommendations)}.`);
+			Logger.debug(`Recommended extension for this workspace:\n${JSON.stringify(recommendedExtensions.recommendations)}.`);
+			expect(recommendedExtensions.recommendations, 'Recommendations not found').not.empty;
 		});
 
 		test('Open "Extensions" view section', async function (): Promise<void> {
 			Logger.debug('ActivityBar().getViewControl("Extensions"))?.openView(): open Extensions view.');
 			extensionsView = await (await new ActivityBar().getViewControl('Extensions'))?.openView();
+			expect(extensionsView, 'Can`t find Extension section').not.undefined;
 		});
 
 		test('Let extensions complete installation', async function (): Promise<void> {
-			Logger.info(
+			this.test?.retries(0);
+			Logger.debug(
 				`Time for extensions installation TimeoutConstants.TS_COMMON_PLUGIN_TEST_TIMEOUT=${TIMEOUT_CONSTANTS.TS_COMMON_PLUGIN_TEST_TIMEOUT}`
 			);
 			await driverHelper.wait(TIMEOUT_CONSTANTS.TS_COMMON_PLUGIN_TEST_TIMEOUT);
 		});
 
 		test('Check if extensions are installed and enabled', async function (): Promise<void> {
-			this.retries(10);
+			// timeout 15 seconds per extensions
+			this.timeout(TIMEOUT_CONSTANTS.TS_FIND_EXTENSION_TEST_TIMEOUT * recommendedExtensions.recommendations.length);
 			Logger.debug('ActivityBar().getViewControl("Extensions"))?.openView(): open Extensions view.');
 			extensionsView = await (await new ActivityBar().getViewControl('Extensions'))?.openView();
 
 			Logger.debug('extensionsView?.getContent().getSections(): get current section.');
 			[extensionSection] = (await extensionsView?.getContent().getSections()) as ExtensionsViewSection[];
-			await driverHelper.waitAllPresence(
+			expect(extensionSection, 'Can`t find Extension section').not.undefined;
+			await driverHelper.waitVisibility(
 				webCheCodeLocators.ExtensionsViewSection.itemTitle,
 				TIMEOUT_CONSTANTS.TS_EDITOR_TAB_INTERACTION_TIMEOUT
 			);
 
 			for (const extension of recommendedExtensions.recommendations) {
-				Logger.info(`Check if ${JSON.stringify(extension)} are installed.`);
-
 				Logger.debug(`extensionSection.findItem(${extension.name}).`);
 				await extensionSection.findItem(extension.name);
 
-				// check if extension require reload the page
-				if (await driverHelper.isVisible((webCheCodeLocators.ExtensionsViewSection as any).requireReloadButton)) {
-					Logger.debug('Extension require reload the editor. Refreshing the page..');
+				const isReloadRequired: boolean = await driverHelper.isVisible(
+					(webCheCodeLocators.ExtensionsViewSection as any).requireReloadButton
+				);
+				Logger.debug(`Is extensions require reload the editor: ${isReloadRequired}`);
+
+				if (isReloadRequired) {
+					Logger.debug('Refreshing the page..');
 					await browserTabsUtil.refreshPage();
 					await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-					Logger.debug('ActivityBar().getViewControl("Extensions"))?.openView(): open Extensions view.');
+					await driverHelper.waitVisibility(
+						webCheCodeLocators.ActivityBar.viewContainer,
+						TIMEOUT_CONSTANTS.TS_EDITOR_TAB_INTERACTION_TIMEOUT
+					);
+					Logger.debug('ActivityBar().getViewControl("Extensions"))?.openView(): reopen Extensions view.');
 					extensionsView = await (await new ActivityBar().getViewControl('Extensions'))?.openView();
-					Logger.debug('extensionsView?.getContent().getSections(): get current section.');
-					[extensionSection] = (await extensionsView?.getContent().getSections()) as ExtensionsViewSection[];
-					await driverHelper.waitAllPresence(
+					await driverHelper.waitVisibility(
 						webCheCodeLocators.ExtensionsViewSection.itemTitle,
 						TIMEOUT_CONSTANTS.TS_EDITOR_TAB_INTERACTION_TIMEOUT
 					);
+					expect(extensionsView, 'Can`t find Extension View section').not.undefined;
+					[extensionSection] = (await extensionsView?.getContent().getSections()) as ExtensionsViewSection[];
+					expect(extensionSection, 'Can`t find Extension section').not.undefined;
 					Logger.debug(`extensionSection.findItem(${extension.name}).`);
 					await extensionSection.findItem(extension.name);
 				}
 
-				Logger.debug('extensionsView?.getContent().getSections(): switch to marketplace section.');
+				Logger.debug('extensionsView.getContent().getSections(): switch to marketplace section.');
 				const [marketplaceSection]: ExtensionsViewSection[] = (await extensionsView
 					?.getContent()
 					.getSections()) as ExtensionsViewSection[];
-				await driverHelper.waitVisibility(
-					webCheCodeLocators.ExtensionsViewSection.items,
-					TIMEOUT_CONSTANTS.TS_EDITOR_TAB_INTERACTION_TIMEOUT
-				);
 
-				Logger.debug('marketplaceSection.getVisibleItems(): get all found items.');
+				Logger.debug('marketplaceSection.getVisibleItems()');
 				const allFinedItems: ExtensionsViewItem[] = await marketplaceSection.getVisibleItems();
-
-				let itemWithRightNameAndPublisher: ExtensionsViewItem | undefined;
+				expect(allFinedItems, 'Extensions not found').not.empty;
+				let itemWithRightNameAndPublisher: ExtensionsViewItem | undefined = undefined;
 				for (const item of allFinedItems) {
 					Logger.debug(`Try to find extension published by ${extension.publisher}.`);
 					if ((await item.getAuthor()) === extension.publisher) {
@@ -183,16 +178,14 @@ suite(`Check if recommended extensions installed for ${samples}`, function (): v
 						Logger.debug(`Extension was found: ${await itemWithRightNameAndPublisher?.getTitle()}`);
 						break;
 					}
-					if (itemWithRightNameAndPublisher === undefined) {
-						Logger.error(`Extension with publisher as ${extension.publisher} was not found.`);
-					}
+					expect(itemWithRightNameAndPublisher, `Extension ${extension.name} not found`).not.undefined;
 				}
 
 				Logger.debug('itemWithRightNameAndPublisher?.isInstalled()');
 				const isInstalled: boolean = (await itemWithRightNameAndPublisher?.isInstalled()) as boolean;
 
 				Logger.debug(`itemWithRightNameAndPublisher?.isInstalled(): ${isInstalled}.`);
-				expect(isInstalled).eqls(true);
+				expect(isInstalled, `Extension ${extension.name} not installed`).is.true;
 
 				Logger.debug('itemWithRightNameAndPublisher.manage(): get context menu.');
 				const extensionManageMenu: ContextMenu = await (itemWithRightNameAndPublisher as ExtensionsViewItem).manage();
@@ -200,13 +193,13 @@ suite(`Check if recommended extensions installed for ${samples}`, function (): v
 				Logger.debug('extensionManageMenu.getItems(): get menu items.');
 				const extensionMenuItems: ContextMenuItem[] = await extensionManageMenu.getItems();
 				let extensionMenuItemLabels: string = '';
+				Logger.trace('extensionMenuItems -> item.getLabel(): get menu items names.');
 				for (const item of extensionMenuItems) {
-					Logger.trace('extensionMenuItems -> item.getLabel(): get menu items names.');
 					extensionMenuItemLabels += (await item.getLabel()) + ' ';
 				}
 
 				Logger.debug(`extensionMenuItemLabels: ${extensionMenuItemLabels}.`);
-				expect(extensionMenuItemLabels).contains('Disable').and.not.contains('Enable');
+				expect(extensionMenuItemLabels, `Extension ${extension.name} not enabled`).contains('Disable').and.not.contains('Enable');
 			}
 		});
 
@@ -218,7 +211,7 @@ suite(`Check if recommended extensions installed for ${samples}`, function (): v
 		test('Delete the workspace', async function (): Promise<void> {
 			await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
 		});
-	}
 
-	loginTests.logoutFromChe();
-});
+		loginTests.logoutFromChe();
+	});
+}

package/specs/factory/Factory.spec.ts

@@ -16,7 +16,6 @@ import {
 	ContextMenu,
 	EditorView,
 	Locators,
-	ModalDialog,
 	NewScmView,
 	SideBarView,
 	SingleScmProvider,
@@ -104,11 +103,7 @@ suite(
 		});
 
 		test('Accept the project as a trusted one', async function (): Promise<void> {
-			const buttonYesITrustTheAuthors: string = 'Yes, I trust the authors';
-			const trustedProjectDialog: ModalDialog = new ModalDialog();
-			await driverHelper.waitVisibility(webCheCodeLocators.WelcomeContent.button);
-			Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
-			await trustedProjectDialog.pushButton(buttonYesITrustTheAuthors);
+			await projectAndFileTests.performTrustAuthorDialog();
 		});
 
 		test('Make changes to the file', async function (): Promise<void> {

package/specs/factory/NoSetupRepoFactory.spec.ts

@@ -14,7 +14,6 @@ import {
 	ActivityBar,
 	ContextMenu,
 	EditorView,
-	error,
 	InputBox,
 	Locators,
 	ModalDialog,
@@ -37,13 +36,11 @@ import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { DriverHelper } from '../../utils/DriverHelper';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
 import { Workspaces } from '../../pageobjects/dashboard/Workspaces';
-import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
 import { Logger } from '../../utils/Logger';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { FACTORY_TEST_CONSTANTS, GitProviderType } from '../../constants/FACTORY_TEST_CONSTANTS';
 import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
-import WebDriverError = error.WebDriverError;
 
 suite(
 	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository without OAuth setup`,
@@ -124,29 +121,7 @@ suite(
 			});
 
 			test('Accept the project as a trusted one', async function (): Promise<void> {
-				// click somewhere to trigger "Welcome Content" dialog
-				try {
-					await driverHelper.waitAndClick(webCheCodeLocators.Workbench.notificationItem);
-				} catch (e) {
-					Logger.info(`Click on ${webCheCodeLocators.Workbench.notificationItem} to get "Welcome Content" dialog ${e as string}`);
-				}
-				// "Welcome Content" dialog can be shown before of after dialog with an error for private repo
-				try {
-					const buttonYesITrustTheAuthors: string = 'Yes, I trust the authors';
-					await driverHelper.waitVisibility(
-						webCheCodeLocators.WelcomeContent.text,
-						TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM
-					);
-					const welcomeContentDialog: ModalDialog = new ModalDialog();
-					Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
-					await welcomeContentDialog.pushButton(buttonYesITrustTheAuthors);
-					await driverHelper.waitDisappearance(webCheCodeLocators.WelcomeContent.text);
-				} catch (e) {
-					Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
-					if (!FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
-						throw new WebDriverError(e as string);
-					}
-				}
+				await projectAndFileTests.performTrustAuthorDialog();
 			});
 
 			test('Check if the project files were imported', async function (): Promise<void> {

package/specs/factory/RefusedOAuthFactory.spec.ts

@@ -14,7 +14,6 @@ import {
 	ActivityBar,
 	ContextMenu,
 	EditorView,
-	error,
 	InputBox,
 	Locators,
 	ModalDialog,
@@ -37,12 +36,10 @@ import { DriverHelper } from '../../utils/DriverHelper';
 import { OauthPage } from '../../pageobjects/git-providers/OauthPage';
 import { StringUtil } from '../../utils/StringUtil';
 import { Logger } from '../../utils/Logger';
-import { TIMEOUT_CONSTANTS } from '../../constants/TIMEOUT_CONSTANTS';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { FACTORY_TEST_CONSTANTS, GitProviderType } from '../../constants/FACTORY_TEST_CONSTANTS';
-import WebDriverError = error.WebDriverError;
 
 suite(
 	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository and deny the access`,
@@ -107,29 +104,7 @@ suite(
 		});
 
 		test('Accept the project as a trusted one', async function (): Promise<void> {
-			// click somewhere to trigger "Welcome Content" dialog
-			try {
-				await driverHelper.waitAndClick(webCheCodeLocators.Workbench.notificationItem);
-			} catch (e) {
-				Logger.info(`Click on ${webCheCodeLocators.Workbench.notificationItem} to get "Welcome Content" dialog ${e as string}`);
-			}
-			// "Welcome Content" dialog can be shown before of after dialog with an error for private repo
-			try {
-				const buttonYesITrustTheAuthors: string = 'Yes, I trust the authors';
-				await driverHelper.waitVisibility(
-					webCheCodeLocators.WelcomeContent.text,
-					TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM
-				);
-				const welcomeContentDialog: ModalDialog = new ModalDialog();
-				Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
-				await welcomeContentDialog.pushButton(buttonYesITrustTheAuthors);
-				await driverHelper.waitDisappearance(webCheCodeLocators.WelcomeContent.text);
-			} catch (e) {
-				Logger.info(`"Accept the project as a trusted one" dialog was not shown firstly for "${isPrivateRepo}"`);
-				if (!FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {
-					throw new WebDriverError(e as string);
-				}
-			}
+			await projectAndFileTests.performTrustAuthorDialog();
 		});
 
 		if (FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO) {

package/tests-library/ProjectAndFileTests.ts

@@ -10,30 +10,29 @@
 
 import 'reflect-metadata';
 import { inject, injectable } from 'inversify';
-import { By, until } from 'selenium-webdriver';
 import { DriverHelper } from '../utils/DriverHelper';
 import { CLASSES } from '../configs/inversify.types';
 import { Logger } from '../utils/Logger';
 import { TIMEOUT_CONSTANTS } from '../constants/TIMEOUT_CONSTANTS';
-import { Locators, ModalDialog } from 'monaco-page-objects';
 import { CheCodeLocatorLoader } from '../pageobjects/ide/CheCodeLocatorLoader';
 
-const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocators;
-
 @injectable()
 export class ProjectAndFileTests {
 	constructor(
 		@inject(CLASSES.DriverHelper)
-		private readonly driverHelper: DriverHelper
+		private readonly driverHelper: DriverHelper,
+		@inject(CLASSES.CheCodeLocatorLoader)
+		private readonly cheCodeLocatorLoader: CheCodeLocatorLoader
 	) {}
 
 	async waitWorkspaceReadinessForCheCodeEditor(): Promise<void> {
 		Logger.debug('waiting for editor.');
 		try {
 			const start: number = new Date().getTime();
-			await this.driverHelper
-				.getDriver()
-				.wait(until.elementLocated(By.className('monaco-workbench')), TIMEOUT_CONSTANTS.TS_SELENIUM_START_WORKSPACE_TIMEOUT);
+			await this.driverHelper.waitVisibility(
+				this.cheCodeLocatorLoader.webCheCodeLocators.Workbench.constructor,
+				TIMEOUT_CONSTANTS.TS_SELENIUM_START_WORKSPACE_TIMEOUT
+			);
 			const end: number = new Date().getTime();
 			Logger.debug(`editor was opened in ${end - start} seconds.`);
 		} catch (err) {
@@ -43,17 +42,20 @@ export class ProjectAndFileTests {
 	}
 
 	async performTrustAuthorDialog(): Promise<void> {
+		Logger.debug();
+
+		await this.driverHelper.waitAndClick(
+			this.cheCodeLocatorLoader.webCheCodeLocators.WelcomeContent.button,
+			TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT
+		);
+
 		try {
-			const buttonYesITrustTheAuthors: string = 'Yes, I trust the authors';
-			await this.driverHelper.waitVisibility(
-				webCheCodeLocators.WelcomeContent.button,
+			await this.driverHelper.waitAndClick(
+				this.cheCodeLocatorLoader.webCheCodeLocators.WelcomeContent.button,
 				TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT
 			);
-			const trustedProjectDialog: ModalDialog = new ModalDialog();
-			Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`);
-			await trustedProjectDialog.pushButton(buttonYesITrustTheAuthors);
 		} catch (e) {
-			Logger.debug(`Welcome modal dialog was not shown: ${e}`);
+			Logger.info('Second welcome content dialog box was not shown');
 		}
 	}
 }

package/tests-library/WorkspaceHandlingTests.ts

@@ -81,7 +81,7 @@ export class WorkspaceHandlingTests {
 	}
 
 	async obtainWorkspaceNameFromStartingPage(): Promise<void> {
-		const timeout: number = TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT;
+		const timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_START_WORKSPACE_TIMEOUT;
 		const polling: number = TIMEOUT_CONSTANTS.TS_SELENIUM_DEFAULT_POLLING;
 		const attempts: number = Math.ceil(timeout / polling);
 

package/tsconfig.json

@@ -1,12 +1,12 @@
 {
 	"compilerOptions": {
 		"skipLibCheck": true,
-		"target": "es2017",
+		"target": "es2021",
 		"module": "commonjs",
 		"strict": true,
 		"esModuleInterop": true,
 		"outDir": "dist",
-		"lib": ["es2017", "dom"],
+		"lib": ["es2021", "dom"],
 		"types": ["reflect-metadata", "@types/mocha", "@types/node"],
 		"experimentalDecorators": true,
 		"emitDecoratorMetadata": true,

package/utils/DriverHelper.ts

@@ -398,7 +398,7 @@ export class DriverHelper {
 		}
 
 		throw new error.TimeoutError(
-			`Exceeded maximum gettin of the '${cssAttribute}' css attribute attempts, from the '${elementLocator}' element`
+			`Exceeded maximum getting of the '${cssAttribute}' css attribute attempts, from the '${elementLocator}' element`
 		);
 	}