@eclipse-che/che-e2e 7.76.0-next-bd36cef → 7.76.0-next-be6d9b8

package/specs/miscellaneous/WorkspaceWithParent.spec.ts

@@ -9,7 +9,7 @@
  **********************************************************************/
 import { e2eContainer } from '../../configs/inversify.config';
 import { ShellExecutor } from '../../utils/ShellExecutor';
-import { InputBox, QuickOpenBox, QuickPickItem, SideBarView, ViewItem, ViewSection, Workbench } from 'monaco-page-objects';
+import { InputBox, QuickOpenBox, QuickPickItem, ViewItem, ViewSection, Workbench } from 'monaco-page-objects';
 import { CLASSES } from '../../configs/inversify.types';
 import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { LoginTests } from '../../tests-library/LoginTests';
@@ -32,9 +32,14 @@ suite('Workspace using a parent test suite', function (): void {
 	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
 		CLASSES.KubernetesCommandLineToolsExecutor
 	);
+
 	let podName: string = '';
+
+	suiteSetup(function (): void {
+		kubernetesCommandLineToolsExecutor.loginToOcp();
+	});
+
 	loginTests.loginIntoChe();
-	kubernetesCommandLineToolsExecutor.loginToOcp();
 
 	test('Create a workspace using a parent', async function (): Promise<void> {
 		const factoryUrl: string = `${BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL}/dashboard/#https://github.com/testsfactory/parentDevfile`;
@@ -47,12 +52,12 @@ suite('Workspace using a parent test suite', function (): void {
 	});
 
 	test('Check cloning of the test project', async function (): Promise<void> {
-		const expectedProjectItems: string[] = ['.devfile.yaml', 'parent.yaml', 'README.md'];
-		const visibleContent: ViewSection = await new SideBarView().getContent().getSection('parentdevfile');
+		const expectedProjectItems: string[] = ['.devfile.yaml', 'parent.yaml', 'README.md', 'parentdevfile'];
+		const visibleContent: ViewSection = await projectAndFileTests.getProjectViewSession();
 
 		for (const expectedProjectItem of expectedProjectItems) {
-			const visibleItem: ViewItem | undefined = await visibleContent.findItem(expectedProjectItem);
-			expect(visibleItem).not.equal(undefined);
+			const visibleItem: ViewItem | undefined = await projectAndFileTests.getProjectTreeItem(visibleContent, expectedProjectItem);
+			expect(visibleItem).not.undefined;
 		}
 	});
 
@@ -76,20 +81,20 @@ suite('Workspace using a parent test suite', function (): void {
 		const containerNames: string = shellExecutor.executeArbitraryShellScript(
 			`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.containers[*].name}\'`
 		);
-		expect(containerNames).contain('tools');
-		expect(containerNames).contains('che-gateway');
+		expect(containerNames).contains('tools').and.contains('che-gateway');
 
 		const initContainerName: string = shellExecutor.executeArbitraryShellScript(
 			`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.initContainers[].name}\'`
 		);
-		expect(initContainerName).contain('che-code-injector');
+		expect(initContainerName).contains('che-code-injector');
 	});
 
 	test('Check expected environment variables', function (): void {
 		const envList: string = shellExecutor.executeArbitraryShellScript(
 			`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} exec -i ${podName} -c tools -- sh -c env`
 		);
-		expect(envList).contain('DEVFILE_ENV_VAR=true').and.contain('PARENT_ENV_VAR=true');
+		expect(envList).contains('DEVFILE_ENV_VAR=true').and.contains('PARENT_ENV_VAR=true');
 	});
+
 	loginTests.logoutFromChe();
 });

package/tests-library/ProjectAndFileTests.ts

@@ -15,7 +15,7 @@ import { CLASSES } from '../configs/inversify.types';
 import { Logger } from '../utils/Logger';
 import { TIMEOUT_CONSTANTS } from '../constants/TIMEOUT_CONSTANTS';
 import { CheCodeLocatorLoader } from '../pageobjects/ide/CheCodeLocatorLoader';
-import { Workbench } from 'monaco-page-objects';
+import { SideBarView, ViewContent, ViewItem, ViewSection, Workbench } from 'monaco-page-objects';
 
 @injectable()
 export class ProjectAndFileTests {
@@ -45,13 +45,16 @@ export class ProjectAndFileTests {
 	async performTrustAuthorDialog(): Promise<void> {
 		Logger.debug();
 		// sometimes the trust dialog does not appear at first time, for avoiding this problem we send click event for activating
-		await new Workbench().click();
+		const workbench: Workbench = new Workbench();
+		await workbench.click();
+
 		await this.driverHelper.waitAndClick(
 			this.cheCodeLocatorLoader.webCheCodeLocators.WelcomeContent.button,
 			TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT
 		);
 
 		try {
+			await workbench.click();
 			await this.driverHelper.waitAndClick(
 				this.cheCodeLocatorLoader.webCheCodeLocators.WelcomeContent.button,
 				TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT
@@ -60,4 +63,57 @@ export class ProjectAndFileTests {
 			Logger.info('Second welcome content dialog box was not shown');
 		}
 	}
+
+	/**
+	 * find an ViewSection with project tree.
+	 * @returns Promise resolving to ViewSection object
+	 */
+
+	async getProjectViewSession(): Promise<ViewSection> {
+		Logger.debug();
+
+		await this.driverHelper.waitVisibility(
+			this.cheCodeLocatorLoader.webCheCodeLocators.DefaultTreeSection.itemRow,
+			TIMEOUT_CONSTANTS.TS_EXPAND_PROJECT_TREE_ITEM_TIMEOUT
+		);
+
+		const viewContent: ViewContent = new SideBarView().getContent();
+		const [projectSection]: ViewSection[] = await viewContent.getSections();
+		return projectSection;
+	}
+
+	/**
+	 * find an item in this view section by label. Does not perform recursive search through the whole tree.
+	 * Does however scroll through all the expanded content. Will find items beyond the current scroll range.
+	 * @param projectSection ViewSection with project tree files.
+	 * @param label Label of the item to search for.
+	 * @param itemLevel Shows how deep the algorithm should look into expanded folders to find item,
+	 * default - 2 means first level is project directory and files inside it is the second level, unlimited 0
+	 * @returns Promise resolving to ViewItem object is such item exists, undefined otherwise
+	 */
+	async getProjectTreeItem(projectSection: ViewSection, label: string, itemLevel: number = 2): Promise<ViewItem | undefined> {
+		Logger.debug(`${label}`);
+
+		let projectTreeItem: ViewItem | undefined;
+		await this.driverHelper.waitVisibility(
+			this.cheCodeLocatorLoader.webCheCodeLocators.ScmView.itemLevel(itemLevel),
+			TIMEOUT_CONSTANTS.TS_EXPAND_PROJECT_TREE_ITEM_TIMEOUT
+		);
+
+		try {
+			projectTreeItem = await projectSection.findItem(label, itemLevel);
+			if (!projectTreeItem) {
+				try {
+					await projectSection.collapse();
+					projectTreeItem = await projectSection.findItem(label, itemLevel);
+				} catch (e) {
+					Logger.warn(JSON.stringify(e));
+				}
+			}
+		} catch (e) {
+			Logger.warn(JSON.stringify(e));
+		}
+
+		return projectTreeItem;
+	}
 }

package/utils/CheReporter.ts

@@ -26,6 +26,8 @@ import { PLUGIN_TEST_CONSTANTS } from '../constants/PLUGIN_TEST_CONSTANTS';
 import { injectable } from 'inversify';
 import getDecorators from 'inversify-inject-decorators';
 import { e2eContainer } from '../configs/inversify.config';
+// @ts-ignore: No module declaration file
+import * as chromeHar from 'chrome-har';
 
 const { lazyInject } = getDecorators(e2eContainer);
 
@@ -135,6 +137,7 @@ class CheReporter extends mocha.reporters.Spec {
 			const screenshotFileName: string = `${testReportDirPath}/screenshot-${testTitle}.png`;
 			const pageSourceFileName: string = `${testReportDirPath}/pagesource-${testTitle}.html`;
 			const browserLogsFileName: string = `${testReportDirPath}/browserlogs-${testTitle}.txt`;
+			const harFileName: string = `${testReportDirPath}/har-${testTitle}.har`;
 
 			// create reporter dir if not exist
 			const reportDirExists: boolean = fs.existsSync(REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER);
@@ -172,6 +175,15 @@ class CheReporter extends mocha.reporters.Spec {
 			browserLogsStream.write(Buffer.from(browserLogs), (): void => {
 				browserLogsStream.end();
 			});
+
+			// take networking logs and write to file
+			const networkLogsEntries: logging.Entry[] = await this.driverHelper.getDriver().manage().logs().get('performance');
+			const events = networkLogsEntries.map((entry) => JSON.parse(entry.message).message);
+			const har = chromeHar.harFromMessages(events, { includeTextFromResponseBody: true });
+			const networkLogsStream: WriteStream = fs.createWriteStream(harFileName);
+			networkLogsStream.write(Buffer.from(JSON.stringify(har)), (): void => {
+				networkLogsStream.end();
+			});
 		});
 	}
 }