@eclipse-che/che-e2e - npm Package Compare versions

Comparing version 7.80.0-next-2571324 to 7.80.0-next-66ed29f

configs/inversify.config.ts

@@ -55,2 +55,3 @@ /** *******************************************************************
 import { UserPreferences } from '../pageobjects/dashboard/UserPreferences';
+import { WebTerminalPage } from "../pageobjects/webterminal/WebTerminalPage";
 
@@ -89,4 +90,4 @@ const e2eContainer: Container = new Container({ defaultScope: 'Transient', skipBaseClassChecks: true });
 e2eContainer.bind<ContainerTerminal>(CLASSES.ContainerTerminal).to(ContainerTerminal);
+e2eContainer.bind<WebTerminalPage>(CLASSES.WebTerminalPage).to(WebTerminalPage);
 e2eContainer.bind<UserPreferences>(CLASSES.UserPreferences).to(UserPreferences);
-
 e2eContainer.bind<Generator>(EXTERNAL_CLASSES.Generator).to(Generator);
@@ -93,0 +94,0 @@ e2eContainer.bind<LocatorLoader>(EXTERNAL_CLASSES.LocatorLoader).to(LocatorLoader);

configs/inversify.types.ts

@@ -51,3 +51,4 @@ /** *******************************************************************
 	ContainerTerminal: 'ContainerTerminal',
-	UserPreferences: 'UserPreferences'
+	UserPreferences: 'UserPreferences',
+	WebTerminalPage: 'WebTerminalPage'
 };
@@ -54,0 +55,0 @@

constants/REPORTER_CONSTANTS.ts

@@ -15,3 +15,3 @@ /** *******************************************************************
 	DELETE_SCREENCAST_IF_TEST_PASS: boolean;
-	RP_ENDPOINT(): string;
+	RP_ENDPOINT(): string | undefined;
 	RP_IS_LOCAL_SERVER: boolean;
@@ -128,10 +128,14 @@ REPORTERS_ENABLED(): string;
 	 */
-	RP_ENDPOINT: (): string => {
-		return process.env.RP_ENDPOINT || REPORTER_CONSTANTS.RP_IS_LOCAL_SERVER
-			? 'http://localhost:8080/api/v1'
-			: 'https://reportportal-crw.apps.ocp-c1.prod.psi.redhat.com/api/v1';
+	RP_ENDPOINT: (): string | undefined => {
+		if (process.env.RP_ENDPOINTRP_IS_LOCAL_SERVER) {
+			return 'http://localhost:8080/api/v1';
+		}
+		if (process.env.RP_ENDPOINT !== '') {
+			return process.env.RP_ENDPOINT;
+		}
+		return 'https://reportportal-crw.apps.ocp-c1.prod.psi.redhat.com/api/v1';
 	},
 
 	/**
-	 * use personal project to save launch, if false launch will be send to devspaces or che project, true by default
+	 * use personal project to save launch, if false launch will be sent to devspaces or che project, true by default
 	 */
@@ -138,0 +142,0 @@ RP_USE_PERSONAL: process.env.RP_USE_PERSONAL !== 'false',

dist/configs/inversify.config.js

@@ -52,2 +52,3 @@ "use strict";
 const UserPreferences_1 = require("../pageobjects/dashboard/UserPreferences");
+const WebTerminalPage_1 = require("../pageobjects/webterminal/WebTerminalPage");
 const e2eContainer = new inversify_1.Container({ defaultScope: 'Transient', skipBaseClassChecks: true });
@@ -85,2 +86,3 @@ exports.e2eContainer = e2eContainer;
 e2eContainer.bind(inversify_types_1.CLASSES.ContainerTerminal).to(KubernetesCommandLineToolsExecutor_1.ContainerTerminal);
+e2eContainer.bind(inversify_types_1.CLASSES.WebTerminalPage).to(WebTerminalPage_1.WebTerminalPage);
 e2eContainer.bind(inversify_types_1.CLASSES.UserPreferences).to(UserPreferences_1.UserPreferences);
@@ -87,0 +89,0 @@ e2eContainer.bind(inversify_types_1.EXTERNAL_CLASSES.Generator).to(main_1.Main);

dist/configs/inversify.types.js

@@ -53,3 +53,4 @@ "use strict";
     ContainerTerminal: 'ContainerTerminal',
-    UserPreferences: 'UserPreferences'
+    UserPreferences: 'UserPreferences',
+    WebTerminalPage: 'WebTerminalPage'
 };
