@eclipse-che/che-e2e 7.73.0 → 7.74.0-dev-1d09cb7

package/pageobjects/git-providers/OauthPage.ts

@@ -18,165 +18,165 @@ import { OAuthConstants } from '../../constants/OAuthConstants';
 
 @injectable()
 export class OauthPage {
-    private static LOGIN_FORM: By;
-    private static PASSWORD_FORM: By;
-    private static SUBMIT_BUTTON: By;
-    private static APPROVE_BUTTON: By;
-    private static DENY_ACCESS_BUTTON: By;
-    private static DENY_SAVE_CREDENTIALS_BUTTON: By;
-
-    constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {
-        switch (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER) {
-            case GitProviderType.BITBUCKET : {
-                OauthPage.LOGIN_FORM = By.id('j_username');
-                OauthPage.PASSWORD_FORM = By.id('j_password');
-                OauthPage.APPROVE_BUTTON = By.id('approve');
-                OauthPage.SUBMIT_BUTTON = By.id('submit');
-                OauthPage.DENY_ACCESS_BUTTON = By.id('deny');
-            }
-                break;
-            case GitProviderType.GITLAB: {
-                OauthPage.LOGIN_FORM = By.id('user_login');
-                OauthPage.PASSWORD_FORM = By.id('user_password');
-                OauthPage.SUBMIT_BUTTON = By.xpath('//button[@data-qa-selector="sign_in_button"]');
-                OauthPage.APPROVE_BUTTON = By.xpath('//*[@value="Authorize"]');
-                OauthPage.DENY_ACCESS_BUTTON = By.xpath('//input[@value="Deny"]');
-            }
-                break;
-            case GitProviderType.GITHUB: {
-                OauthPage.LOGIN_FORM = By.id('login_field');
-                OauthPage.PASSWORD_FORM = By.id('password');
-                OauthPage.APPROVE_BUTTON = By.xpath('//*[@id="js-oauth-authorize-btn"]');
-                OauthPage.SUBMIT_BUTTON = By.xpath('//*[@value="Sign in"]');
-                OauthPage.DENY_ACCESS_BUTTON = By.xpath('//button[contains(., "Cancel")]');
-            }
-                break;
-            case GitProviderType.AZURE_DEVOPS: {
-                OauthPage.LOGIN_FORM = By.xpath('//input[@type="email"]');
-                OauthPage.PASSWORD_FORM = By.xpath('//input[@type="password"]');
-                OauthPage.APPROVE_BUTTON = By.id('accept-button');
-                OauthPage.SUBMIT_BUTTON = By.xpath('//input[@type="submit"]');
-                OauthPage.DENY_SAVE_CREDENTIALS_BUTTON = By.xpath('//input[@type="button"]');
-                OauthPage.DENY_ACCESS_BUTTON = By.id('deny-button');
-            }
-                break;
-            default: {
-                throw new Error(`Invalid git provider. The value should be ${GitProviderType.GITHUB}, ${GitProviderType.GITLAB}, ${GitProviderType.AZURE_DEVOPS} or ${GitProviderType.BITBUCKET}`);
-            }
-        }
+  private static LOGIN_FORM: By;
+  private static PASSWORD_FORM: By;
+  private static SUBMIT_BUTTON: By;
+  private static APPROVE_BUTTON: By;
+  private static DENY_ACCESS_BUTTON: By;
+  private static DENY_SAVE_CREDENTIALS_BUTTON: By;
+
+  constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {
+    switch (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER) {
+      case GitProviderType.BITBUCKET : {
+        OauthPage.LOGIN_FORM = By.id('j_username');
+        OauthPage.PASSWORD_FORM = By.id('j_password');
+        OauthPage.APPROVE_BUTTON = By.id('approve');
+        OauthPage.SUBMIT_BUTTON = By.id('submit');
+        OauthPage.DENY_ACCESS_BUTTON = By.id('deny');
+      }
+        break;
+      case GitProviderType.GITLAB: {
+        OauthPage.LOGIN_FORM = By.id('user_login');
+        OauthPage.PASSWORD_FORM = By.id('user_password');
+        OauthPage.SUBMIT_BUTTON = By.xpath('//button[@data-qa-selector="sign_in_button"]');
+        OauthPage.APPROVE_BUTTON = By.xpath('//*[@value="Authorize"]');
+        OauthPage.DENY_ACCESS_BUTTON = By.xpath('//input[@value="Deny"]');
+      }
+        break;
+      case GitProviderType.GITHUB: {
+        OauthPage.LOGIN_FORM = By.id('login_field');
+        OauthPage.PASSWORD_FORM = By.id('password');
+        OauthPage.APPROVE_BUTTON = By.xpath('//*[@id="js-oauth-authorize-btn"]');
+        OauthPage.SUBMIT_BUTTON = By.xpath('//*[@value="Sign in"]');
+        OauthPage.DENY_ACCESS_BUTTON = By.xpath('//button[contains(., "Cancel")]');
+      }
+        break;
+      case GitProviderType.AZURE_DEVOPS: {
+        OauthPage.LOGIN_FORM = By.xpath('//input[@type="email"]');
+        OauthPage.PASSWORD_FORM = By.xpath('//input[@type="password"]');
+        OauthPage.APPROVE_BUTTON = By.id('accept-button');
+        OauthPage.SUBMIT_BUTTON = By.xpath('//input[@type="submit"]');
+        OauthPage.DENY_SAVE_CREDENTIALS_BUTTON = By.xpath('//input[@type="button"]');
+        OauthPage.DENY_ACCESS_BUTTON = By.id('deny-button');
+      }
+        break;
+      default: {
+        throw new Error(`Invalid git provider. The value should be ${GitProviderType.GITHUB}, ${GitProviderType.GITLAB}, ${GitProviderType.AZURE_DEVOPS} or ${GitProviderType.BITBUCKET}`);
+      }
     }
+  }
 
-    async waitLoginPage(): Promise<void> {
-        Logger.debug('OauthPage.waitLoginPage');
+  async waitLoginPage(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitVisibility(OauthPage.LOGIN_FORM, TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM * 3);
-    }
+    await this.driverHelper.waitVisibility(OauthPage.LOGIN_FORM, TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM * 3);
+  }
 
-    async enterUserName(userName: string): Promise<void> {
-        Logger.debug(`this.enterUserName "${userName}"`);
+  async enterUserName(userName: string): Promise<void> {
+    Logger.debug(`"${userName}"`);
 
-        await this.driverHelper.enterValue(OauthPage.LOGIN_FORM, userName);
-    }
+    await this.driverHelper.enterValue(OauthPage.LOGIN_FORM, userName);
+  }
 
-    async enterPassword(password: string): Promise<void> {
-        Logger.debug(`OauthPage.enterPassword`);
+  async enterPassword(password: string): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.enterValue(OauthPage.PASSWORD_FORM, password);
-    }
+    await this.driverHelper.enterValue(OauthPage.PASSWORD_FORM, password);
+  }
 
-    async clickOnSubmitButton(): Promise<void> {
-        Logger.debug('OauthPage.clickOnLoginButton');
+  async clickOnSubmitButton(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitAndClick(OauthPage.SUBMIT_BUTTON);
-    }
+    await this.driverHelper.waitAndClick(OauthPage.SUBMIT_BUTTON);
+  }
 
-    async clickOnNotRememberCredentialsButton(): Promise<void> {
-        Logger.debug('OauthPage.clickOnNotRememberCredentialsButton');
+  async clickOnNotRememberCredentialsButton(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitAndClick(OauthPage.DENY_SAVE_CREDENTIALS_BUTTON);
-    }
+    await this.driverHelper.waitAndClick(OauthPage.DENY_SAVE_CREDENTIALS_BUTTON);
+  }
 
-    async waitClosingLoginPage(): Promise<void> {
-        Logger.debug('OauthPage.waitClosingLoginPage');
+  async waitClosingLoginPage(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitDisappearance(OauthPage.PASSWORD_FORM);
-    }
+    await this.driverHelper.waitDisappearance(OauthPage.PASSWORD_FORM);
+  }
 
-    async waitOauthPage(): Promise<void> {
-        Logger.debug('OauthPage.waitOauthPage');
+  async waitOauthPage(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitVisibility(OauthPage.APPROVE_BUTTON);
-    }
+    await this.driverHelper.waitVisibility(OauthPage.APPROVE_BUTTON);
+  }
 
-    async clickOnApproveButton(): Promise<void> {
-        Logger.debug('OauthPage.clickOnApproveButton');
+  async clickOnApproveButton(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitAndClick(OauthPage.APPROVE_BUTTON);
-    }
+    await this.driverHelper.waitAndClick(OauthPage.APPROVE_BUTTON);
+  }
 
-    async clickOnDenyAccessButton(): Promise<void> {
-        Logger.debug('OauthPage.clickOnDenyAccessButton');
+  async clickOnDenyAccessButton(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitAndClick(OauthPage.DENY_ACCESS_BUTTON);
-    }
+    await this.driverHelper.waitAndClick(OauthPage.DENY_ACCESS_BUTTON);
+  }
 
-    async waitDisappearanceOauthPage(): Promise<void> {
-        Logger.debug('OauthPage.waitDisappearanceOauthPage');
+  async waitDisappearanceOauthPage(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitDisappearance(OauthPage.APPROVE_BUTTON);
-    }
+    await this.driverHelper.waitDisappearance(OauthPage.APPROVE_BUTTON);
+  }
 
-    async login(): Promise<void> {
-        Logger.debug('OauthPage.login');
-
-        await this.waitLoginPage();
-        await this.enterUserName(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
-        if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.AZURE_DEVOPS) {
-            await this.clickOnSubmitButton();
-        }
-        await this.enterPassword(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
-        await this.clickOnSubmitButton();
-        if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.AZURE_DEVOPS) {
-            await this.clickOnNotRememberCredentialsButton();
-        }
-        await this.waitClosingLoginPage();
-    }
+  async login(): Promise<void> {
+    Logger.debug();
 
-    async confirmAccess(): Promise<void> {
-        Logger.debug('OauthPage.confirmAccess');
-
-        try {
-            await this.clickOnApproveButton();
-            await this.waitDisappearanceOauthPage();
-        } catch (e) {
-            Logger.debug('OauthPage.confirmAccess - access was not confirmed, retrying to click confirmation button');
-            // workaround for github, AZURE_DEVOPS oauth confirmation page (bot security)
-            await this.driverHelper.getAction()
-                .move({
-                    origin: await this.driverHelper.waitPresence(OauthPage.APPROVE_BUTTON)
-                })
-                .click()
-                .perform();
-            await this.waitDisappearanceOauthPage();
-        }
+    await this.waitLoginPage();
+    await this.enterUserName(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
+    if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.AZURE_DEVOPS) {
+      await this.clickOnSubmitButton();
     }
-
-    async denyAccess(): Promise<void> {
-        Logger.debug('OauthPage.denyAccess');
-
-        try {
-            await this.clickOnDenyAccessButton();
-            await this.waitDisappearanceOauthPage();
-        } catch (e) {
-            Logger.debug('OauthPage.denyAccess - deny access was not confirmed, retrying to click confirmation button');
-            // workaround for github, AZURE_DEVOPS oauth confirmation page (bot security)
-            await this.driverHelper.getAction()
-                .move({
-                    origin: await this.driverHelper.waitPresence(OauthPage.DENY_ACCESS_BUTTON)
-                })
-                .click()
-                .perform();
-            await this.waitDisappearanceOauthPage();
-        }
+    await this.enterPassword(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
+    await this.clickOnSubmitButton();
+    if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.AZURE_DEVOPS) {
+      await this.clickOnNotRememberCredentialsButton();
+    }
+    await this.waitClosingLoginPage();
+  }
+
+  async confirmAccess(): Promise<void> {
+    Logger.debug();
+
+    try {
+      await this.clickOnApproveButton();
+      await this.waitDisappearanceOauthPage();
+    } catch (e) {
+      Logger.debug('access was not confirmed, retrying to click confirmation button');
+      // workaround for GITHUB, AZURE_DEVOPS oauth confirmation page (bot security)
+      await this.driverHelper.getAction()
+        .move({
+          origin: await this.driverHelper.waitPresence(OauthPage.APPROVE_BUTTON)
+        })
+        .click()
+        .perform();
+      await this.waitDisappearanceOauthPage();
+    }
+  }
+
+  async denyAccess(): Promise<void> {
+    Logger.debug();
+
+    try {
+      await this.clickOnDenyAccessButton();
+      await this.waitDisappearanceOauthPage();
+    } catch (e) {
+      Logger.debug('deny access was not confirmed, retrying to click confirmation button');
+      // workaround for GITHUB, AZURE_DEVOPS oauth confirmation page (bot security)
+      await this.driverHelper.getAction()
+        .move({
+          origin: await this.driverHelper.waitPresence(OauthPage.DENY_ACCESS_BUTTON)
+        })
+        .click()
+        .perform();
+      await this.waitDisappearanceOauthPage();
     }
+  }
 }

package/pageobjects/ide/CheCodeLocatorLoader.ts

@@ -21,54 +21,54 @@ import { MonacoConstants } from '../../constants/MonacoConstants';
  */
 
 export class CheCodeLocatorLoader extends LocatorLoader {
-    readonly webCheCodeLocators: Locators;
+  readonly webCheCodeLocators: Locators;
 
-    constructor() {
-        super(MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, getLocatorsPath());
-        this.webCheCodeLocators = this.mergeLocators() as Locators;
-    }
+  constructor() {
+    super(MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, MonacoConstants.TS_SELENIUM_MONACO_PAGE_OBJECTS_BASE_VERSION, getLocatorsPath());
+    this.webCheCodeLocators = this.mergeLocators() as Locators;
+  }
 
-    private webLocatorDiff(): LocatorDiff {
-        return {
-            locators: {
-                WelcomeContent: {
-                    text: By.xpath('//*[@class="dialog-message-text" and contains(text(), "trust")]'),
-                    button: By.xpath('//a[contains(., "trust")]')
-                },
-            },
-            extras: {
-                ExtensionsViewSection: {
-                    requireReloadButton: By.xpath('//a[text()=\'Reload Required\']')
-                }
-            }
-        };
-    }
+  private webLocatorDiff(): LocatorDiff {
+    return {
+      locators: {
+        WelcomeContent: {
+          text: By.xpath('//*[@class="dialog-message-text" and contains(text(), "trust")]'),
+          button: By.xpath('//a[contains(., "trust")]')
+        }
+      },
+      extras: {
+        ExtensionsViewSection: {
+          requireReloadButton: By.xpath('//a[text()=\'Reload Required\']')
+        }
+      }
+    };
+  }
 
-    private merge(target: any, obj: any): object {
-        for (const key in obj) {
-            if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-                continue;
-            }
+  private merge(target: any, obj: any): object {
+    for (const key in obj) {
+      if (!Object.prototype.hasOwnProperty.call(obj, key)) {
+        continue;
+      }
 
-            let oldVal: any = obj[key];
-            let newVal: any = target[key];
+      let oldVal: any = obj[key];
+      let newVal: any = target[key];
 
-            if (typeof (newVal) === 'object' && typeof (oldVal) === 'object') {
-                target[key] = this.merge(newVal, oldVal);
-            } else {
-                target[key] = clone(oldVal);
-            }
-        }
-        return target;
+      if (typeof (newVal) === 'object' && typeof (oldVal) === 'object') {
+        target[key] = this.merge(newVal, oldVal);
+      } else {
+        target[key] = clone(oldVal);
+      }
     }
+    return target;
+  }
 
-    private mergeLocators(): Locators {
-        const target: Locators = super.loadLocators();
+  private mergeLocators(): Locators {
+    const target: Locators = super.loadLocators();
 
-        this.merge(target, this.webLocatorDiff().locators as Locators);
-        this.merge(target, this.webLocatorDiff().extras as Locators);
+    this.merge(target, this.webLocatorDiff().locators as Locators);
+    this.merge(target, this.webLocatorDiff().extras as Locators);
 
-        return target;
-    }
+    return target;
+  }
 }
 

package/pageobjects/login/interfaces/ICheLoginPage.ts

@@ -9,5 +9,5 @@
  **********************************************************************/
 
 export interface ICheLoginPage {
-    login(): void;
+  login(): void;
 }

package/pageobjects/login/interfaces/IOcpLoginPage.ts

@@ -9,5 +9,5 @@
  **********************************************************************/
 
 export interface IOcpLoginPage {
-    login(): void;
+  login(): void;
 }

package/pageobjects/login/kubernetes/DexLoginPage.ts

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { injectable, inject } from 'inversify';
+import { inject, injectable } from 'inversify';
 import { CLASSES } from '../../../configs/inversify.types';
 import { Logger } from '../../../utils/Logger';
 import { By } from 'selenium-webdriver';
@@ -18,41 +18,41 @@ 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 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');
 
-    constructor(
-        @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
+  constructor(
+    @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
 
-    async waitDexLoginPage(): Promise<void> {
-        Logger.debug(`${this.constructor.name}.${this.waitDexLoginPage.name}`);
+  async waitDexLoginPage(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitVisibility(DexLoginPage.dexPageContentContainer, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
-    }
+    await this.driverHelper.waitVisibility(DexLoginPage.dexPageContentContainer, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+  }
 
-    async clickOnLoginButton(): Promise<void> {
-        Logger.debug(`${this.constructor.name}.${this.clickOnLoginButton.name}`);
+  async clickOnLoginButton(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitAndClick(DexLoginPage.submitButton);
-    }
+    await this.driverHelper.waitAndClick(DexLoginPage.submitButton);
+  }
 
-    async enterUserNameKubernetes(userName: string): Promise<void> {
-        Logger.debug(`${this.constructor.name}.${this.enterUserNameKubernetes.name}`);
+  async enterUserNameKubernetes(userName: string): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.enterValue(DexLoginPage.loginInput, userName);
-    }
+    await this.driverHelper.enterValue(DexLoginPage.loginInput, userName);
+  }
 
-    async enterPasswordKubernetes(password: string): Promise<void> {
-        Logger.debug(`${this.constructor.name}.${this.enterPasswordKubernetes.name}`);
+  async enterPasswordKubernetes(password: string): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.enterValue(DexLoginPage.passwordInput, password);
-    }
+    await this.driverHelper.enterValue(DexLoginPage.passwordInput, password);
+  }
 
-    async waitDexLoginPageDisappearance(): Promise<void> {
-        Logger.debug(`${this.constructor.name}.${this.waitDexLoginPageDisappearance.name}`);
+  async waitDexLoginPageDisappearance(): Promise<void> {
+    Logger.debug();
 
-        await this.driverHelper.waitDisappearance(DexLoginPage.dexPageContentContainer, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
-    }
+    await this.driverHelper.waitDisappearance(DexLoginPage.dexPageContentContainer, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+  }
 }

package/pageobjects/login/kubernetes/KubernetesLoginPage.ts

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { injectable, inject } from 'inversify';
+import { inject, injectable } from 'inversify';
 import { CLASSES } from '../../../configs/inversify.types';
 import { Logger } from '../../../utils/Logger';
 import { ICheLoginPage } from '../interfaces/ICheLoginPage';
@@ -18,16 +18,16 @@ import { OAuthConstants } from '../../../constants/OAuthConstants';
 @injectable()
 export class KubernetesLoginPage implements ICheLoginPage {
 
-    constructor(
-        @inject(CLASSES.DexLoginPage) private readonly dexLoginPage: DexLoginPage) { }
+  constructor(
+    @inject(CLASSES.DexLoginPage) private readonly dexLoginPage: DexLoginPage) { }
 
-    async login(): Promise<void> {
-        Logger.debug(`${this.constructor.name}.${this.login.name}`);
+  async login(): Promise<void> {
+    Logger.debug();
 
-        await this.dexLoginPage.waitDexLoginPage();
-        await this.dexLoginPage.enterUserNameKubernetes(OAuthConstants.TS_SELENIUM_K8S_USERNAME);
-        await this.dexLoginPage.enterPasswordKubernetes(OAuthConstants.TS_SELENIUM_K8S_PASSWORD);
-        await this.dexLoginPage.clickOnLoginButton();
-        await this.dexLoginPage.waitDexLoginPageDisappearance();
-    }
+    await this.dexLoginPage.waitDexLoginPage();
+    await this.dexLoginPage.enterUserNameKubernetes(OAuthConstants.TS_SELENIUM_K8S_USERNAME);
+    await this.dexLoginPage.enterPasswordKubernetes(OAuthConstants.TS_SELENIUM_K8S_PASSWORD);
+    await this.dexLoginPage.clickOnLoginButton();
+    await this.dexLoginPage.waitDexLoginPageDisappearance();
+  }
 }