added DevConsoleIntegration.spec.ts

Signed-off-by: mdolhalo <[email protected]>
eclipse-che · Apr 26, 2023 · ca27422 · ca27422
1 parent a340f88
commit ca27422
Show file tree

Hide file tree

Showing 13 changed files with 399 additions and 22 deletions.
diff --git a/tests/e2e/configs/inversify.config.ts b/tests/e2e/configs/inversify.config.ts
@@ -39,6 +39,9 @@ import { ProjectAndFileTests } from '../tests-library/ProjectAndFileTests';
 import { LoginTests } from '../tests-library/LoginTests';
 import { RedHatLoginPage } from '../pageobjects/login/RedHatLoginPage';
 import { OcpRedHatLoginPage } from '../pageobjects/login/OcpRedHatLoginPage';
+import { OcpMainPage } from '../pageobjects/openshift/OcpMainPage';
+import { OcpImportFromGitPage } from '../pageobjects/openshift/OcpImportFromGitPage';
+import { OcpApplicationPage } from '../pageobjects/openshift/OcpApplicationPage';
 
 const e2eContainer: Container = new Container({defaultScope: 'Transient'});
 
@@ -53,6 +56,12 @@ e2eContainer.bind<Workspaces>(CLASSES.Workspaces).to(Workspaces);
 e2eContainer.bind<WorkspaceDetails>(CLASSES.WorkspaceDetails).to(WorkspaceDetails);
 e2eContainer.bind<ScreenCatcher>(CLASSES.ScreenCatcher).to(ScreenCatcher);
 e2eContainer.bind<OcpLoginPage>(CLASSES.OcpLoginPage).to(OcpLoginPage);
+
+e2eContainer.bind<OcpMainPage>(CLASSES.OcpMainPage).to(OcpMainPage);
+e2eContainer.bind<OcpImportFromGitPage>(CLASSES.OcpImportFromGitPage).to(OcpImportFromGitPage);
+e2eContainer.bind<OcpApplicationPage>(CLASSES.OcpApplicationPage).to(OcpApplicationPage);
+
+
 e2eContainer.bind<CheLoginPage>(CLASSES.CheLoginPage).to(CheLoginPage);
 e2eContainer.bind<CheApiRequestHandler>(CLASSES.CheApiRequestHandler).to(CheApiRequestHandler);
 e2eContainer.bind<CreateWorkspace>(CLASSES.CreateWorkspace).to(CreateWorkspace);
@@ -61,13 +70,10 @@ e2eContainer.bind<LoginTests>(CLASSES.LoginTests).to(LoginTests);
 e2eContainer.bind<Sanitizer>(CLASSES.Sanitizer).to(Sanitizer);
 e2eContainer.bind<ApiUrlResolver>(CLASSES.ApiUrlResolver).to(ApiUrlResolver);
 e2eContainer.bind<WorkspaceHandlingTests>(CLASSES.WorkspaceHandlingTests).to(WorkspaceHandlingTests);
+e2eContainer.bind<RedHatLoginPage>(CLASSES.RedHatLoginPage).to(RedHatLoginPage);
 
 TestConstants.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH ?
     e2eContainer.bind<ICheLoginPage>(TYPES.CheLogin).to(RegularUserOcpCheLoginPage) :
     e2eContainer.bind<ICheLoginPage>(TYPES.CheLogin).to(OcpRedHatLoginPage);
 
-if (TestConstants.TS_OCP_LOGIN_PAGE_PROVIDER_TITLE === 'DevSandbox') {
-    e2eContainer.bind<RedHatLoginPage>(CLASSES.RedHatLoginPage).to(RedHatLoginPage);
-}
-
 export { e2eContainer };
diff --git a/tests/e2e/configs/inversify.types.ts b/tests/e2e/configs/inversify.types.ts
@@ -36,6 +36,9 @@ const CLASSES: any = {
     WorkspaceHandlingTests: 'WorkspaceHandlingTests',
     RedHatLoginPage: 'RedHatLoginPage',
     OcpRedHatLoginPage: 'OcpRedHatLoginPage',
+    OcpApplicationPage: 'OcpApplicationPage',
+    OcpMainPage: 'OcpMainPage',
+    OcpImportFromGitPage: 'OcpImportFromGitPage'
 };
 
 export { TYPES, CLASSES };