@@ -56,0 +57,0 @@ exports.CLASSES = CLASSES;

dist/constants/REPORTER_CONSTANTS.js

@@ -93,8 +93,12 @@ "use strict";
     RP_ENDPOINT: () => {
-        return process.env.RP_ENDPOINT || exports.REPORTER_CONSTANTS.RP_IS_LOCAL_SERVER
-            ? 'http://localhost:8080/api/v1'
-            : 'https://reportportal-crw.apps.ocp-c1.prod.psi.redhat.com/api/v1';
+        if (process.env.RP_ENDPOINTRP_IS_LOCAL_SERVER) {
+            return 'http://localhost:8080/api/v1';
+        }
+        if (process.env.RP_ENDPOINT !== '') {
+            return process.env.RP_ENDPOINT;
+        }
+        return 'https://reportportal-crw.apps.ocp-c1.prod.psi.redhat.com/api/v1';
     },
     /**
-     * use personal project to save launch, if false launch will be send to devspaces or che project, true by default
+     * use personal project to save launch, if false launch will be sent to devspaces or che project, true by default
      */
@@ -101,0 +105,0 @@ RP_USE_PERSONAL: process.env.RP_USE_PERSONAL !== 'false',

dist/index.js

@@ -73,2 +73,3 @@ "use strict";
 __exportStar(require("./pageobjects/openshift/OcpMainPage"), exports);
+__exportStar(require("./pageobjects/webterminal/WebTerminalPage"), exports);
 __exportStar(require("./tests-library/LoginTests"), exports);
@@ -75,0 +76,0 @@ __exportStar(require("./tests-library/ProjectAndFileTests"), exports);

dist/pageobjects/openshift/OcpMainPage.js

@@ -74,14 +74,2 @@ "use strict";
     }
-    async openWebTerminal() {
-        Logger_1.Logger.debug();
-        await this.waitOpenMainPage();
-        await this.driverHelper.waitAndClick(OcpMainPage_1.WEB_TERMINAL_BUTTON);
-        await this.driverHelper.waitAndClick(OcpMainPage_1.START_WT_COMMAND_LINE_TERMINAL_BUTTON);
-        await this.driverHelper.waitPresence(OcpMainPage_1.WEB_TERMINAL_PAGE, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_WAIT_LOADER_ABSENCE_TIMEOUT);
-    }
-    async typeToWebTerminal(text) {
-        Logger_1.Logger.debug();
-        await this.driverHelper.waitPresence(OcpMainPage_1.WEB_TERMINAL_PAGE, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT);
-        await this.driverHelper.typeToInvisible(OcpMainPage_1.WEB_TERMINAL_PAGE, text);
-    }
     getRoleLocator(role) {
@@ -115,5 +103,2 @@ return selenium_webdriver_1.By.xpath(`//a//*[text()="${role}"]`);
 OcpMainPage.SKIP_TOUR_BUTTON = selenium_webdriver_1.By.xpath('//*[text()="Skip tour"]');
-OcpMainPage.WEB_TERMINAL_BUTTON = selenium_webdriver_1.By.xpath('//button[@data-quickstart-id="qs-masthead-cloudshell"]');
-OcpMainPage.WEB_TERMINAL_PAGE = selenium_webdriver_1.By.xpath('//*[@class="xterm-helper-textarea"]');
-OcpMainPage.START_WT_COMMAND_LINE_TERMINAL_BUTTON = selenium_webdriver_1.By.xpath('//*[@data-test-id="submit-button"]');
 OcpMainPage = OcpMainPage_1 = __decorate([
@@ -120,0 +105,0 @@ (0, inversify_1.injectable)(),

dist/specs/web-terminal/WebTerminalTest.spec.js

@@ -18,2 +18,3 @@ "use strict";
     const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
+    const webTerminal = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WebTerminalPage);
     const ocpMainPage = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.OcpMainPage);
@@ -29,3 +30,3 @@ const kubernetesCommandLineToolsExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor);
         await ocpMainPage.waitOpenMainPage();
