@redhat-developer/page-objects 1.4.0 → 1.5.0

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

@@ -228,6 +228,17 @@ export declare class TextEditor extends Editor {
      * @returns promise which resolves to either Breakpoint page object or undefined
      */
     getPausedBreakpoint(): Promise<Breakpoint | undefined>;
+    /**
+     * Get paused breakpoint on line if available. Otherwise, return undefined.
+     * @param line number of the line to retrieve
+     * @returns promise which resolves to either Breakpoint page object or undefined
+     */
+    getBreakpoint(line: number): Promise<Breakpoint | undefined>;
+    /**
+     * Get all breakpoints.
+     * @returns List of Breakpoints.
+     */
+    getBreakpoints(): Promise<Breakpoint[]>;
     /**
      * Get all code lenses within the editor
      * @returns list of CodeLens page objects

package/out/components/editor/TextEditor.js

@@ -379,7 +379,7 @@ class TextEditor extends Editor_1.Editor {
             }
             await inputArea.getDriver().actions().clear();
             await inputArea.sendKeys(lineKey);
-            await inputArea.getDriver().sleep(500);
+            await inputArea.getDriver().sleep(50);
         }
     }
     /**
@@ -398,7 +398,7 @@ class TextEditor extends Editor_1.Editor {
             }
             await inputArea.getDriver().actions().clear();
             await inputArea.sendKeys(columnKey);
-            await inputArea.getDriver().sleep(500);
+            await inputArea.getDriver().sleep(50);
             if ((await this.getCoordinates())[0] !== coordinates[0]) {
                 throw new Error(`Column number ${column} is not accessible on line ${coordinates[0]}`);
             }
@@ -568,6 +568,42 @@ class TextEditor extends Editor_1.Editor {
         }
         return new Breakpoint_1.Breakpoint(breakpoints[0], lineElement);
     }
+    /**
+     * Get paused breakpoint on line if available. Otherwise, return undefined.
+     * @param line number of the line to retrieve
+     * @returns promise which resolves to either Breakpoint page object or undefined
+     */
+    async getBreakpoint(line) {
+        const breakpoints = await this.getBreakpoints();
+        for (const breakpoint of breakpoints) {
+            if ((await breakpoint.getLineNumber()) === line) {
+                return breakpoint;
+            }
+        }
+        return undefined;
+    }
+    /**
+     * Get all breakpoints.
+     * @returns List of Breakpoints.
+     */
+    async getBreakpoints() {
+        const breakpoints = [];
+        const breakpointLocators = Breakpoint_1.Breakpoint.locators.TextEditor.breakpoint;
+        const breakpointContainer = TextEditor.versionInfo.version >= '1.80.0' ? await this.findElement(selenium_webdriver_1.By.className('glyph-margin-widgets')) : this;
+        const breakpointsSelectors = await breakpointContainer.findElements(breakpointLocators.generalSelector);
+        for (const breakpointSelector of breakpointsSelectors) {
+            let lineElement;
+            if (TextEditor.versionInfo.version >= '1.80.0') {
+                const styleTopAttr = await breakpointSelector.getCssValue('top');
+                lineElement = await this.findElement(TextEditor.locators.TextEditor.marginArea).findElement(selenium_webdriver_1.By.xpath(`.//div[contains(@style, "${styleTopAttr}")]`));
+            }
+            else {
+                lineElement = await breakpointSelector.findElement(selenium_webdriver_1.By.xpath('./..'));
+            }
+            breakpoints.push(new Breakpoint_1.Breakpoint(breakpointSelector, lineElement));
+        }
+        return breakpoints;
+    }
     /**
      * Get all code lenses within the editor
      * @returns list of CodeLens page objects

package/out/components/sidebar/scm/NewScmView.js

@@ -58,17 +58,31 @@ class SingleScmProvider extends ScmView_1.ScmProvider {
     }
     async takeAction(title) {
         const view = this.enclosingItem;
-        const titlePart = view.getTitlePart();
-        const elements = await titlePart.findElements(ScmView_1.ScmView.locators.ScmView.action);
+        let actions = [];
+        let names = [];
         const buttons = [];
-        for (const element of elements) {
-            const title = await element.getAttribute(ScmView_1.ScmView.locators.ScmView.actionLabel);
-            buttons.push(await new ViewTitlePart_1.TitleActionButton(ScmView_1.ScmView.locators.ScmView.actionConstructor(title), titlePart).wait());
+        if (ScmView_1.ScmProvider.versionInfo.version >= '1.93.0') {
+            const header = await view.findElement(selenium_webdriver_1.By.xpath(`.//div[@aria-label='Source Control Section']`));
+            actions = await header.findElements(ScmView_1.ScmProvider.locators.ScmView.action);
+            names = await Promise.all(actions.map(async (action) => await action.getAttribute(ScmView_1.ScmProvider.locators.ScmView.actionLabel)));
         }
-        const names = await Promise.all(buttons.map(async (button) => button.getTitle()));
-        const index = names.findIndex((name) => name === title);
+        else {
+            const titlePart = view.getTitlePart();
+            const elements = await titlePart.findElements(ScmView_1.ScmView.locators.ScmView.action);
+            for (const element of elements) {
+                const title = await element.getAttribute(ScmView_1.ScmView.locators.ScmView.actionLabel);
+                buttons.push(await new ViewTitlePart_1.TitleActionButton(ScmView_1.ScmView.locators.ScmView.actionConstructor(title), titlePart).wait());
+            }
+            names = await Promise.all(buttons.map(async (button) => button.getTitle()));
+        }
+        const index = names.findIndex((item) => item === title);
         if (index > -1) {
-            await buttons[index].click();
+            if (ScmView_1.ScmProvider.versionInfo.version >= '1.93.0') {
+                await actions[index].click();
+            }
+            else {
+                await buttons[index].click();
+            }
             return true;
         }
         return false;

package/out/locators/locators.js

@@ -24,7 +24,7 @@ exports.fromAttribute = fromAttribute;
 exports.fromText = fromText;
 function hasAttribute(attr, value, locator) {
     return async (el) => {
-        el = locator ? el.findElement(locator) : el;
+        el = locator ? await el.findElement(locator) : el;
         const attrValue = await el.getAttribute(attr);
         if (value === undefined) {
             return attrValue !== null;
@@ -34,7 +34,7 @@ function hasAttribute(attr, value, locator) {
 }
 function hasClass(classOrPredicate, locator) {
     return async (el) => {
-        el = locator ? el.findElement(locator) : el;
+        el = locator ? await el.findElement(locator) : el;
         const klasses = await el.getAttribute('class');
         const segments = klasses?.split(/\s+/g);
         const predicate = typeof classOrPredicate === 'string' ? (klass) => klass === classOrPredicate : classOrPredicate;
@@ -43,7 +43,7 @@ function hasClass(classOrPredicate, locator) {
 }
 function hasNotClass(klass, locator) {
     return async (el) => {
-        el = locator ? el.findElement(locator) : el;
+        el = locator ? await el.findElement(locator) : el;
         return !(await hasClass(klass).call(undefined, el));
     };
 }
@@ -54,14 +54,14 @@ function hasElement(locatorSelector) {
 }
 function fromAttribute(attribute, locator) {
     return async (el) => {
-        el = locator ? el.findElement(locator) : el;
-        return el.getAttribute(attribute);
+        el = locator ? await el.findElement(locator) : el;
+        return await el.getAttribute(attribute);
     };
 }
 function fromText(locator) {
     return async (el) => {
-        el = locator ? el.findElement(locator) : el;
-        return el.getText();
+        el = locator ? await el.findElement(locator) : el;
+        return await el.getText();
     };
 }
 //# sourceMappingURL=locators.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redhat-developer/page-objects",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Page Object API implementation for a VS Code editor used by ExTester framework.",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -40,11 +40,12 @@
     "clipboardy": "^4.0.0",
     "clone-deep": "^4.0.1",
     "compare-versions": "^6.1.1",
-    "fs-extra": "^11.2.0"
+    "fs-extra": "^11.2.0",
+    "type-fest": "^4.26.1"
   },
   "peerDependencies": {
     "selenium-webdriver": ">=4.6.1",
     "typescript": ">=4.6.2"
   },
-  "gitHead": "7a5b40f033471534c9afe131f3aacfe4911c0c87"
+  "gitHead": "1e2ae6db75e1f18fbc65cae5f4945200a9d93d8d"
 }