@eclipse-che/che-e2e 7.74.0-dev-41d1364 → 7.74.0-dev-aace77a

package/pageobjects/login/kubernetes/DexLoginPage.ts

@@ -17,10 +17,10 @@ import { DriverHelper } from '../../../utils/DriverHelper';
 
 @injectable()
 export class DexLoginPage {
-	private static readonly dexPageContentContainer: By = By.className('dex-container');
-	private static readonly loginInput: By = By.id('login');
-	private static readonly passwordInput: By = By.id('password');
-	private static readonly submitButton: By = By.id('submit-login');
+	private static readonly DEX_PAGE_CONTENT_CONTAINER: By = By.className('dex-container');
+	private static readonly LOGIN_INPUT: By = By.id('login');
+	private static readonly PASSWORD_INPUT: By = By.id('password');
+	private static readonly SUBMIT_BUTTON: By = By.id('submit-login');
 
 	constructor(
 		@inject(CLASSES.DriverHelper)
@@ -30,30 +30,30 @@ export class DexLoginPage {
 	async waitDexLoginPage(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitVisibility(DexLoginPage.dexPageContentContainer, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+		await this.driverHelper.waitVisibility(DexLoginPage.DEX_PAGE_CONTENT_CONTAINER, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
 	}
 
 	async clickOnLoginButton(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitAndClick(DexLoginPage.submitButton);
+		await this.driverHelper.waitAndClick(DexLoginPage.SUBMIT_BUTTON);
 	}
 
 	async enterUserNameKubernetes(userName: string): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.enterValue(DexLoginPage.loginInput, userName);
+		await this.driverHelper.enterValue(DexLoginPage.LOGIN_INPUT, userName);
 	}
 
 	async enterPasswordKubernetes(password: string): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.enterValue(DexLoginPage.passwordInput, password);
+		await this.driverHelper.enterValue(DexLoginPage.PASSWORD_INPUT, password);
 	}
 
 	async waitDexLoginPageDisappearance(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitDisappearance(DexLoginPage.dexPageContentContainer, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+		await this.driverHelper.waitDisappearance(DexLoginPage.DEX_PAGE_CONTENT_CONTAINER, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
 	}
 }

package/pageobjects/login/openshift/OcpLoginPage.ts

@@ -18,7 +18,13 @@ import { OAUTH_CONSTANTS } from '../../../constants/OAUTH_CONSTANTS';
 
 @injectable()
 export class OcpLoginPage {
-	private static readonly LOGIN_PAGE_OPENSHIFT_XPATH: string = '//*[contains(text(), "Welcome")]';
+	private static readonly LOGIN_PAGE_WELCOME_MESSAGE: By = By.xpath('//*[contains(text(), "Welcome")]');
+	private static readonly LOGIN_BUTTON: By = By.css('button[type=submit]');
+	private static readonly LOGIN_PROVIDER_BUTTON: By = By.xpath(`//a[text()="${OAUTH_CONSTANTS.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}"]`);
+	private static readonly AUTHORIZE_OPENSHIFT_ACCESS_HEADER: By = By.xpath('//h1[text()="Authorize Access"]');
+	private static readonly APPROVE_ACCESS_BUTTON: By = By.css('input[name="approve"]');
+	private static readonly USERNAME_INPUT: By = By.id('inputUsername');
+	private static readonly PASSWORD_INPUT: By = By.id('inputPassword');
 
 	constructor(
 		@inject(CLASSES.DriverHelper)
@@ -28,72 +34,54 @@ export class OcpLoginPage {
 	async waitOpenShiftLoginWelcomePage(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitVisibility(
-			By.xpath(OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH),
-			TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT
-		);
+		await this.driverHelper.waitVisibility(OcpLoginPage.LOGIN_PAGE_WELCOME_MESSAGE, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
 	}
 
-	async clickOnLoginProviderTitle(): Promise<void> {
+	async waitAndClickOnLoginProviderTitle(): Promise<void> {
 		Logger.debug();
 
-		const loginProviderTitleLocator: By = By.xpath(`//a[text()="${OAUTH_CONSTANTS.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}"]`);
-		await this.driverHelper.waitAndClick(loginProviderTitleLocator, TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL);
+		await this.driverHelper.waitAndClick(OcpLoginPage.LOGIN_PROVIDER_BUTTON, TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL);
 	}
 
 	async isIdentityProviderLinkVisible(): Promise<boolean> {
 		Logger.debug();
 
-		const loginWithHtpaswdLocator: By = By.xpath(`//a[text()="${OAUTH_CONSTANTS.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}"]`);
-		return await this.driverHelper.waitVisibilityBoolean(loginWithHtpaswdLocator, 3, 5000);
+		return await this.driverHelper.waitVisibilityBoolean(OcpLoginPage.LOGIN_PROVIDER_BUTTON, 3, 5000);
 	}
 
 	async isAuthorizeOpenShiftIdentityProviderPageVisible(): Promise<boolean> {
 		Logger.debug();
 
-		const authorizeOpenshiftIdentityProviderPageLocator: By = By.xpath('//h1[text()="Authorize Access"]');
-		return await this.driverHelper.isVisible(authorizeOpenshiftIdentityProviderPageLocator);
-	}
-
-	async waitAuthorizeOpenShiftIdentityProviderPage(): Promise<void> {
-		Logger.debug();
-
-		const authorizeOpenshiftIdentityProviderPageLocator: By = By.xpath('//h1[text()="Authorize Access"]');
-		await this.driverHelper.waitVisibility(
-			authorizeOpenshiftIdentityProviderPageLocator,
-			TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT
-		);
+		return await this.driverHelper.isVisible(OcpLoginPage.AUTHORIZE_OPENSHIFT_ACCESS_HEADER);
 	}
 
 	async clickOnApproveAuthorizeAccessButton(): Promise<void> {
 		Logger.debug();
 
-		const approveAuthorizeAccessOcpLocator: By = By.css('input[name="approve"]');
-		await this.driverHelper.waitAndClick(approveAuthorizeAccessOcpLocator);
+		await this.driverHelper.waitAndClick(OcpLoginPage.APPROVE_ACCESS_BUTTON);
 	}
 
 	async enterUserNameOpenShift(userName: string): Promise<void> {
 		Logger.debug(`"${userName}"`);
 
-		await this.driverHelper.enterValue(By.id('inputUsername'), userName);
+		await this.driverHelper.enterValue(OcpLoginPage.USERNAME_INPUT, userName);
 	}
 
-	async enterPasswordOpenShift(passw: string): Promise<void> {
+	async enterPasswordOpenShift(userPassword: string): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.enterValue(By.id('inputPassword'), passw);
+		await this.driverHelper.enterValue(OcpLoginPage.PASSWORD_INPUT, userPassword);
 	}
 
 	async clickOnLoginButton(): Promise<void> {
 		Logger.debug();
 
-		const loginButtonLocator: By = By.css('button[type=submit]');
-		await this.driverHelper.waitAndClick(loginButtonLocator);
+		await this.driverHelper.waitAndClick(OcpLoginPage.LOGIN_BUTTON);
 	}
 
 	async waitDisappearanceOpenShiftLoginWelcomePage(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitDisappearance(By.xpath(OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH));
+		await this.driverHelper.waitDisappearance(OcpLoginPage.LOGIN_PAGE_WELCOME_MESSAGE);
 	}
 }

package/pageobjects/login/openshift/OcpRedHatLoginPage.ts

@@ -20,8 +20,9 @@ import { Logger } from '../../../utils/Logger';
 
 @injectable()
 export class OcpRedHatLoginPage implements ICheLoginPage {
-	private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR: string = '//div[@class="panel-login"]';
-	private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR: string = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
+	private static readonly OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON: By = By.xpath(
+		'//div[@class="panel-login"]/div[contains(@class, "panel-content")]/form/button'
+	);
 
 	constructor(
 		@inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage,
@@ -33,17 +34,11 @@ export class OcpRedHatLoginPage implements ICheLoginPage {
 
 	async login(): Promise<void> {
 		Logger.debug();
-
-		Logger.debug('wait for LogInWithOpenShift page and click button');
-		await this.driverHelper.waitPresence(
-			By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR),
+		await this.driverHelper.waitAndClick(
+			OcpRedHatLoginPage.OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON,
 			TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT
 		);
-		await this.driverHelper.waitAndClick(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
-
-		await this.ocpLogin.isIdentityProviderLinkVisible();
-		await this.ocpLogin.clickOnLoginProviderTitle();
-
+		await this.ocpLogin.waitAndClickOnLoginProviderTitle();
 		await this.redHatLogin.waitRedHatLoginWelcomePage();
 		await this.redHatLogin.enterUserNameRedHat();
 		await this.redHatLogin.clickNextButton();

package/pageobjects/login/openshift/OcpUserLoginPage.ts

@@ -23,7 +23,7 @@ export class OcpUserLoginPage implements IOcpLoginPage {
 		Logger.debug();
 
 		if (OAUTH_CONSTANTS.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE !== '') {
-			await this.ocpLogin.clickOnLoginProviderTitle();
+			await this.ocpLogin.waitAndClickOnLoginProviderTitle();
 		}
 
 		await this.ocpLogin.waitOpenShiftLoginWelcomePage();

package/pageobjects/login/openshift/RedHatLoginPage.ts

@@ -14,13 +14,14 @@ import { CLASSES } from '../../../configs/inversify.types';
 import { DriverHelper } from '../../../utils/DriverHelper';
 import { Logger } from '../../../utils/Logger';
 import { OAUTH_CONSTANTS } from '../../../constants/OAUTH_CONSTANTS';
+import { TIMEOUT_CONSTANTS } from '../../../constants/TIMEOUT_CONSTANTS';
 
 @injectable()
 export class RedHatLoginPage {
-	private readonly USERNAME_INPUT_ID: string = 'username-verification';
-	private readonly PASSWORD_INPUT_ID: string = 'password';
-	private readonly NEXT_BUTTON_ID: string = 'login-show-step2';
-	private readonly LOGIN_BUTTON_ID: string = 'rh-password-verification-submit-button';
+	private static readonly USERNAME_INPUT: By = By.id('username-verification');
+	private static readonly PASSWORD_INPUT: By = By.id('password');
+	private static readonly NEXT_BUTTON: By = By.id('login-show-step2');
+	private static readonly LOGIN_BUTTON: By = By.id('rh-password-verification-submit-button');
 
 	constructor(
 		@inject(CLASSES.DriverHelper)
@@ -29,37 +30,37 @@ export class RedHatLoginPage {
 
 	async waitRedHatLoginWelcomePage(): Promise<void> {
 		Logger.debug();
-		await this.driverHelper.waitVisibility(By.id(this.USERNAME_INPUT_ID));
+
+		await this.driverHelper.waitVisibility(RedHatLoginPage.USERNAME_INPUT, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
 	}
 
 	async enterPasswordRedHat(): Promise<void> {
 		Logger.debug();
-		const passwordFieldLocator: By = By.id(this.PASSWORD_INPUT_ID);
-		await this.driverHelper.waitVisibility(passwordFieldLocator, 3000);
-		await this.driverHelper.enterValue(passwordFieldLocator, OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD);
+
+		await this.driverHelper.enterValue(RedHatLoginPage.PASSWORD_INPUT, OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD);
 	}
 
 	async clickOnLoginButton(): Promise<void> {
 		Logger.debug();
-		const loginButtonLocator: By = By.id(this.LOGIN_BUTTON_ID);
-		await this.driverHelper.waitAndClick(loginButtonLocator);
+
+		await this.driverHelper.waitAndClick(RedHatLoginPage.LOGIN_BUTTON);
 	}
 
 	async waitDisappearanceRedHatLoginWelcomePage(): Promise<void> {
 		Logger.debug();
-		await this.driverHelper.waitDisappearance(By.id(this.LOGIN_BUTTON_ID));
+
+		await this.driverHelper.waitDisappearance(RedHatLoginPage.LOGIN_BUTTON);
 	}
 
 	async enterUserNameRedHat(): Promise<void> {
 		Logger.debug();
-		const usernameFieldLocator: By = By.id(this.USERNAME_INPUT_ID);
-		await this.driverHelper.waitVisibility(usernameFieldLocator, 20000);
-		await this.driverHelper.enterValue(usernameFieldLocator, OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME);
+
+		await this.driverHelper.enterValue(RedHatLoginPage.USERNAME_INPUT, OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME);
 	}
 
 	async clickNextButton(): Promise<void> {
 		Logger.debug();
-		const nextButtonLocator: By = By.id(this.NEXT_BUTTON_ID);
-		await this.driverHelper.waitAndClick(nextButtonLocator);
+
+		await this.driverHelper.waitAndClick(RedHatLoginPage.NEXT_BUTTON);
 	}
 }

package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts

@@ -20,8 +20,9 @@ import { OAUTH_CONSTANTS } from '../../../constants/OAUTH_CONSTANTS';
 
 @injectable()
 export class RegularUserOcpCheLoginPage implements ICheLoginPage {
-	private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR: string = '//div[@class="panel-login"]';
-	private readonly OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR: string = `${this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR}/div[contains(@class, 'panel-content')]/form/button`;
+	private static readonly OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON: By = By.xpath(
+		'//div[@class="panel-login"]/div[contains(@class, "panel-content")]/form/button'
+	);
 
 	constructor(
 		@inject(CLASSES.OcpLoginPage) private readonly ocpLogin: OcpLoginPage,
@@ -29,28 +30,32 @@ export class RegularUserOcpCheLoginPage implements ICheLoginPage {
 		private readonly driverHelper: DriverHelper
 	) {}
 
-	async login(): Promise<void> {
+	/**
+	 * @param userName
+	 * @param password
+	 */
+	async login(
+		userName: string = OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME,
+		password: string = OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD
+	): Promise<void> {
 		Logger.debug();
 
-		Logger.debug('wait for LogInWithOpenShift page and click button');
-		await this.driverHelper.waitPresence(
-			By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_LOCATOR),
+		await this.driverHelper.waitAndClick(
+			RegularUserOcpCheLoginPage.OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON,
 			TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT
 		);
-		await this.driverHelper.waitAndClick(By.xpath(this.OPEN_SHIFT_LOGIN_LANDING_PAGE_BUTTON_LOCATOR));
 
 		if (await this.ocpLogin.isIdentityProviderLinkVisible()) {
-			await this.ocpLogin.clickOnLoginProviderTitle();
+			await this.ocpLogin.waitAndClickOnLoginProviderTitle();
 		}
 
 		await this.ocpLogin.waitOpenShiftLoginWelcomePage();
-		await this.ocpLogin.enterUserNameOpenShift(OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME);
-		await this.ocpLogin.enterPasswordOpenShift(OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD);
+		await this.ocpLogin.enterUserNameOpenShift(userName);
+		await this.ocpLogin.enterPasswordOpenShift(password);
 		await this.ocpLogin.clickOnLoginButton();
 		await this.ocpLogin.waitDisappearanceOpenShiftLoginWelcomePage();
 
 		if (await this.ocpLogin.isAuthorizeOpenShiftIdentityProviderPageVisible()) {
-			await this.ocpLogin.waitAuthorizeOpenShiftIdentityProviderPage();
 			await this.ocpLogin.clickOnApproveAuthorizeAccessButton();
 		}
 	}

package/pageobjects/openshift/OcpApplicationPage.ts

@@ -18,8 +18,8 @@ import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 @injectable()
 export class OcpApplicationPage {
-	private static readonly APPLICATION_ICON_LOCATOR: By = By.xpath('//*[@data-test-id="base-node-handler"]');
-	private static readonly EDIT_SOURCE_CODE_ICON_LOCATOR: By = By.xpath('//*[@aria-label="Edit source code"]');
+	private static readonly APPLICATION_ICON: By = By.xpath('//*[@data-test-id="base-node-handler"]');
+	private static readonly EDIT_SOURCE_CODE_ICON: By = By.xpath('//*[@aria-label="Edit source code"]');
 
 	constructor(
 		@inject(CLASSES.DriverHelper)
@@ -31,13 +31,14 @@ export class OcpApplicationPage {
 	async waitApplicationIcon(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitPresence(OcpApplicationPage.APPLICATION_ICON_LOCATOR, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+		await this.driverHelper.waitPresence(OcpApplicationPage.APPLICATION_ICON, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
 	}
 
 	async waitAndOpenEditSourceCodeIcon(): Promise<void> {
 		Logger.debug();
+
 		const parentGUID: string = await this.browserTabsUtil.getCurrentWindowHandle();
-		await this.driverHelper.waitAndClick(OcpApplicationPage.EDIT_SOURCE_CODE_ICON_LOCATOR);
+		await this.driverHelper.waitAndClick(OcpApplicationPage.EDIT_SOURCE_CODE_ICON);
 		await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
 	}
 }

package/pageobjects/openshift/OcpImportFromGitPage.ts

@@ -18,17 +18,15 @@ import { e2eContainer } from '../../configs/inversify.config';
 
 @injectable()
 export class OcpImportFromGitPage {
-	private static readonly GIT_URL_INPUT_LOCATOR: By = By.id('form-input-git-url-field');
-	private static readonly SHOW_ADVANCED_GIT_OPTIONS_LINK_LOCATOR: By = By.xpath(
-		'//*[text()="Show advanced Git options"]//ancestor::button'
-	);
-	private static readonly HIDE_ADVANCED_GIT_OPTIONS_LOCATOR: By = By.xpath('//*[text()="Hide advanced Git options"]');
-	private static readonly GIT_REFERENCE_INPUT_LOCATOR: By = By.id('form-input-git-ref-field');
-	private static readonly EDIT_IMPORT_STRATEGY_LINK_LOCATOR: By = By.xpath('//*[text()="Edit Import Strategy"]//ancestor::button');
-	private static readonly BUILDER_IMAGE_STRATEGY_ITEM_LOCATOR: By = By.xpath('//*[text()="Builder Image"]//parent::div//parent::div');
-	private static readonly ADD_LABEL_LINK_LOCATOR: By = By.xpath('//button[text()="Labels"]');
-	private static readonly ADD_LABEL_INPUT_LOCATOR: By = By.id('form-selector-labels-field');
-	private static readonly SUBMIT_BUTTON_LOCATOR: By = By.xpath('//*[@data-test-id="submit-button"]');
+	private static readonly GIT_URL_INPUT: By = By.id('form-input-git-url-field');
+	private static readonly SHOW_ADVANCED_GIT_OPTIONS_LINK: By = By.xpath('//*[text()="Show advanced Git options"]//ancestor::button');
+	private static readonly HIDE_ADVANCED_GIT_OPTIONS: By = By.xpath('//*[text()="Hide advanced Git options"]');
+	private static readonly GIT_REFERENCE_INPUT: By = By.id('form-input-git-ref-field');
+	private static readonly EDIT_IMPORT_STRATEGY_LINK: By = By.xpath('//*[text()="Edit Import Strategy"]//ancestor::button');
+	private static readonly BUILDER_IMAGE_STRATEGY_ITEM: By = By.xpath('//*[text()="Builder Image"]//parent::div//parent::div');
+	private static readonly ADD_LABEL_LINK: By = By.xpath('//button[text()="Labels"]');
+	private static readonly ADD_LABEL_INPUT: By = By.id('form-selector-labels-field');
+	private static readonly SUBMIT_BUTTON: By = By.xpath('//*[@data-test-id="submit-button"]');
 
 	constructor(
 		@inject(CLASSES.DriverHelper)
@@ -38,41 +36,41 @@ export class OcpImportFromGitPage {
 	async enterGitRepoUrl(gitRepoUrl: string): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.enterValue(OcpImportFromGitPage.GIT_URL_INPUT_LOCATOR, gitRepoUrl);
+		await this.driverHelper.enterValue(OcpImportFromGitPage.GIT_URL_INPUT, gitRepoUrl);
 	}
 
 	async clickOnAdvancedOptionsButton(): Promise<void> {
 		Logger.debug();
 
-		if (!(await this.driverHelper.isVisible(OcpImportFromGitPage.HIDE_ADVANCED_GIT_OPTIONS_LOCATOR))) {
-			await this.driverHelper.waitAndClick(OcpImportFromGitPage.SHOW_ADVANCED_GIT_OPTIONS_LINK_LOCATOR);
+		if (!(await this.driverHelper.isVisible(OcpImportFromGitPage.HIDE_ADVANCED_GIT_OPTIONS))) {
+			await this.driverHelper.waitAndClick(OcpImportFromGitPage.SHOW_ADVANCED_GIT_OPTIONS_LINK);
 		}
 	}
 
 	async enterGitReference(gitReference: string): Promise<void> {
 		Logger.debug(`"${gitReference}"`);
 
-		await this.driverHelper.enterValue(OcpImportFromGitPage.GIT_REFERENCE_INPUT_LOCATOR, gitReference);
+		await this.driverHelper.enterValue(OcpImportFromGitPage.GIT_REFERENCE_INPUT, gitReference);
 	}
 
 	async selectBuilderImageImportStrategy(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.EDIT_IMPORT_STRATEGY_LINK_LOCATOR);
-		await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.BUILDER_IMAGE_STRATEGY_ITEM_LOCATOR);
+		await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.EDIT_IMPORT_STRATEGY_LINK);
+		await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.BUILDER_IMAGE_STRATEGY_ITEM);
 	}
 
 	async addLabel(label: string): Promise<void> {
 		Logger.debug(`"${label}"`);
 
-		await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.ADD_LABEL_LINK_LOCATOR);
-		await this.driverHelper.scrollToAndEnterValue(OcpImportFromGitPage.ADD_LABEL_INPUT_LOCATOR, label);
+		await this.driverHelper.scrollToAndClick(OcpImportFromGitPage.ADD_LABEL_LINK);
+		await this.driverHelper.scrollToAndEnterValue(OcpImportFromGitPage.ADD_LABEL_INPUT, label);
 	}
 
 	async submitConfiguration(): Promise<OcpApplicationPage> {
 		Logger.debug();
 
-		await this.driverHelper.waitAndClick(OcpImportFromGitPage.SUBMIT_BUTTON_LOCATOR);
+		await this.driverHelper.waitAndClick(OcpImportFromGitPage.SUBMIT_BUTTON);
 		return e2eContainer.get(CLASSES.OcpApplicationPage);
 	}
 

package/pageobjects/openshift/OcpMainPage.ts

@@ -19,43 +19,35 @@ import { e2eContainer } from '../../configs/inversify.config';
 
 @injectable()
 export class OcpMainPage {
-	private static readonly MAIN_PAGE_HEADER_LOCATOR: By = By.id('page-main-header');
-	private static readonly SELECT_ROLE_BUTTON_LOCATOR: By = By.xpath('//*[@data-test-id="perspective-switcher-toggle"]');
-	private static readonly ADD_BUTTON_LOCATOR: By = By.xpath('//*[@data-test-id="+Add-header"]');
-	private static readonly IMPORT_FROM_GIT_ITEM_LOCATOR: By = By.xpath('//*[@data-test="item import-from-git"]');
-	private static readonly SELECT_PROJECT_DROPDOWN_LOCATOR: By = By.xpath('//div[@class="co-namespace-dropdown"]//button');
-	private static readonly PROJECT_FILTER_INPUT_LOCATOR: By = By.xpath('//*[@data-test="dropdown-text-filter"]');
-	private static readonly SKIP_TOUR_BUTTON_LOCATOR: By = By.xpath('//*[text()="Skip tour"]');
+	private static readonly MAIN_PAGE_HEADER: By = By.id('page-main-header');
+	private static readonly SELECT_ROLE_BUTTON: By = By.xpath('//*[@data-test-id="perspective-switcher-toggle"]');
+	private static readonly ADD_BUTTON: By = By.xpath('//*[@data-test-id="+Add-header"]');
+	private static readonly IMPORT_FROM_GIT_ITEM: By = By.xpath('//*[@data-test="item import-from-git"]');
+	private static readonly SELECT_PROJECT_DROPDOWN: By = By.xpath('//div[@class="co-namespace-dropdown"]//button');
+	private static readonly PROJECT_FILTER_INPUT: By = By.xpath('//*[@data-test="dropdown-text-filter"]');
+	private static readonly SKIP_TOUR_BUTTON: By = By.xpath('//*[text()="Skip tour"]');
 
 	constructor(
 		@inject(CLASSES.DriverHelper)
 		private readonly driverHelper: DriverHelper
 	) {}
 
-	private static getRoleLocator(role: string): By {
-		return By.xpath(`//a//*[text()="${role}"]`);
-	}
-
-	private static getProjectDropdownItemLocator(projectName: string): By {
-		return By.xpath(`//button//*[text()="${projectName}"]`);
-	}
-
 	async waitOpenMainPage(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitVisibility(OcpMainPage.MAIN_PAGE_HEADER_LOCATOR, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+		await this.driverHelper.waitVisibility(OcpMainPage.MAIN_PAGE_HEADER, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
 	}
 
 	async clickOnSelectRoleButton(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitAndClick(OcpMainPage.SELECT_ROLE_BUTTON_LOCATOR);
+		await this.driverHelper.waitAndClick(OcpMainPage.SELECT_ROLE_BUTTON);
 	}
 
 	async clickAddToProjectButton(): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitAndClick(OcpMainPage.ADD_BUTTON_LOCATOR);
+		await this.driverHelper.waitAndClick(OcpMainPage.ADD_BUTTON);
 	}
 
 	async selectDeveloperRole(): Promise<void> {
@@ -71,7 +63,7 @@ export class OcpMainPage {
 	async selectImportFromGitMethod(): Promise<OcpImportFromGitPage> {
 		Logger.debug();
 
-		await this.driverHelper.waitAndClick(OcpMainPage.IMPORT_FROM_GIT_ITEM_LOCATOR);
+		await this.driverHelper.waitAndClick(OcpMainPage.IMPORT_FROM_GIT_ITEM);
 		return e2eContainer.get(CLASSES.OcpImportFromGitPage);
 	}
 
@@ -85,22 +77,29 @@ export class OcpMainPage {
 	async selectProject(projectName: string): Promise<void> {
 		Logger.debug();
 
-		await this.driverHelper.waitAndClick(OcpMainPage.SELECT_PROJECT_DROPDOWN_LOCATOR);
-		await this.driverHelper.enterValue(OcpMainPage.PROJECT_FILTER_INPUT_LOCATOR, projectName);
-		await this.driverHelper.waitAndClick(OcpMainPage.getProjectDropdownItemLocator(projectName));
+		await this.driverHelper.waitAndClick(OcpMainPage.SELECT_PROJECT_DROPDOWN);
+		await this.driverHelper.enterValue(OcpMainPage.PROJECT_FILTER_INPUT, projectName);
+		await this.driverHelper.waitAndClick(this.getProjectDropdownItemLocator(projectName));
+	}
+	private getRoleLocator(role: string): By {
+		return By.xpath(`//a//*[text()="${role}"]`);
+	}
+
+	private getProjectDropdownItemLocator(projectName: string): By {
+		return By.xpath(`//button//*[text()="${projectName}"]`);
 	}
 
 	private async selectRole(role: string): Promise<void> {
 		Logger.debug(`selecting role ${role}`);
 
-		await this.driverHelper.waitAndClick(OcpMainPage.getRoleLocator(role));
+		await this.driverHelper.waitAndClick(this.getRoleLocator(role));
 	}
 
 	private async tryToSkipWebTour(): Promise<void> {
 		Logger.debug();
 
-		if (await this.driverHelper.isVisible(OcpMainPage.SKIP_TOUR_BUTTON_LOCATOR)) {
-			await this.driverHelper.waitAndClick(OcpMainPage.SKIP_TOUR_BUTTON_LOCATOR);
+		if (await this.driverHelper.isVisible(OcpMainPage.SKIP_TOUR_BUTTON)) {
+			await this.driverHelper.waitAndClick(OcpMainPage.SKIP_TOUR_BUTTON);
 
 			Logger.debug('welcome tour modal dialog was located and skipped');
 		} else {

package/specs/MochaHooks.ts

@@ -23,8 +23,6 @@ import { CHROME_DRIVER_CONSTANTS } from '../constants/CHROME_DRIVER_CONSTANTS';
 import { MONACO_CONSTANTS } from '../constants/MONACO_CONSTANTS';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
-const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
-
 let latestWorkspace: string = '';
 
 export function registerRunningWorkspace(workspaceName: string): void {
@@ -44,8 +42,8 @@ exports.mochaHooks = {
 				CheApiRequestHandler.enableResponseInterceptor();
 			}
 		},
+		// init vscode-extension-tester monaco-page-objects
 		function initMonacoPageObjects(): void {
-			// init vscode-extension-tester monaco-page-objects
 			monacoPageObjects.initPageObjects(
 				MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_USE_VERSION,
 				MONACO_CONSTANTS.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION,
@@ -66,11 +64,11 @@ exports.mochaHooks = {
 	],
 	afterEach: [
 		// stop and remove running workspace
-		function (this: Mocha.Context): void {
+		function deleteWorkspaceOnFailedTest(this: Mocha.Context): void {
 			if (this.currentTest?.state === 'failed') {
 				if (BASE_TEST_CONSTANTS.DELETE_WORKSPACE_ON_FAILED_TEST) {
 					Logger.info('Property DELETE_WORKSPACE_ON_FAILED_TEST is true - trying to stop and delete running workspace with API.');
-					// await
+					const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
 					testWorkspaceUtil.stopAndDeleteWorkspaceByName(latestWorkspace);
 				}
 			}

package/specs/SmokeTest.spec.ts

@@ -21,12 +21,11 @@ import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
 import { expect } from 'chai';
 import { BASE_TEST_CONSTANTS } from '../constants/BASE_TEST_CONSTANTS';
 
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
-const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-
 suite('The SmokeTest userstory', function (): void {
+	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 	const factoryUrl: string =
 		FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/che-incubator/quarkus-api-example.git';
 	let projectSection: ViewSection;

package/specs/api/ContainerOverridesAPI.spec.ts

@@ -13,11 +13,17 @@ import path from 'path';
 import YAML from 'yaml';
 import { expect } from 'chai';
 import { ShellExecutor } from '../../utils/ShellExecutor';
+import { e2eContainer } from '../../configs/inversify.config';
+import { CLASSES } from '../../configs/inversify.types';
 
 suite('Test defining container overrides via attribute.', function (): void {
 	const pathToSampleFile: string = path.resolve('resources/container-overrides.yaml');
 	const workspaceName: string = YAML.parse(fs.readFileSync(pathToSampleFile, 'utf8')).metadata.name;
-	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(workspaceName);
+	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
+	kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
+	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
 
 	suiteSetup('Login into OC client', function (): void {
 		kubernetesCommandLineToolsExecutor.loginToOcp();
@@ -29,7 +35,7 @@ suite('Test defining container overrides via attribute.', function (): void {
 
 	test('Apply container-overrides sample as DevWorkspace with OC client', function (): void {
 		kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsFile(pathToSampleFile);
-		ShellExecutor.wait(5);
+		shellExecutor.wait(5);
 	});
 
 	test('Check that fields are overridden in the Deployment for DevWorkspace', function (): void {