diff --git a/tests/e2e/constants/TestConstants.ts b/tests/e2e/constants/TestConstants.ts
@@ -34,6 +34,10 @@ export const TestConstants: any = {
      */
     TS_SELENIUM_BASE_URL: getBaseUrl(),
 
+    TS_SELENIUM_OPENSHIFT_CONSOLE_URL(): string {
+        return process.env.TS_SELENIUM_OPENSHIFT_CONSOLE_URL || TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces', 'console-openshift-console');
+    },
+
     /**
      * Run browser in "Headless" (hidden) mode, "false" by default.
      */

diff --git a/tests/e2e/index.ts b/tests/e2e/index.ts
@@ -33,7 +33,10 @@ export * from './pageobjects/login/OcpUserLoginPage';
 export * from './pageobjects/login/RedHatLoginPage';
 export * from './pageobjects/login/RegularUserOcpCheLoginPage';
 export * from './pageobjects/openshift/CheLoginPage';
+export * from './pageobjects/openshift/OcpApplicationPage';
+export * from './pageobjects/openshift/OcpImportFromGitPage';
 export * from './pageobjects/openshift/OcpLoginPage';
+export * from './pageobjects/openshift/OcpMainPage';
 export * from './tests-library/LoginTests';
 export * from './tests-library/ProjectAndFileTests';
 export * from './tests-library/WorkspaceHandlingTests';
diff --git a/tests/e2e/pageobjects/openshift/OcpApplicationPage.ts b/tests/e2e/pageobjects/openshift/OcpApplicationPage.ts
@@ -0,0 +1,39 @@
+/*********************************************************************
+ * Copyright (c) 2019-2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import 'reflect-metadata';
+import { inject, injectable } from 'inversify';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { CLASSES } from '../../configs/inversify.types';
+import { By } from 'selenium-webdriver';
+import { Logger } from '../../utils/Logger';
+import { TimeoutConstants } from '../../constants/TimeoutConstants';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+
+@injectable()
+export class OcpApplicationPage {
+
+    constructor(
+        @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
+        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) {
+    }
+
+    async waitApplicationIcon(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.waitApplicationIcon.name}`);
+
+        await this.driverHelper.waitPresence(By.xpath('//*[@data-test-id="base-node-handler"]'), TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+    }
+
+    async waitAndOpenEditSourceCodeIcon(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.waitAndOpenEditSourceCodeIcon.name}`);
+        const parentGUID: string = await this.browserTabsUtil.getCurrentWindowHandle();
+        await this.driverHelper.waitAndClick(By.xpath('//*[@aria-label="Edit source code"]'));
+        await this.browserTabsUtil.waitAndSwitchToAnotherWindow(parentGUID, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+    }
+}
diff --git a/tests/e2e/pageobjects/openshift/OcpImportFromGitPage.ts b/tests/e2e/pageobjects/openshift/OcpImportFromGitPage.ts
@@ -0,0 +1,82 @@
+/*********************************************************************
+ * Copyright (c) 2019-2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import 'reflect-metadata';
+import { inject, injectable } from 'inversify';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { CLASSES } from '../../configs/inversify.types';
+import { By } from 'selenium-webdriver';
+import { Logger } from '../../utils/Logger';
+import { OcpApplicationPage } from './OcpApplicationPage';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { e2eContainer } from '../../configs/inversify.config';
+import { TimeoutConstants } from '../../constants/TimeoutConstants';
+
+@injectable()
+export class OcpImportFromGitPage {
+    private readonly TIMEOUT: number = TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM * 3;
+
+    constructor(
+        @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
+        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) {
+    }
+
+    async enterGitRepoUrl(gitRepoUrl: string): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.enterGitRepoUrl.name} "${gitRepoUrl}"`);
+
+        await this.driverHelper.enterValue(By.id('form-input-git-url-field'), gitRepoUrl, this.TIMEOUT);
+    }
+
+    async clickOnAdvancedOptionsButton(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.clickOnAdvancedOptionsButton.name}`);
+
+        if (!(await this.driverHelper.isVisible(By.xpath('//*[text()="Hide advanced Git options"]')))) {
+            await this.driverHelper.waitAndClick(By.xpath('//*[text()="Show advanced Git options"]//ancestor::button'), this.TIMEOUT);
+        }
+    }
+
+    async enterGitReference(gitReference: string): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.enterGitReference.name} "${gitReference}"`);
+
+        await this.driverHelper.enterValue(By.id('form-input-git-ref-field'), gitReference, this.TIMEOUT);
+    }
+
+    async selectBuilderImageImportStrategy(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.selectBuilderImageImportStrategy.name}`);
+
+        await this.driverHelper.waitPresence(By.xpath('//*[text()="Import is not possible."]'), this.TIMEOUT);
+        await this.driverHelper.waitAndClick(By.xpath('//*[text()="Edit Import Strategy"]//ancestor::button'), this.TIMEOUT);
+        await this.driverHelper.waitAndClick(By.xpath('//*[text()="Builder Image"]//parent::div//parent::div'), this.TIMEOUT);
+    }
+
+    async addLabel(label: string): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.addLabel.name} "${label}"`);
+
+        await this.driverHelper.waitAndClick(By.xpath('//button[text()="Labels"]'), this.TIMEOUT);
+        await this.driverHelper.enterValue(By.id('form-selector-labels-field'), label, this.TIMEOUT);
+    }
+
+    async submitConfiguration(): Promise<OcpApplicationPage> {
+        Logger.debug(`${this.constructor.name}.${this.submitConfiguration.name}`);
+
+        await this.driverHelper.waitAndClick(By.xpath('//*[@data-test-id="submit-button"]'), this.TIMEOUT);
+        return e2eContainer.get(CLASSES.OcpApplicationPage);
+    }
+
+    async fitAndSubmitConfiguration(gitRepoUrl: string, gitReference: string, label: string): Promise<OcpApplicationPage> {
+        Logger.debug(`${this.constructor.name}.${this.fitAndSubmitConfiguration.name}`);
+
+        await this.enterGitRepoUrl(gitRepoUrl);
+        await this.clickOnAdvancedOptionsButton();
+        await this.enterGitReference(gitReference);
+        await this.selectBuilderImageImportStrategy();
+        await this.addLabel(label);
+        return await this.submitConfiguration();
+    }
+}
diff --git a/tests/e2e/pageobjects/openshift/OcpLoginPage.ts b/tests/e2e/pageobjects/openshift/OcpLoginPage.ts
@@ -80,13 +80,13 @@ export class OcpLoginPage {
     async clickOnLoginButton(): Promise<void> {
         Logger.debug('OcpLoginPage.clickOnLoginButton');
 
-        const loginButtonlocator: By = By.css('button[type=submit]');
-        await this.driverHelper.waitAndClick(loginButtonlocator);
+        const loginButtonLocator: By = By.css('button[type=submit]');
+        await this.driverHelper.waitAndClick(loginButtonLocator);
     }
 
     async waitDisappearanceOpenShiftLoginWelcomePage(): Promise<void> {
         Logger.debug('OcpLoginPage.waitDisappearanceOpenShiftLoginWelcomePage');
 
-        await this.driverHelper.waitDisappearance(By.xpath(OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH));
+        await this.driverHelper.waitDisappearance(By.xpath(OcpLoginPage.LOGIN_PAGE_OPENSHIFT_XPATH), TestConstants.TS_SELENIUM_DEFAULT_ATTEMPTS * 10);
     }
 }
diff --git a/tests/e2e/pageobjects/openshift/OcpMainPage.ts b/tests/e2e/pageobjects/openshift/OcpMainPage.ts
@@ -0,0 +1,89 @@
+/*********************************************************************
+ * Copyright (c) 2019-2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import 'reflect-metadata';
+import { inject, injectable } from 'inversify';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { CLASSES } from '../../configs/inversify.types';
+import { By } from 'selenium-webdriver';
+import { Logger } from '../../utils/Logger';
+import { TimeoutConstants } from '../../constants/TimeoutConstants';
+import { OcpImportFromGitPage } from './OcpImportFromGitPage';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+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"]');
+
+    constructor(
+        @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
+        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) { }
+
+    async waitOpenMainPage(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.waitOpenMainPage.name}`);
+
+        await this.driverHelper.waitVisibility(OcpMainPage.MAIN_PAGE_HEADER_LOCATOR, TimeoutConstants.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+    }
+
+    async clickOnSelectRoleButton(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.clickOnSelectRoleButton.name}`);
+
+        await this.driverHelper.waitAndClick(OcpMainPage.SELECT_ROLE_BUTTON_LOCATOR);
+    }
+
+    async clickAddToProjectButton(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.clickAddToProjectButton.name}`);
+
+        await this.driverHelper.waitAndClick(OcpMainPage.ADD_BUTTON_LOCATOR);
+    }
+
+    async selectDeveloperRole(): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.selectDeveloperRole.name}`);
+
+        await this.driverHelper.waitAndClick(this.getRoleLocator('Developer'));
+    }
+
+    async selectImportFromGitMethod(): Promise<OcpImportFromGitPage> {
+        Logger.debug(`${this.constructor.name}.${this.selectImportFromGitMethod.name}`);
+
+        await this.driverHelper.waitAndClick(OcpMainPage.IMPORT_FROM_GIT_ITEM_LOCATOR);
+        return e2eContainer.get(CLASSES.OcpImportFromGitPage);
+    }
+
+    async openImportFromGitPage(): Promise<OcpImportFromGitPage> {
+        await this.waitOpenMainPage();
+        await this.clickOnSelectRoleButton();
+        await this.selectDeveloperRole();
+        await this.clickAddToProjectButton();
+        return await this.selectImportFromGitMethod();
+    }
+
+    async selectProject(projectName: string): Promise<void> {
+        Logger.debug(`${this.constructor.name}.${this.selectProject.name}`);
+
+        await this.driverHelper.waitAndClick(OcpMainPage.SELECT_PROJECT_DROPDOWN_LOCATOR);
+        await this.driverHelper.enterValue(OcpMainPage.PROJECT_FILTER_INPUT_LOCATOR, 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}"]`);
+    }
+}