@eclipse-che/che-e2e 7.75.0-next-74f1046 → 7.75.0-next-2113c0d

package/specs/miscellaneous/CreateWorkspaceWithExistedName.spec.ts

@@ -23,7 +23,7 @@ import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
 const stackName: string = BASE_TEST_CONSTANTS.TS_SELENIUM_DASHBOARD_SAMPLE_NAME || 'Python';
 const projectName: string = FACTORY_TEST_CONSTANTS.TS_SELENIUM_PROJECT_NAME || 'python-hello-world';
 
-suite(`"Start workspace with existed workspace name" test`, function (): void {
+suite('"Start workspace with existed workspace name" test', function (): void {
 	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
 	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
@@ -47,7 +47,7 @@ suite(`"Start workspace with existed workspace name" test`, function (): void {
 		expect(isFileImported).not.eqls(undefined);
 	});
 
-	test(`Stop created workspace`, async function (): Promise<void> {
+	test('Stop created workspace', async function (): Promise<void> {
 		existedWorkspaceName = WorkspaceHandlingTests.getWorkspaceName();
 		await workspaceHandlingTests.stopWorkspace(existedWorkspaceName);
 		await browserTabsUtil.closeAllTabsExceptCurrent();

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/CheReporter.ts

@@ -23,21 +23,22 @@ import { CHROME_DRIVER_CONSTANTS } from '../constants/CHROME_DRIVER_CONSTANTS';
 import { OAUTH_CONSTANTS } from '../constants/OAUTH_CONSTANTS';
 import { REPORTER_CONSTANTS } from '../constants/REPORTER_CONSTANTS';
 import { PLUGIN_TEST_CONSTANTS } from '../constants/PLUGIN_TEST_CONSTANTS';
-import { inject, injectable } from 'inversify';
+import { injectable } from 'inversify';
+import getDecorators from 'inversify-inject-decorators';
+import { e2eContainer } from '../configs/inversify.config';
+
+const { lazyInject } = getDecorators(e2eContainer);
 
 @injectable()
 class CheReporter extends mocha.reporters.Spec {
 	private static methodIndex: number = 0;
 	private static deleteScreencast: boolean = true;
+	@lazyInject(CLASSES.DriverHelper)
+	private readonly driverHelper!: DriverHelper;
+	@lazyInject(CLASSES.ScreenCatcher)
+	private readonly screenCatcher!: ScreenCatcher;
 
-	constructor(
-		runner: mocha.Runner,
-		options: mocha.MochaOptions,
-		@inject(CLASSES.DriverHelper)
-		private readonly driverHelper: DriverHelper,
-		@inject(CLASSES.ScreenCatcher)
-		private readonly screenCatcher: ScreenCatcher
-	) {
+	constructor(runner: mocha.Runner, options: mocha.MochaOptions) {
 		super(runner, options);
 
 		runner.on('start', (): void => {
@@ -111,13 +112,7 @@ class CheReporter extends mocha.reporters.Spec {
 			}
 		});
 
-		runner.on('end', async (): Promise<void> => {
-			// ensure that fired events done
-			await this.driverHelper.wait(5000);
-
-			// close driver
-			await this.driverHelper.getDriver().quit();
-
+		runner.on('end', (): void => {
 			// delete screencast folder if conditions matched
 			if (CheReporter.deleteScreencast && REPORTER_CONSTANTS.DELETE_SCREENCAST_IF_TEST_PASS) {
 				rm.sync(REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER);
@@ -158,14 +153,12 @@ class CheReporter extends mocha.reporters.Spec {
 			// take screenshot and write to file
 			const screenshot: string = await this.driverHelper.getDriver().takeScreenshot();
 			const screenshotStream: WriteStream = fs.createWriteStream(screenshotFileName);
-			screenshotStream.write(Buffer.from(screenshot, 'base64'));
-			screenshotStream.end();
+			screenshotStream.write(Buffer.from(screenshot, 'base64'), (): void => screenshotStream.end());
 
 			// take page source and write to file
 			const pageSource: string = await this.driverHelper.getDriver().getPageSource();
 			const pageSourceStream: WriteStream = fs.createWriteStream(pageSourceFileName);
-			pageSourceStream.write(Buffer.from(pageSource));
-			pageSourceStream.end();
+			pageSourceStream.write(Buffer.from(pageSource), (): void => pageSourceStream.end());
 
 			// take browser console logs and write to file
 			const browserLogsEntries: logging.Entry[] = await this.driverHelper.getDriver().manage().logs().get('browser');
@@ -176,8 +169,9 @@ class CheReporter extends mocha.reporters.Spec {
 			});
 
 			const browserLogsStream: WriteStream = fs.createWriteStream(browserLogsFileName);
-			browserLogsStream.write(Buffer.from(browserLogs));
-			browserLogsStream.end();
+			browserLogsStream.write(Buffer.from(browserLogs), (): void => {
+				browserLogsStream.end();
+			});
 		});
 	}
 }

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`
 		);
 	}