@redhat-developer/page-objects 1.18.1 → 1.19.1

package/out/components/bottomBar/AbstractViews.js

@@ -85,6 +85,17 @@ class TextView extends ChannelView {
             const textarea = await self.findElement(ChannelView.locators.BottomBarViews.textArea);
             await textarea.sendKeys(selenium_webdriver_1.Key.chord(TextView.ctlKey, 'a'));
             await textarea.sendKeys(selenium_webdriver_1.Key.chord(TextView.ctlKey, 'c'));
+            // Wait for clipboard operation to complete
+            // Fixes issue https://github.com/redhat-developer/vscode-extension-tester/issues/2214
+            await self.getWaitHelper().forCondition(async () => {
+                try {
+                    const currentClip = clipboard.readSync();
+                    return currentClip !== originalClipboard || currentClip.length > 0;
+                }
+                catch {
+                    return false;
+                }
+            }, { timeout: 2000, pollInterval: 50, message: 'Clipboard copy operation did not complete' });
             const text = clipboard.readSync();
             // workaround as we are getting "element click intercepted" during the send keys actions.
             // await textarea.click();

package/out/components/editor/TextEditor.d.ts

@@ -199,6 +199,13 @@ export declare class TextEditor extends Editor {
      * @param timeout
      */
     private waitForCursorPositionAtColumn;
+    /**
+     * (private) Find the position of text in the editor.
+     * @param text text to search for
+     * @param occurrence select which occurrence of the search text to look for in case there are multiple in the document
+     * @returns The (line, column) numbers in case the occurrence is found
+     */
+    private findTextOccurrence;
     /**
      * Get number of lines in the editor
      * @returns Promise resolving to number of lines

package/out/components/editor/TextEditor.js

@@ -223,19 +223,7 @@ class TextEditor extends Editor_1.Editor {
      * Returns the line number that holds the last occurrence found this way.
      */
     async getLineOfText(text, occurrence = 1) {
-        let lineNum = -1;
-        let found = 0;
-        const lines = (await this.getText()).split('\n');
-        for (let i = 0; i < lines.length; i++) {
-            if (lines[i].includes(text)) {
-                found++;
-                lineNum = i + 1;
-                if (found >= occurrence) {
-                    break;
-                }
-            }
-        }
-        return lineNum;
+        return (await this.findTextOccurrence(text, occurrence))[0];
     }
     /**
      * Find and select a given text. Not usable for multi line selection.
@@ -244,12 +232,10 @@ class TextEditor extends Editor_1.Editor {
      * @param occurrence specify which occurrence of text to select if multiple are present in the document
      */
     async selectText(text, occurrence = 1) {
-        const lineNum = await this.getLineOfText(text, occurrence);
+        const [lineNum, column] = await this.findTextOccurrence(text, occurrence);
         if (lineNum < 1) {
             throw new Error(`Text '${text}' not found`);
         }
-        const line = await this.getTextAtLine(lineNum);
-        const column = line.indexOf(text) + 1;
         await this.moveCursor(lineNum, column);
         let actions = this.getDriver().actions();
         await actions.clear();
@@ -492,6 +478,31 @@ class TextEditor extends Editor_1.Editor {
             return await this.isColumn(column);
         }, timeout, `Unable to set cursor at column ${column}`, 500);
     }
+    /**
+     * (private) Find the position of text in the editor.
+     * @param text text to search for
+     * @param occurrence select which occurrence of the search text to look for in case there are multiple in the document
+     * @returns The (line, column) numbers in case the occurrence is found
+     */
+    async findTextOccurrence(text, occurrence) {
+        let line = -1;
+        let column = -1;
+        let found = 0;
+        const lines = (await this.getText()).split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            let searchIndex = -1; // start at the beginning of the line
+            while ((searchIndex = lines[i].indexOf(text, searchIndex)) > -1) {
+                found++;
+                column = searchIndex + 1;
+                line = i + 1;
+                if (found >= occurrence) {
+                    return [line, column];
+                }
+                searchIndex += text.length;
+            }
+        }
+        return [line, column];
+    }
     /**
      * Get number of lines in the editor
      * @returns Promise resolving to number of lines

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redhat-developer/page-objects",
-  "version": "1.18.1",
+  "version": "1.19.1",
   "description": "Page Object API implementation for a VS Code editor used by ExTester framework.",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -37,7 +37,7 @@
     "ui-test"
   ],
   "dependencies": {
-    "clipboardy": "^5.0.2",
+    "clipboardy": "^5.3.1",
     "clone-deep": "^4.0.1",
     "compare-versions": "^6.1.1",
     "fs-extra": "^11.3.3",
@@ -47,5 +47,5 @@
     "selenium-webdriver": ">=4.6.1",
     "typescript": ">=4.6.2"
   },
-  "gitHead": "7bd4f3099cd173390a4e2e9af7a5a687c757ac8d"
+  "gitHead": "2348dcd72380e2b62591c3c589f81cd26ed7b76a"
 }