@eclipse-che/che-e2e 7.39.0 → 7.40.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-che/che-e2e",
-  "version": "7.39.0",
+  "version": "7.40.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@types/node": "11.13.4",
     "@types/rimraf": "2.0.2",
     "@types/selenium-webdriver": "3.0.16",
-    "axios": "0.21.1",
+    "axios": "0.21.2",
     "chai": "4.2.0",
     "chromedriver": "95.0.0",
     "mocha": "7.1.1",

package/pageobjects/ide/Editor.ts

@@ -325,38 +325,38 @@ export class Editor {
         await this.performKeyCombination(editorTabTitle, text);
     }
 
-    async waitErrorInLine(lineNumber: number, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
+    async waitErrorInLine(lineNumber: number, fileName: string, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
         Logger.debug(`Editor.waitErrorInLine line: "${lineNumber}"`);
 
-        const errorInLineLocator: By = await this.getErrorInLineLocator(lineNumber);
+        const errorInLineLocator: By = await this.getErrorInLineLocator(lineNumber, fileName);
         await this.driverHelper.waitVisibility(errorInLineLocator, timeout);
     }
 
-    async waitErrorInLineDisappearance(lineNumber: number, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
+    async waitErrorInLineDisappearance(lineNumber: number, fileName: string, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
         Logger.debug(`Editor.waitErrorInLineDisappearance line: "${lineNumber}"`);
 
-        const errorInLineLocator: By = await this.getErrorInLineLocator(lineNumber);
+        const errorInLineLocator: By = await this.getErrorInLineLocator(lineNumber, fileName);
         await this.driverHelper.waitDisappearanceWithTimeout(errorInLineLocator, timeout);
     }
 
-    async waitWarningInLine(lineNumber: number, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
+    async waitWarningInLine(lineNumber: number, fileName: string, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
         Logger.debug(`Editor.waitWarningInLine line: "${lineNumber}"`);
 
-        const warningInLineLocator: By = await this.getWarningInLineLocator(lineNumber);
+        const warningInLineLocator: By = await this.getWarningInLineLocator(lineNumber, fileName);
         await this.driverHelper.waitVisibility(warningInLineLocator, timeout);
     }
 
-    async waitInfoInLine(lineNumber: number, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
+    async waitInfoInLine(lineNumber: number, fileName: string, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
         Logger.debug(`Editor.waitInfoInLine line: "${lineNumber}"`);
 
-        const infoInLineLocator: By = await this.getInfoInLineLocator(lineNumber);
+        const infoInLineLocator: By = await this.getInfoInLineLocator(lineNumber, fileName);
         await this.driverHelper.waitVisibility(infoInLineLocator, timeout);
     }
 
-    async waitWarningInLineDisappearance(lineNumber: number, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
+    async waitWarningInLineDisappearance(lineNumber: number, fileName: string, timeout: number = TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT) {
         Logger.debug(`Editor.waitWarningInLineDisappearance line: "${lineNumber}"`);
 
-        const warningInLineLocator: By = await this.getWarningInLineLocator(lineNumber);
+        const warningInLineLocator: By = await this.getWarningInLineLocator(lineNumber, fileName);
         await this.driverHelper.waitDisappearanceWithTimeout(warningInLineLocator, timeout);
     }
 
@@ -405,10 +405,11 @@ export class Editor {
         }
     }
 
-    async getLineYCoordinates(lineNumber: number): Promise<number> {
+    async getLineYCoordinates(lineNumber: number, fileName: string): Promise<number> {
         Logger.debug(`Editor.getLineYCoordinates line: "${lineNumber}"`);
 
-        const lineNumberLocator: By = By.xpath(`//div[contains(@class, 'line-numbers') and text()='${lineNumber}']` +
+        const lineNumberLocator: By = By.xpath(`//div[contains(@data-uri, '${fileName}')]` +
+            `//div[contains(@class, 'line-numbers') and text()='${lineNumber}']` +
             `//parent::div[contains(@style, 'position')]`);
         let elementStyleValue: string = await this.driverHelper.waitAndGetElementAttribute(lineNumberLocator, 'style', TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
 
@@ -422,10 +423,10 @@ export class Editor {
         return lineYCoordinate;
     }
 
-    async clickOnLineAndChar(line: number, char: number) {
+    async clickOnLineAndChar(line: number, char: number, fileName: string) {
         Logger.debug(`Editor.clickOnLineAndChar line: "${line}" char: "${char}"`);
 
-        const yPosition: number = await this.getLineYCoordinates(line) + Editor.ADDITIONAL_SHIFTING_TO_Y;
+        const yPosition: number = await this.getLineYCoordinates(line, fileName) + Editor.ADDITIONAL_SHIFTING_TO_Y;
         const xPosition: number = char + Editor.ADDITIONAL_SHIFTING_TO_X;
 
         new ActionSequence(this.driverHelper.getDriver()).
@@ -434,10 +435,10 @@ export class Editor {
             perform();
     }
 
-    async goToDefinitionWithMouseClicking(line: number, char: number) {
+    async goToDefinitionWithMouseClicking(line: number, char: number, fileName: string) {
         Logger.debug(`Editor.goToDefinitionWithMouseClicking line: "${line}" char: "${char}"`);
 
-        const yPosition: number = await this.getLineYCoordinates(line) + Editor.ADDITIONAL_SHIFTING_TO_Y;
+        const yPosition: number = await this.getLineYCoordinates(line, fileName) + Editor.ADDITIONAL_SHIFTING_TO_Y;
 
         new ActionSequence(this.driverHelper.getDriver()).
             keyDown(Key.CONTROL).
@@ -447,10 +448,10 @@ export class Editor {
             perform();
     }
 
-    async mouseRightButtonClick(line: number, char: number) {
+    async mouseRightButtonClick(line: number, char: number, fileName: string) {
         Logger.debug(`Editor.mouseRightButtonClick line: "${line}" char: "${char}"`);
 
-        const yPosition: number = await this.getLineYCoordinates(line) + Editor.ADDITIONAL_SHIFTING_TO_Y;
+        const yPosition: number = await this.getLineYCoordinates(line, fileName) + Editor.ADDITIONAL_SHIFTING_TO_Y;
 
         new ActionSequence(this.driverHelper.getDriver()).
             mouseMove({ x: char + Editor.ADDITIONAL_SHIFTING_TO_X, y: yPosition }).
@@ -503,20 +504,20 @@ export class Editor {
         return `//li[contains(@class, 'p-TabBar-tab')]//div[text()='${tabTitle}']`;
     }
 
-    private async getErrorInLineLocator(lineNumber: number): Promise<By> {
-        const lineYCoordinates: number = await this.getLineYCoordinates(lineNumber);
+    private async getErrorInLineLocator(lineNumber: number, fileName: string): Promise<By> {
+        const lineYCoordinates: number = await this.getLineYCoordinates(lineNumber, fileName);
 
         return By.xpath(`//div[contains(@style, 'top:${lineYCoordinates}px')]//div[contains(@class, 'squiggly-error')]`);
     }
 
-    private async getWarningInLineLocator(lineNumber: number): Promise<By> {
-        const lineYCoordinates: number = await this.getLineYCoordinates(lineNumber);
+    private async getWarningInLineLocator(lineNumber: number, fileName: string): Promise<By> {
+        const lineYCoordinates: number = await this.getLineYCoordinates(lineNumber, fileName);
 
         return By.xpath(`//div[contains(@style, 'top:${lineYCoordinates}px')]//div[contains(@class, 'squiggly-warning')]`);
     }
 
-    private async getInfoInLineLocator(lineNumber: number): Promise<By> {
-        const lineYCoordinates: number = await this.getLineYCoordinates(lineNumber);
+    private async getInfoInLineLocator(lineNumber: number, fileName: string): Promise<By> {
+        const lineYCoordinates: number = await this.getLineYCoordinates(lineNumber, fileName);
 
         return By.xpath(`//div[contains(@style, 'top:${lineYCoordinates}px')]//div[contains(@class, 'squiggly-info')]`);
     }

package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts

@@ -109,16 +109,16 @@ suite('Workspace creation via factory url', async () => {
             await editor.type(javaFileName, textForErrorDisplaying, 30);
 
             try {
-                await editor.waitErrorInLine(30, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
+                await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
             } catch (err) {
                 Logger.debug('Workaround for the https://github.com/eclipse/che/issues/18974.');
                 await browserTabsUtil.refreshPage();
                 await ide.waitAndSwitchToIdeFrame();
                 await ide.waitIde();
-                await editor.waitErrorInLine(30, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT * 2);
+                await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT * 2);
             }
             await editor.performKeyCombination(javaFileName, Key.chord(Key.BACK_SPACE));
-            await editor.waitErrorInLineDisappearance(30);
+            await editor.waitErrorInLineDisappearance(30, javaFileName);
         });
 
         test('Suggestion', async () => {

package/tests/e2e_happy_path/HappyPath.spec.ts

@@ -122,17 +122,17 @@ suite('Language server validation', async () => {
         await editor.type(javaFileName, textForErrorDisplaying, 30);
 
         try {
-            await editor.waitErrorInLine(30, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
+            await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
         } catch (err) {
             Logger.debug('Workaround for the https://github.com/eclipse/che/issues/18974.');
             await browserTabsUtil.refreshPage();
             await ide.waitAndSwitchToIdeFrame();
             await ide.waitIde();
-            await editor.waitErrorInLine(30, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT * 2);
+            await editor.waitErrorInLine(30, javaFileName, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT * 2);
         }
 
         await editor.performKeyCombination(javaFileName, Key.chord(Key.BACK_SPACE));
-        await editor.waitErrorInLineDisappearance(30);
+        await editor.waitErrorInLineDisappearance(30, javaFileName);
     });
 
     test('Suggestion', async () => {

package/tests/plugins/JavaPlugin.spec.ts

@@ -81,9 +81,9 @@ suite(`The 'JavaPlugin' test`, async () => {
         test('Error highlighting', async () => {
             const textForErrorDisplaying: string = '$';
             await editor.type(tabTitle, textForErrorDisplaying, 10);
-            await editor.waitErrorInLine(10, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
+            await editor.waitErrorInLine(10, tabTitle, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
             await editor.performKeyCombination(tabTitle, Key.chord(Key.BACK_SPACE));
-            await editor.waitErrorInLineDisappearance(10);
+            await editor.waitErrorInLineDisappearance(10, tabTitle);
         });
 
         test('Codenavigation', async () => {

package/tests/plugins/PhpPlugin.spec.ts

@@ -77,9 +77,9 @@ suite(`The 'PhpPlugin' tests`, async () => {
         test('Error highlighting', async () => {
             const textForErrorDisplaying: string = '*';
             await editor.type(tabTitle, textForErrorDisplaying, 13);
-            await editor.waitErrorInLine(13, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
+            await editor.waitErrorInLine(13, tabTitle, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
             await editor.type(tabTitle, Key.chord(Key.DELETE), 13);
-            await editor.waitErrorInLineDisappearance(13);
+            await editor.waitErrorInLineDisappearance(13, tabTitle);
         });
     });
 

package/tests/plugins/PythonPlugin.spec.ts

@@ -73,9 +73,9 @@ suite(`The 'PythonPlugin' test`, async () => {
         test('Error highlighting', async () => {
             const textForErrorDisplaying: string = 'err';
             await editor.type(tabTitle, textForErrorDisplaying, 7);
-            await editor.waitErrorInLine(7, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
+            await editor.waitErrorInLine(7, tabTitle, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
             await editor.performKeyCombination(tabTitle, Key.chord(Key.BACK_SPACE, Key.BACK_SPACE, Key.BACK_SPACE));
-            await editor.waitErrorInLineDisappearance(7);
+            await editor.waitErrorInLineDisappearance(7, tabTitle);
         });
     });
 

package/tests/plugins/TypescriptPlugin.spec.ts

@@ -90,9 +90,9 @@ suite(`The 'TypescriptPlugin and Node-debug' tests`, async () => {
         test('Error highlighting', async () => {
             const textForErrorDisplaying: string = '//';
             await editor.type(tabTitle, textForErrorDisplaying, 5);
-            await editor.waitErrorInLine(4, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
+            await editor.waitErrorInLine(4, tabTitle, TimeoutConstants.TS_ERROR_HIGHLIGHTING_TIMEOUT);
             await editor.type(tabTitle, Key.chord(Key.DELETE, Key.DELETE), 5);
-            await editor.waitErrorInLineDisappearance(4);
+            await editor.waitErrorInLineDisappearance(4, tabTitle);
         });
 
         test('Codenavigation', async () => {

package/tests/plugins/VscodeShellcheckPlugin.spec.ts

@@ -72,16 +72,16 @@ suite(`The 'VscodeShellcheckPlugin' test`, async () => {
 
             await projectTree.expandPathAndOpenFile(pathToFile, fileName);
             await editor.type(fileName, errorText, 4);
-            await editor.waitErrorInLine(4);
+            await editor.waitErrorInLine(4, fileName);
         });
 
         test('Check errors highlighting disappearance', async () => {
             await editor.type(fileName, Key.DELETE, 4);
-            await editor.waitErrorInLineDisappearance(4);
+            await editor.waitErrorInLineDisappearance(4, fileName);
         });
 
         test('Check warning highlighting', async () => {
-            await editor.waitWarningInLine(5);
+            await editor.waitWarningInLine(5, fileName);
         });
 
         test('Uncomment the 4-th row', async () => {
@@ -89,7 +89,7 @@ suite(`The 'VscodeShellcheckPlugin' test`, async () => {
         });
 
         test('Check warning highlighting disappearance', async () => {
-            await editor.waitWarningInLineDisappearance(5);
+            await editor.waitWarningInLineDisappearance(5, fileName);
         });
     });
 

package/tests/plugins/VscodeValePlugin.spec.ts

@@ -64,7 +64,7 @@ suite('The "VscodeValePlugin" userstory', async () => {
     suite('Check the "vale" plugin', async () => {
         test('Check warning in the editor appearance', async () => {
             await projectTree.expandPathAndOpenFile(pathToFile, docFileName);
-            await editor.waitInfoInLine(16);
+            await editor.waitInfoInLine(16,docFileName);
         });
 
         test('Open the "Problems" terminal tab', async () => {

package/tests/plugins/VscodeXmlPlugin.spec.ts

@@ -69,12 +69,12 @@ suite('The "VscodeXmlPlugin" userstory', async () => {
             await projectTree.expandPathAndOpenFile(pathToFile, xmlFileName);
 
             await editor.type(xmlFileName, '\$\%\^\#', 16);
-            await editor.waitErrorInLine(16);
+            await editor.waitErrorInLine(16, xmlFileName);
         });
 
         test('Check error disappearance', async () => {
             await editor.performKeyCombination(xmlFileName, Key.chord(Key.BACK_SPACE, Key.BACK_SPACE, Key.BACK_SPACE, Key.BACK_SPACE));
-            await editor.waitErrorInLineDisappearance(16);
+            await editor.waitErrorInLineDisappearance(16, xmlFileName);
         });
 
         test('Check auto-close tags', async () => {

package/tests/plugins/VscodeYamlPlugin.spec.ts

@@ -77,12 +77,12 @@ suite('The "VscodeYamlPlugin" userstory', async () => {
             await projectTree.expandPathAndOpenFile(pathToFile, yamlFileName);
 
             await editor.type(yamlFileName, Key.SPACE, 19);
-            await editor.waitErrorInLine(19);
+            await editor.waitErrorInLine(19, yamlFileName);
         });
 
         test('Check error disappearance', async () => {
             await editor.performKeyCombination(yamlFileName, Key.BACK_SPACE);
-            await editor.waitErrorInLineDisappearance(19);
+            await editor.waitErrorInLineDisappearance(19, yamlFileName);
         });
 
         test('To unformat the "yaml" file', async () => {

package/testsLibrary/LanguageServerTests.ts

@@ -36,7 +36,7 @@ export class LanguageServerTests {
         test('Error highlighting', async () => {
             await this.editor.type(openedTab, textToWrite, line);
             try {
-                await this.editor.waitErrorInLine(line);
+                await this.editor.waitErrorInLine(line, openedTab);
             } catch (err) {
                 if (!(err instanceof error.TimeoutError)) {
                     throw err;
@@ -45,7 +45,7 @@ export class LanguageServerTests {
             for (let i = 0; i < textToWrite.length; i++) {
                 await this.editor.performKeyCombination(openedTab, Key.BACK_SPACE);
             }
-            await this.editor.waitErrorInLineDisappearance(line);
+            await this.editor.waitErrorInLineDisappearance(line, openedTab);
         });
     }
 

package/utils/DriverHelper.ts

@@ -109,7 +109,7 @@ export class DriverHelper {
             try {
                 element = await this.driver.wait(until.elementLocated(elementLocator), polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.waitVisibility - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -269,7 +269,7 @@ export class DriverHelper {
             try {
                 element = await this.waitVisibility(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.waitAndClick - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -314,7 +314,7 @@ export class DriverHelper {
             try {
                 element = await this.waitVisibility(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.waitAndGetElementAttribute - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -357,7 +357,7 @@ export class DriverHelper {
             try {
                 element = await this.waitVisibility(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.waitAndGetCssValue - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -415,7 +415,7 @@ export class DriverHelper {
             try {
                 element = await this.waitVisibility(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.type - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -457,7 +457,7 @@ export class DriverHelper {
             try {
                 element = await this.waitPresence(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.typeToInvisible - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -499,7 +499,7 @@ export class DriverHelper {
             try {
                 element = await this.waitVisibility(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.clear - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -541,7 +541,7 @@ export class DriverHelper {
             try {
                 element = await this.waitPresence(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.clearInvisible - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -599,7 +599,7 @@ export class DriverHelper {
             try {
                 element = await this.waitVisibility(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.waitAndGetText - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }
@@ -702,7 +702,7 @@ export class DriverHelper {
             try {
                 element = await this.waitPresence(elementLocator, polling);
             } catch (err) {
-                if (i >= attempts) {
+                if (i >= attempts - 1) {
                     Logger.error(`DriverHelper.scrollTo - failed with exception, out of attempts - ${err}`);
                     throw err;
                 }