-        await ocpMainPage.openWebTerminal();
+        await webTerminal.openWebTerminal();
     });
@@ -32,0 +33,0 @@ test('Check username is correct', function () {

index.ts

@@ -44,2 +44,3 @@ import * as inversifyConfig from './configs/inversify.config';
 export * from './pageobjects/openshift/OcpMainPage';
+export * from './pageobjects/webterminal/WebTerminalPage';
 export * from './tests-library/LoginTests';
@@ -46,0 +47,0 @@ export * from './tests-library/ProjectAndFileTests';

package.json

 {
 	"name": "@eclipse-che/che-e2e",
-	"version": "7.80.0-next-2571324",
+	"version": "7.80.0-next-66ed29f",
 	"description": "",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

pageobjects/openshift/OcpMainPage.ts

@@ -29,5 +29,2 @@ /** *******************************************************************
 	private static readonly SKIP_TOUR_BUTTON: By = By.xpath('//*[text()="Skip tour"]');
-	private static readonly WEB_TERMINAL_BUTTON: By = By.xpath('//button[@data-quickstart-id="qs-masthead-cloudshell"]');
-	private static readonly WEB_TERMINAL_PAGE: By = By.xpath('//*[@class="xterm-helper-textarea"]');
-	private static readonly START_WT_COMMAND_LINE_TERMINAL_BUTTON: By = By.xpath('//*[@data-test-id="submit-button"]');
 
@@ -89,18 +86,2 @@ constructor(
 
-	async openWebTerminal(): Promise<void> {
-		Logger.debug();
-
-		await this.waitOpenMainPage();
-		await this.driverHelper.waitAndClick(OcpMainPage.WEB_TERMINAL_BUTTON);
-		await this.driverHelper.waitAndClick(OcpMainPage.START_WT_COMMAND_LINE_TERMINAL_BUTTON);
-		await this.driverHelper.waitPresence(OcpMainPage.WEB_TERMINAL_PAGE, TIMEOUT_CONSTANTS.TS_WAIT_LOADER_ABSENCE_TIMEOUT);
-	}
-
-	async typeToWebTerminal(text: string): Promise<void> {
-		Logger.debug();
-
-		await this.driverHelper.waitPresence(OcpMainPage.WEB_TERMINAL_PAGE, TIMEOUT_CONSTANTS.TS_IDE_LOAD_TIMEOUT);
-		await this.driverHelper.typeToInvisible(OcpMainPage.WEB_TERMINAL_PAGE, text);
-	}
-
 	private getRoleLocator(role: string): By {
@@ -107,0 +88,0 @@ return By.xpath(`//a//*[text()="${role}"]`);

specs/web-terminal/WebTerminalTest.spec.ts

@@ -18,5 +18,7 @@ /** *******************************************************************
 import { expect } from 'chai';
+import { WebTerminalPage } from '../../pageobjects/webterminal/WebTerminalPage';
 
 suite(`Login to Openshift console and start WebTerminal ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
 	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const webTerminal: WebTerminalPage = e2eContainer.get(CLASSES.WebTerminalPage);
 	const ocpMainPage: OcpMainPage = e2eContainer.get(CLASSES.OcpMainPage);
@@ -37,3 +39,3 @@ const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
 		await ocpMainPage.waitOpenMainPage();
-		await ocpMainPage.openWebTerminal();
+		await webTerminal.openWebTerminal();
 	});
@@ -40,0 +42,0 @@

New alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 2 instances in 1 package

Fixed alerts

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1056481

increased by2.56%

Number of package files

286

increased by2.14%

Lines of code

15511

increased by2.61%

Worsened metrics

Number of low license alerts

33

increased by3.13%

Number of low supply chain risk alerts

56

increased by3.7%

No dependency changes