fix: import project test

Signed-off-by: mdolhalo <[email protected]>

tests/e2e/package.json

@@ -38,7 +38,7 @@
 		"@typescript-eslint/parser": "^6.1.0",
 		"axios": "^0.25.0",
 		"chai": "^4.3.4",
-		"chromedriver": "^114.0.2",
+		"chromedriver": "^117.0.3",
 		"clone-deep": "^4.0.1",
 		"eslint": "^8.45.0",
 		"eslint-config-prettier": "^8.10.0",

tests/e2e/pageobjects/dashboard/Dashboard.ts

@@ -163,7 +163,7 @@ export class Dashboard {
 		await this.driverHelper.waitAndClick(Dashboard.ABOUT_DIALOG_WINDOW_CLOSE_BUTTON);
 	}
 
-	async waitExistingWorkspaceFoundAlert(timeout: number = TIMEOUT_CONSTANTS.TS_COMMON_DASHBOARD_WAIT_TIMEOUT): Promise<void> {
+	async waitExistingWorkspaceFoundAlert(timeout: number = TIMEOUT_CONSTANTS.TS_WAIT_LOADER_PRESENCE_TIMEOUT): Promise<void> {
 		Logger.debug();
 
 		await this.driverHelper.waitVisibility(Dashboard.EXISTING_WORKSPACE_FOUND_ALERT, timeout);

tests/e2e/specs/SmokeTest.spec.ts

@@ -7,13 +7,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { SideBarView, ViewItem, ViewSection } from 'monaco-page-objects';
+import { ViewSection } from 'monaco-page-objects';
 import { ProjectAndFileTests } from '../tests-library/ProjectAndFileTests';
 import { CLASSES } from '../configs/inversify.types';
 import { e2eContainer } from '../configs/inversify.config';
 import { WorkspaceHandlingTests } from '../tests-library/WorkspaceHandlingTests';
 import { registerRunningWorkspace } from './MochaHooks';
-import { Logger } from '../utils/Logger';
 import { LoginTests } from '../tests-library/LoginTests';
 import { StringUtil } from '../utils/StringUtil';
 import { FACTORY_TEST_CONSTANTS } from '../constants/FACTORY_TEST_CONSTANTS';
@@ -45,15 +44,15 @@ suite('The SmokeTest userstory', function (): void {
 		});
 		test('Check a project folder has been created', async function (): Promise<void> {
 			const projectName: string = FACTORY_TEST_CONSTANTS.TS_SELENIUM_PROJECT_NAME || StringUtil.getProjectNameFromGitUrl(factoryUrl);
-			projectSection = (await new SideBarView().getContent().getSections())[0]; // get the (WORKSPACE) section from the sidebar - contains project content
-			expect(await projectSection.findItem(projectName)).not.eqls(undefined);
+			projectSection = await projectAndFileTests.getProjectViewSession();
+			expect(await projectAndFileTests.getProjectTreeItem(projectSection, projectName), 'Project folder was not imported').not
+				.undefined;
 		});
 		test('Check the project files was imported', async function (): Promise<void> {
-			Logger.debug(`projectSection.findItem: find ${BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
-			const isFileImported: ViewItem | undefined = await projectSection.findItem(
-				BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME
-			);
-			expect(isFileImported).not.eqls(undefined);
+			expect(
+				await projectAndFileTests.getProjectTreeItem(projectSection, BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME),
+				'Project files were not imported'
+			).not.undefined;
 		});
 		test('Stop the workspace', async function (): Promise<void> {
 			await workspaceHandlingTests.stopWorkspace(WorkspaceHandlingTests.getWorkspaceName());

tests/e2e/specs/dashboard-samples/Quarkus.spec.ts

@@ -8,16 +8,16 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-import { SideBarView, ViewSection } from 'monaco-page-objects';
+import { ViewSection } from 'monaco-page-objects';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { e2eContainer } from '../../configs/inversify.config';
 import { CLASSES } from '../../configs/inversify.types';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
-import { Logger } from '../../utils/Logger';
 import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { expect } from 'chai';
 
 const stackName: string = 'Java 11 with Quarkus';
 
@@ -28,7 +28,6 @@ suite(`The ${stackName} userstory`, function (): void {
 	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
 	let projectSection: ViewSection;
-
 	const projectName: string = 'quarkus-quickstarts';
 
 	loginTests.loginIntoChe();
@@ -50,13 +49,19 @@ suite(`The ${stackName} userstory`, function (): void {
 	});
 
 	test('Check a project folder has been created', async function (): Promise<void> {
-		projectSection = await new SideBarView().getContent().getSection(projectName);
-		Logger.debug(`new SideBarView().getContent().getSection: get ${projectName}`);
+		projectSection = await projectAndFileTests.getProjectViewSession();
+		expect(await projectAndFileTests.getProjectTreeItem(projectSection, projectName), 'Project folder was not imported').not.undefined;
+	});
+
+	test('Accept the project as a trusted one', async function (): Promise<void> {
+		await projectAndFileTests.performTrustAuthorDialog();
 	});
 
 	test('Check the project files was imported', async function (): Promise<void> {
-		await projectSection.findItem(BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
-		Logger.debug(`projectSection.findItem: find ${BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME}`);
+		expect(
+			await projectAndFileTests.getProjectTreeItem(projectSection, BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME, 2),
+			'Project files were not imported'
+		).not.undefined;
 	});
 
 	test('Stop the workspace', async function (): Promise<void> {
@@ -67,5 +72,6 @@ suite(`The ${stackName} userstory`, function (): void {
 	test('Delete the workspace', async function (): Promise<void> {
 		await workspaceHandlingTests.removeWorkspace(WorkspaceHandlingTests.getWorkspaceName());
 	});
+
 	loginTests.logoutFromChe();
 });

tests/e2e/specs/dashboard-samples/RecommendedExtensions.spec.ts

@@ -74,20 +74,18 @@ for (const sample of samples) {
 		});
 
 		test('Check the project files were imported', async function (): Promise<void> {
-			const [projectSection]: ViewSection[] = await new SideBarView().getContent().getSections();
-			expect(await projectSection.findItem(pathToExtensionsListFileName), 'Files not imported').not.undefined;
+			projectSection = await projectAndFileTests.getProjectViewSession();
+			expect(await projectAndFileTests.getProjectTreeItem(projectSection, pathToExtensionsListFileName), 'Files not imported').not
+				.undefined;
 		});
 
 		test('Accept the project as a trusted one', async function (): Promise<void> {
 			await projectAndFileTests.performTrustAuthorDialog();
 		});
 
 		test(`Get recommended extensions list from ${extensionsListFileName}`, async function (): Promise<void> {
-			Logger.debug('projectSection.findItem(item))?.select(): expand .vscode folder and open extensions.json.');
-			[projectSection] = await new SideBarView().getContent().getSections();
-			await (await projectSection.findItem(pathToExtensionsListFileName))?.select();
-			await driverHelper.waitVisibility(webCheCodeLocators.DefaultTreeItem.ctor(extensionsListFileName));
-			await (await projectSection.findItem(extensionsListFileName))?.select();
+			await (await projectAndFileTests.getProjectTreeItem(projectSection, pathToExtensionsListFileName))?.select();
+			await (await projectAndFileTests.getProjectTreeItem(projectSection, extensionsListFileName, 3))?.select();
 			Logger.debug(`EditorView().openEditor(${extensionsListFileName})`);
 			const editor: TextEditor = (await new EditorView().openEditor(extensionsListFileName)) as TextEditor;
 			await driverHelper.waitVisibility(webCheCodeLocators.Editor.inputArea);
@@ -185,7 +183,7 @@ for (const sample of samples) {
 				const isInstalled: boolean = (await itemWithRightNameAndPublisher?.isInstalled()) as boolean;
 
 				Logger.debug(`itemWithRightNameAndPublisher?.isInstalled(): ${isInstalled}.`);
-				expect(isInstalled, `Extension ${extension.name} not installed`).is.true;
+				expect(isInstalled, `Extension ${extension.name} not installed`).to.be.true;
 
 				Logger.debug('itemWithRightNameAndPublisher.manage(): get context menu.');
 				const extensionManageMenu: ContextMenu = await (itemWithRightNameAndPublisher as ExtensionsViewItem).manage();

tests/e2e/specs/devconsole-intergration/DevConsoleIntegration.spec.ts

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-import { SideBarView, ViewItem, ViewSection } from 'monaco-page-objects';
+import { ViewSection } from 'monaco-page-objects';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { LoginTests } from '../../tests-library/LoginTests';
 import { e2eContainer } from '../../configs/inversify.config';
@@ -88,9 +88,15 @@ suite('DevConsole Integration', function (): void {
 
 	test('Check if project and files imported', async function (): Promise<void> {
 		const applicationSourceProjectName: string = StringUtil.getProjectNameFromGitUrl(gitImportRepo);
-		const projectSection: ViewSection = await new SideBarView().getContent().getSection(applicationSourceProjectName);
-		const isFileImported: ViewItem | undefined = await projectSection.findItem(BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
-		expect(isFileImported).not.eqls(undefined);
+		const projectSection: ViewSection = await projectAndFileTests.getProjectViewSession();
+		expect(
+			await projectAndFileTests.getProjectTreeItem(projectSection, applicationSourceProjectName),
+			'Project folder was 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('Stop and delete the workspace by API', async function (): Promise<void> {

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

@@ -17,11 +17,9 @@ import {
 	EditorView,
 	Locators,
 	NewScmView,
-	SideBarView,
 	SingleScmProvider,
 	TextEditor,
 	ViewControl,
-	ViewItem,
 	ViewSection
 } from 'monaco-page-objects';
 import { expect } from 'chai';
@@ -92,20 +90,20 @@ suite(
 		test('Check if a project folder has been created', async function (): Promise<void> {
 			testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL);
 			Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
-			projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
-		});
-
-		test('Check if the project files were imported', async function (): Promise<void> {
-			const label: string = BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
-			Logger.debug(`projectSection.findItem: find ${label}`);
-			const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
-			expect(isFileImported).not.eqls(undefined);
+			projectSection = await projectAndFileTests.getProjectViewSession();
+			expect(await projectAndFileTests.getProjectTreeItem(projectSection, testRepoProjectName), 'Project folder was not imported').not
+				.undefined;
 		});
 
 		test('Accept the project as a trusted one', async function (): Promise<void> {
 			await projectAndFileTests.performTrustAuthorDialog();
 		});
 
+		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;
+		});
+
 		test('Make changes to the file', async function (): Promise<void> {
 			Logger.debug(`projectSection.openItem: "${fileToChange}"`);
 			await projectSection.openItem(fileToChange);
@@ -186,7 +184,7 @@ suite(
 				webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel),
 				'aria-disabled'
 			);
-			expect(isCommitButtonDisabled).eql('true');
+			expect(isCommitButtonDisabled).to.be.true;
 		});
 
 		test('Stop the workspace', async function (): Promise<void> {

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

@@ -18,11 +18,9 @@ import {
 	Locators,
 	ModalDialog,
 	NewScmView,
-	SideBarView,
 	SingleScmProvider,
 	TextEditor,
 	ViewControl,
-	ViewItem,
 	ViewSection
 } from 'monaco-page-objects';
 import { expect } from 'chai';
@@ -116,19 +114,18 @@ suite(
 
 			test('Check if a project folder has been created', async function (): Promise<void> {
 				testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL);
-				Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
-				projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
+				projectSection = await projectAndFileTests.getProjectViewSession();
+				expect(await projectAndFileTests.getProjectTreeItem(projectSection, testRepoProjectName), 'Project folder was not imported')
+					.not.undefined;
 			});
 
 			test('Accept the project as a trusted one', async function (): Promise<void> {
 				await projectAndFileTests.performTrustAuthorDialog();
 			});
 
 			test('Check if the project files were imported', async function (): Promise<void> {
-				Logger.debug(`projectSection.findItem: find ${label}`);
-				const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
-				// projectSection.findItem(label) can return undefined but test will goes on
-				expect(isFileImported).not.eqls(undefined);
+				expect(await projectAndFileTests.getProjectTreeItem(projectSection, label), 'Project files were not imported').not
+					.undefined;
 			});
 
 			test('Make changes to the file', async function (): Promise<void> {
@@ -243,7 +240,7 @@ suite(
 					webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel),
 					'aria-disabled'
 				);
-				expect(isCommitButtonDisabled).eql('true');
+				expect(isCommitButtonDisabled).to.be.true;
 			});
 
 			test('Stop the workspace', async function (): Promise<void> {

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

@@ -18,11 +18,9 @@ import {
 	Locators,
 	ModalDialog,
 	NewScmView,
-	SideBarView,
 	SingleScmProvider,
 	TextEditor,
 	ViewControl,
-	ViewItem,
 	ViewSection
 } from 'monaco-page-objects';
 import { expect } from 'chai';
@@ -99,8 +97,9 @@ suite(
 
 		test('Check if a project folder has been created', async function (): Promise<void> {
 			testRepoProjectName = StringUtil.getProjectNameFromGitUrl(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL);
-			Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
-			projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
+			projectSection = await projectAndFileTests.getProjectViewSession();
+			expect(await projectAndFileTests.getProjectTreeItem(projectSection, testRepoProjectName), 'Project folder was not imported').not
+				.undefined;
 		});
 
 		test('Accept the project as a trusted one', async function (): Promise<void> {
@@ -116,15 +115,12 @@ suite(
 			});
 
 			test('Check that project files were not imported', async function (): Promise<void> {
-				const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
-				expect(isFileImported).eqls(undefined);
+				expect(await projectAndFileTests.getProjectTreeItem(projectSection, label), 'Project files were found').to.be.undefined;
 			});
 		} else {
 			test('Check if the project files were imported', async function (): Promise<void> {
-				Logger.debug(`projectSection.findItem: find ${label}`);
-				const isFileImported: ViewItem | undefined = await projectSection.findItem(label);
-				// projectSection.findItem(label) can return undefined but test will goes on
-				expect(isFileImported).not.eqls(undefined);
+				expect(await projectAndFileTests.getProjectTreeItem(projectSection, label), 'Project files were not imported').not
+					.undefined;
 			});
 
 			test('Make changes to the file', async function (): Promise<void> {
@@ -231,7 +227,7 @@ suite(
 					webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel),
 					'aria-disabled'
 				);
-				expect(isCommitButtonDisabled).eql('true');
+				expect(isCommitButtonDisabled).to.be.true;
 			});
 		}
 

tests/e2e/specs/miscellaneous/CreateWorkspaceWithExistedName.spec.ts

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import { e2eContainer } from '../../configs/inversify.config';
-import { ViewSection, SideBarView, ViewItem } from 'monaco-page-objects';
+import { ViewSection } from 'monaco-page-objects';
 import { CLASSES } from '../../configs/inversify.types';
 import { expect } from 'chai';
 import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
@@ -42,9 +42,12 @@ suite('"Start workspace with existed workspace name" test', function (): void {
 
 	test('Wait workspace readiness and project folder has been created', async function (): Promise<void> {
 		await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-		projectSection = await new SideBarView().getContent().getSection(projectName);
-		const isFileImported: ViewItem | undefined = await projectSection.findItem(BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
-		expect(isFileImported).not.eqls(undefined);
+		projectSection = await projectAndFileTests.getProjectViewSession();
+		expect(await projectAndFileTests.getProjectTreeItem(projectSection, projectName), 'Project folder was 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('Stop created workspace', async function (): Promise<void> {
@@ -65,9 +68,12 @@ suite('"Start workspace with existed workspace name" test', function (): void {
 
 	test('Wait the second workspace readiness and project folder has been created', async function (): Promise<void> {
 		await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
-		projectSection = await new SideBarView().getContent().getSection(projectName);
-		const isFileImported: ViewItem | undefined = await projectSection.findItem(BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
-		expect(isFileImported).not.eqls(undefined);
+		projectSection = await projectAndFileTests.getProjectViewSession();
+		expect(await projectAndFileTests.getProjectTreeItem(projectSection, projectName), 'Project folder was 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(`Stop all created ${stackName} workspaces`, async function (): Promise<void> {