[Test] Fix up 'factory' E2E tests when use public repository

tests/e2e/configs/inversify.config.ts

@@ -60,6 +60,8 @@ import { CommandPalette } from '../pageobjects/ide/CommandPalette';
 import { ExtensionsView } from '../pageobjects/ide/ExtensionsView';
 import { ExplorerView } from '../pageobjects/ide/ExplorerView';
 import { NotificationHandler } from '../pageobjects/ide/NotificationHandler';
+import { SourceControlView } from '../pageobjects/ide/SourceControlView';
+import { GitHubExtensionDialog } from '../pageobjects/ide/GitHubExtensionDialog';
 
 const e2eContainer: Container = new Container({ defaultScope: 'Transient', skipBaseClassChecks: true });
 
@@ -105,6 +107,8 @@ e2eContainer.bind<CommandPalette>(CLASSES.CommandPalette).to(CommandPalette);
 e2eContainer.bind<ExtensionsView>(CLASSES.ExtensionsView).to(ExtensionsView);
 e2eContainer.bind<ExplorerView>(CLASSES.ExplorerView).to(ExplorerView);
 e2eContainer.bind<NotificationHandler>(CLASSES.NotificationHandler).to(NotificationHandler);
+e2eContainer.bind<SourceControlView>(CLASSES.SourceControlView).to(SourceControlView);
+e2eContainer.bind<GitHubExtensionDialog>(CLASSES.GitHubExtensionDialog).to(GitHubExtensionDialog);
 
 if (BASE_TEST_CONSTANTS.TS_PLATFORM === Platform.OPENSHIFT) {
 	if (OAUTH_CONSTANTS.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH) {

tests/e2e/configs/inversify.types.ts

@@ -57,7 +57,9 @@ const CLASSES: any = {
 	CommandPalette: 'CommandPalette',
 	ExtensionsView: 'ExtensionsView',
 	ExplorerView: 'ExplorerView',
-	NotificationHandler: 'NotificationHandler'
+	NotificationHandler: 'NotificationHandler',
+	SourceControlView: 'SourceControlView',
+	GitHubExtensionDialog: 'GitHubExtensionDialog'
 };
 
 const EXTERNAL_CLASSES: any = {

tests/e2e/constants/FACTORY_TEST_CONSTANTS.ts

@@ -27,6 +27,9 @@ export const FACTORY_TEST_CONSTANTS: {
 	TS_SELENIUM_FACTORY_GIT_REPO_BRANCH: string;
 	TS_SELENIUM_SSH_PRIVATE_KEY_PATH: string;
 	TS_SELENIUM_SSH_PUBLIC_KEY_PATH: string;
+	TS_GIT_COMMIT_AUTHOR_NAME: string;
+	TS_GIT_COMMIT_AUTHOR_EMAIL: string;
+	TS_GIT_PERSONAL_ACCESS_TOKEN: string;
 	TS_SELENIUM_FACTORY_URL(): string;
 } = {
 	/**
@@ -69,6 +72,21 @@ export const FACTORY_TEST_CONSTANTS: {
 	 */
 	TS_SELENIUM_SSH_PUBLIC_KEY_PATH: process.env.TS_SELENIUM_SSH_PUBLIC_KEY_PATH || 'resources/factory/pub-k.txt',
 
+	/**
+	 * git config user name
+	 */
+	TS_GIT_COMMIT_AUTHOR_NAME: process.env.TS_GIT_CONFIG_USER_NAME || 'user',
+
+	/**
+	 * git config user email
+	 */
+	TS_GIT_COMMIT_AUTHOR_EMAIL: process.env.TS_GIT_CONFIG_USER_EMAIL || 'user@user.com',
+
+	/**
+	 * personal access token of git provider (or api token if Bitbucket.org)
+	 */
+	TS_GIT_PERSONAL_ACCESS_TOKEN: process.env.TS_GIT_PERSONAL_ACCESS_TOKEN || '',
+
 	/**
 	 * full factory URL
 	 */

tests/e2e/index.ts

@@ -31,10 +31,12 @@ export * from './pageobjects/dashboard/Workspaces';
 export * from './pageobjects/git-providers/OauthPage';
 export * from './pageobjects/ide/CheCodeLocatorLoader';
 export * from './pageobjects/ide/CommandPalette';
+export * from './pageobjects/ide/GitHubExtensionDialog';
 export * from './pageobjects/ide/ExplorerView';
 export * from './pageobjects/ide/ExtensionsView';
 export * from './pageobjects/ide/NotificationHandler';
 export * from './pageobjects/ide/RestrictedModeButton';
+export * from './pageobjects/ide/SourceControlView';
 export * from './pageobjects/ide/ViewsMoreActionsButton';
 export * from './pageobjects/login/interfaces/ICheLoginPage';
 export * from './pageobjects/login/interfaces/IOcpLoginPage';

tests/e2e/pageobjects/dashboard/UserPreferences.ts

@@ -33,6 +33,9 @@ export class UserPreferences {
 	private static readonly ADD_NEW_PAT_BUTTON: By = By.xpath('//button[text()="Add Personal Access Token"]');
 
 	private static readonly GIT_CONFIG_PAGE: By = By.xpath('//button[text()="Gitconfig"]');
+	private static readonly GIT_CONFIG_USER_NAME: By = By.id('gitconfig-user-name');
+	private static readonly GIT_CONFIG_USER_EMAIL: By = By.id('gitconfig-user-email');
+	private static readonly GIT_CONFIG_SAVE_BUTTON: By = By.css('[data-testid="button-save"]');
 
 	private static readonly SSH_KEY_TAB: By = By.xpath('//button[text()="SSH Keys"]');
 	private static readonly ADD_NEW_SSH_KEY_BUTTON: By = By.xpath('//button[text()="Add SSH Key"]');
@@ -123,6 +126,39 @@ export class UserPreferences {
 		await this.driverHelper.waitAndClick(UserPreferences.GIT_CONFIG_PAGE);
 	}
 
+	async enterGitConfigUsernameAndEmail(userName: string, userEmail: string): Promise<void> {
+		Logger.debug(`"${userName}"`);
+		Logger.debug(`"${userEmail}"`);
+
+		await this.driverHelper.enterValue(UserPreferences.GIT_CONFIG_USER_NAME, userName);
+		await this.driverHelper.enterValue(UserPreferences.GIT_CONFIG_USER_EMAIL, userEmail);
+	}
+
+	async clickOnGitConfigSaveButton(): Promise<void> {
+		Logger.debug();
+
+		await this.driverHelper.waitAndClick(UserPreferences.GIT_CONFIG_SAVE_BUTTON);
+	}
+
+	async waitGitConfigSaveButtonIsDisabled(): Promise<void> {
+		Logger.debug();
+
+		await this.driverHelper.waitAttributeValue(
+			UserPreferences.GIT_CONFIG_SAVE_BUTTON,
+			'aria-disabled',
+			'true',
+			TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT
+		);
+	}
+
+	async setupGitConfig(userName: string, userEmail: string): Promise<void> {
+		await this.openUserPreferencesPage();
+		await this.openGitConfigPage();
+		await this.enterGitConfigUsernameAndEmail(userName, userEmail);
+		await this.clickOnGitConfigSaveButton();
+		// await userPreferences.waitGitConfigSaveButtonIsDisabled();// TODO: restore line after fix https://github.com/eclipse-che/che/issues/23625
+	}
+
 	async openSshKeyTab(): Promise<void> {
 		Logger.debug();
 

tests/e2e/pageobjects/git-providers/OauthPage.ts

@@ -74,7 +74,7 @@ export class OauthPage {
 				{
 					OauthPage.LOGIN_FORM = By.id('login_field');
 					OauthPage.PASSWORD_FORM = By.id('password');
-					OauthPage.APPROVE_BUTTON = By.xpath('//*[@id="js-oauth-authorize-btn"]');
+					OauthPage.APPROVE_BUTTON = By.xpath('//button[contains(., "Authorize")]');
 					OauthPage.SUBMIT_BUTTON = By.xpath('//*[@value="Sign in"]');
 					OauthPage.DENY_ACCESS_BUTTON = By.xpath('//button[contains(., "Cancel")]');
 				}

tests/e2e/pageobjects/ide/GitHubExtensionDialog.ts

@@ -0,0 +1,52 @@
+/** *******************************************************************
+ * copyright (c) 2025 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 { inject, injectable } from 'inversify';
+import 'reflect-metadata';
+import { CLASSES } from '../../configs/inversify.types';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { Logger } from '../../utils/Logger';
+import { By, ModalDialog } from 'monaco-page-objects';
+import { CheCodeLocatorLoader } from './CheCodeLocatorLoader';
+
+@injectable()
+export class GitHubExtensionDialog {
+	private static readonly DIALOG_LOCATOR: By = By.xpath(
+		'//div[@class="dialog-message-detail" and contains(., "The extension \'GitHub\' wants to sign in using GitHub.")]'
+	);
+
+	constructor(
+		@inject(CLASSES.DriverHelper)
+		private readonly driverHelper: DriverHelper,
+		@inject(CLASSES.CheCodeLocatorLoader)
+		private readonly cheCodeLocatorLoader: CheCodeLocatorLoader
+	) {}
+
+	/**
+	 * check if the dialog box with the message about the GitHub extension is visible.
+	 * @returns Promise resolving to boolean.
+	 */
+	async isDialogVisible(): Promise<boolean> {
+		Logger.debug();
+
+		return await this.driverHelper.waitVisibilityBoolean(GitHubExtensionDialog.DIALOG_LOCATOR);
+	}
+
+	/**
+	 * close the dialog box with the message about the GitHub extension.
+	 */
+	async closeDialog(): Promise<void> {
+		Logger.debug();
+
+		const modalDialog: ModalDialog = new ModalDialog();
+		await modalDialog.close();
+		await this.driverHelper.waitDisappearance(this.cheCodeLocatorLoader.webCheCodeLocators.Dialog.constructor);
+		Logger.debug('Dialog box with the message about the GitHub extension closed');
+	}
+}

tests/e2e/pageobjects/ide/SourceControlView.ts

@@ -0,0 +1,35 @@
+/** *******************************************************************
+ * copyright (c) 2025 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 { inject, injectable } from 'inversify';
+import 'reflect-metadata';
+import { CLASSES } from '../../configs/inversify.types';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { Logger } from '../../utils/Logger';
+import { Key } from 'selenium-webdriver';
+
+@injectable()
+export class SourceControlView {
+	constructor(
+		@inject(CLASSES.DriverHelper)
+		readonly driverHelper: DriverHelper
+	) {}
+
+	/**
+	 * type the commit message and press Ctrl+Enter to commit the changes.
+	 * @param textCommit Text to commit.
+	 */
+	async typeCommitMessage(textCommit: string): Promise<void> {
+		Logger.debug(`Type commit text: "Commit ${textCommit}"`);
+
+		await this.driverHelper.getDriver().actions().sendKeys(textCommit).perform();
+		Logger.debug('Press Enter to commit the changes');
+		await this.driverHelper.getDriver().actions().keyDown(Key.CONTROL).sendKeys(Key.ENTER).keyUp(Key.CONTROL).perform();
+	}
+}

tests/e2e/specs/factory/Factory.spec.ts

@@ -31,6 +31,7 @@ import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
 import { CreateWorkspace } from '../../pageobjects/dashboard/CreateWorkspace';
 import { ViewsMoreActionsButton } from '../../pageobjects/ide/ViewsMoreActionsButton';
+import { SourceControlView } from '../../pageobjects/ide/SourceControlView';
 
 suite(
 	`Create a workspace via launching a factory from the ${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER} repository ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`,
@@ -47,6 +48,7 @@ suite(
 		const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 		const createWorkspace: CreateWorkspace = e2eContainer.get(CLASSES.CreateWorkspace);
 		const viewsMoreActionsButton: ViewsMoreActionsButton = e2eContainer.get(CLASSES.ViewsMoreActionsButton);
+		const sourceControlView: SourceControlView = e2eContainer.get(CLASSES.SourceControlView);
 
 		let projectSection: ViewSection;
 		let scmProvider: SingleScmProvider;
@@ -103,8 +105,10 @@ suite(
 		});
 
 		test('Check if the project files were imported', async function (): Promise<void> {
-			const label: string = BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
-			expect(await projectAndFileTests.getProjectTreeItem(projectSection, label), 'Project files were not imported').not.undefined;
+			expect(
+				await projectAndFileTests.getProjectTreeItem(projectSection, BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME),
+				'Project files were not imported'
+			).not.undefined;
 		});
 
 		test('Make changes to the file', async function (): Promise<void> {
@@ -166,10 +170,7 @@ suite(
 				.getDriver()
 				.findElement((webCheCodeLocators.ScmView as any).scmEditor)
 				.click();
-			Logger.debug(`Type commit text: "Commit ${changesToCommit}"`);
-			await driverHelper.getDriver().actions().sendKeys(changesToCommit).perform();
-			Logger.debug('Press Enter to commit the changes');
-			await driverHelper.getDriver().actions().keyDown(Key.CONTROL).sendKeys(Key.ENTER).keyUp(Key.CONTROL).perform();
+			await sourceControlView.typeCommitMessage(changesToCommit);
 			await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 			await driverHelper.wait(timeToRefresh);
 			Logger.debug(`wait and click on: "${refreshButtonLabel}"`);