Fix up E2E tests related to factory test flow (#22861)

* Update files related to factory test flow
* Update files according to formatting

tests/e2e/configs/mocharc.ts

@@ -31,15 +31,15 @@ module.exports = {
 		BASE_TEST_CONSTANTS.TEST_ENVIRONMENT !== ''
 			? `dist/suites/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/${MOCHA_CONSTANTS.MOCHA_SUITE}.suite.js`
 			: // variable MOCHA_DIRECTORY uses in command "test-all-devfiles" and sets up automatically.
-				// you can set it up to run files from specific directory with export environmental variable.
-				MOCHA_CONSTANTS.MOCHA_DIRECTORY
-				? // to run one file (name without extension). uses in "test", "test-all-devfiles".
-					MOCHA_CONSTANTS.MOCHA_USERSTORY
-					? `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`
-					: `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/**.spec.js`
-				: MOCHA_CONSTANTS.MOCHA_USERSTORY
-					? [`dist/specs/**/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`, `dist/specs/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`]
-					: ['dist/specs/**/**.spec.js', 'dist/specs/**.spec.js'],
+			// you can set it up to run files from specific directory with export environmental variable.
+			MOCHA_CONSTANTS.MOCHA_DIRECTORY
+			? // to run one file (name without extension). uses in "test", "test-all-devfiles".
+			  MOCHA_CONSTANTS.MOCHA_USERSTORY
+				? `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`
+				: `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/**.spec.js`
+			: MOCHA_CONSTANTS.MOCHA_USERSTORY
+			? [`dist/specs/**/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`, `dist/specs/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`]
+			: ['dist/specs/**/**.spec.js', 'dist/specs/**.spec.js'],
 	retries: MOCHA_CONSTANTS.MOCHA_RETRIES,
 	grep: MOCHA_CONSTANTS.MOCHA_GREP
 };

tests/e2e/constants/BASE_TEST_CONSTANTS.ts

@@ -66,8 +66,8 @@ export const BASE_TEST_CONSTANTS: {
 		return BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('devspaces')
 			? 'devspaces'
 			: BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('che')
-				? 'che'
-				: 'default';
+			? 'che'
+			: 'default';
 	},
 	/**
 	 * testing application version

tests/e2e/pageobjects/ide/CheCodeLocatorLoader.ts

@@ -42,7 +42,7 @@ export class CheCodeLocatorLoader extends LocatorLoader {
 					button: By.xpath('//div[@class="monaco-dialog-box"]//a[@class="monaco-button monaco-text-button"]')
 				},
 				ScmView: {
-					actionConstructor: (title: string): By => By.xpath(`.//a[@title='${title}']`)
+					actionConstructor: (title: string): By => By.xpath(`.//a[@aria-label='${title}']`)
 				}
 			},
 			extras: {

tests/e2e/specs/MochaHooks.ts

@@ -38,7 +38,7 @@ export function registerRunningWorkspace(workspaceName: string): void {
 		: ((): void => {
 				Logger.debug('delete workspace name');
 				WorkspaceHandlingTests.clearWorkspaceName();
-			})();
+		  })();
 
 	latestWorkspace = workspaceName;
 }

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

@@ -63,7 +63,6 @@ suite(
 		const timeToRefresh: number = 1500;
 		const changesToCommit: string = new Date().getTime().toString();
 		const fileToChange: string = 'Date.txt';
-		const commitChangesButtonLabel: string = `Commit Changes on "${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
 		const refreshButtonLabel: string = 'Refresh';
 		const pushItemLabel: string = 'Push';
 		let testRepoProjectName: string;
@@ -141,8 +140,8 @@ suite(
 		test('Check if the changes are displayed in the source control manager', async function (): Promise<void> {
 			await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 			await driverHelper.wait(timeToRefresh);
-			Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-			await scmProvider.takeAction(refreshButtonLabel);
+			Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
+			await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
 			// wait while changes counter will be refreshed
 			await driverHelper.wait(timeToRefresh);
 			const changes: number = await scmProvider.getChangeCount();
@@ -164,8 +163,8 @@ suite(
 			await scmProvider.commitChanges('Commit ' + changesToCommit);
 			await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 			await driverHelper.wait(timeToRefresh);
-			Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-			await scmProvider.takeAction(refreshButtonLabel);
+			Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
+			await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
 			// wait while changes counter will be refreshed
 			await driverHelper.wait(timeToRefresh);
 			const changes: number = await scmProvider.getChangeCount();
@@ -174,11 +173,7 @@ suite(
 		});
 
 		test('Push the changes', async function (): Promise<void> {
-			await driverHelper.waitVisibility(
-				webCheCodeLocators.ScmView.actionConstructor(
-					`Push 1 commits to origin/${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`
-				)
-			);
+			await driverHelper.waitVisibility(webCheCodeLocators.Notification.action);
 			await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 			Logger.debug('scmProvider.openMoreActions');
 			scmContextMenu = await scmProvider.openMoreActions();
@@ -190,10 +185,10 @@ suite(
 		test('Check if the changes were pushed', async function (): Promise<void> {
 			await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 			await driverHelper.wait(timeToRefresh);
-			Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-			await scmProvider.takeAction(refreshButtonLabel);
+			Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
+			await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
 			const isCommitButtonDisabled: string = await driverHelper.waitAndGetElementAttribute(
-				webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel),
+				webCheCodeLocators.Notification.action,
 				'aria-disabled'
 			);
 			expect(isCommitButtonDisabled).to.equal('true');

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

@@ -158,8 +158,8 @@ suite(
 			test('Check if the changes are displayed in the source control manager', async function (): Promise<void> {
 				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 				await driverHelper.wait(timeToRefresh);
-				Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-				await scmProvider.takeAction(refreshButtonLabel);
+				Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
+				await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
 				// wait while changes counter will be refreshed
 				await driverHelper.wait(timeToRefresh);
 				const changes: number = await scmProvider.getChangeCount();
@@ -181,8 +181,8 @@ suite(
 				await scmProvider.commitChanges('Commit ' + changesToCommit);
 				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 				await driverHelper.wait(timeToRefresh);
-				Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-				await scmProvider.takeAction(refreshButtonLabel);
+				Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
+				await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
 				// wait while changes counter will be refreshed
 				await driverHelper.wait(timeToRefresh);
 				const changes: number = await scmProvider.getChangeCount();
@@ -232,7 +232,7 @@ suite(
 			test('Check if the changes were pushed', async function (): Promise<void> {
 				try {
 					Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-					await scmProvider.takeAction(refreshButtonLabel);
+					await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
 				} catch (e) {
 					Logger.info(
 						'Check you use correct credentials.' +

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

@@ -159,8 +159,8 @@ suite(
 			test('Check if the changes are displayed in the source control manager', async function (): Promise<void> {
 				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 				await driverHelper.wait(timeToRefresh);
-				Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-				await scmProvider.takeAction(refreshButtonLabel);
+				Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
+				await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
 				// wait while changes counter will be refreshed
 				await driverHelper.wait(timeToRefresh);
 				const changes: number = await scmProvider.getChangeCount();
@@ -182,8 +182,8 @@ suite(
 				await scmProvider.commitChanges('Commit ' + changesToCommit);
 				await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
 				await driverHelper.wait(timeToRefresh);
-				Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
-				await scmProvider.takeAction(refreshButtonLabel);
+				Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
+				await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
 				// wait while changes counter will be refreshed
 				await driverHelper.wait(timeToRefresh);
 				const changes: number = await scmProvider.getChangeCount();

tests/e2e/utils/DevWorkspaceConfigurationHelper.ts

@@ -90,10 +90,10 @@ export class DevWorkspaceConfigurationHelper {
 			e.kind === 'DevWorkspace'
 				? (content.DevWorkspace = e)
 				: e.kind === 'DevWorkspaceTemplate'
-					? (content.DevWorkspaceTemplate = e)
-					: Logger.error(
-							'Problems with configuration parsing, string should be in format "DevWorkspace\\n---\\nDevWorkspaceTemplate"'
-						);
+				? (content.DevWorkspaceTemplate = e)
+				: Logger.error(
+						'Problems with configuration parsing, string should be in format "DevWorkspace\\n---\\nDevWorkspaceTemplate"'
+				  );
 		});
 
 		return content;