@serenity-js/protractor 3.0.0-rc.1 → 3.0.0-rc.5

package/CHANGELOG.md

@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-rc.5](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.4...v3.0.0-rc.5) (2022-01-07)
+
+
+### Features
+
+* **web:** support for advanced PageElement locator patterns ([c1ff8b7](https://github.com/serenity-js/serenity-js/commit/c1ff8b7539ebc1da8f79ea2b6d17bb01c42f443d)), closes [#1084](https://github.com/serenity-js/serenity-js/issues/1084)
+
+
+
+
+
+# [3.0.0-rc.4](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.3...v3.0.0-rc.4) (2021-12-30)
+
+**Note:** Version bump only for package @serenity-js/protractor
+
+
+
+
+
+# [3.0.0-rc.3](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.2...v3.0.0-rc.3) (2021-12-29)
+
+
+### Bug Fixes
+
+* **core:** refactored Mappable so that it's easier to implement filters ([176e0cd](https://github.com/serenity-js/serenity-js/commit/176e0cd0303d63271477b2b7a8e7b0572dda99a0)), closes [#1074](https://github.com/serenity-js/serenity-js/issues/1074)
+* **deps:** updated tiny-types to 1.17.0 ([3187051](https://github.com/serenity-js/serenity-js/commit/3187051594158b4b450c82e851e417fd2ed21652))
+* **web:** refactored Selector and NativeElementLocator classes to simplify the implementation ([f0c8f11](https://github.com/serenity-js/serenity-js/commit/f0c8f113433958877d36f13d0bc7f355ea68d280))
+
+
+### Features
+
+* **web:** isVisible checks if the element is in viewport and not hidden behind other elements ([429040f](https://github.com/serenity-js/serenity-js/commit/429040fb32b04cd4bc7524100635203fd8128eb6))
+* **web:** re-introduced PageElements.where DSL and universal By selectors ([39fe0a1](https://github.com/serenity-js/serenity-js/commit/39fe0a10edf7f652e93911159e4a4689c36d6876)), closes [#1081](https://github.com/serenity-js/serenity-js/issues/1081)
+
+
+
+
+
+# [3.0.0-rc.2](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.1...v3.0.0-rc.2) (2021-12-09)
+
+
+### Bug Fixes
+
+* **lerna:** corrected versions of internal deps ([582b922](https://github.com/serenity-js/serenity-js/commit/582b922dbade08e970cb796f15aca909f606c079))
+
+
+
+
+
 # [3.0.0-rc.1](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.0...v3.0.0-rc.1) (2021-12-09)
 
 **Note:** Version bump only for package @serenity-js/protractor

package/lib/screenplay/abilities/BrowseTheWebWithProtractor.d.ts

@@ -1,7 +1,8 @@
-import { Duration, UsesAbilities } from '@serenity-js/core';
-import { BrowserCapabilities, BrowseTheWeb, Cookie, CookieData, Key, ModalDialog, Page, PageElement, PageElements } from '@serenity-js/web';
-import { ProtractorBrowser } from 'protractor';
+import { Duration } from '@serenity-js/core';
+import { BrowserCapabilities, BrowseTheWeb, Cookie, CookieData, Key, ModalDialog, Page, PageElement } from '@serenity-js/web';
+import { ElementFinder, ProtractorBrowser } from 'protractor';
 import { Capabilities } from 'selenium-webdriver';
+import { ProtractorNativeElementRoot } from '../models/locators';
 /**
  * @desc
  *  An {@link @serenity-js/core/lib/screenplay~Ability} that enables the {@link Actor} to interact with web front-ends using {@link protractor}.
@@ -31,7 +32,7 @@ import { Capabilities } from 'selenium-webdriver';
  * @implements {@serenity-js/core/lib/screenplay~Ability}
  * @see {@link @serenity-js/core/lib/screenplay/actor~Actor}
  */
-export declare class BrowseTheWebWithProtractor extends BrowseTheWeb {
+export declare class BrowseTheWebWithProtractor extends BrowseTheWeb<ElementFinder, ProtractorNativeElementRoot> {
     protected browser: ProtractorBrowser;
     /**
      * @desc
@@ -41,15 +42,6 @@ export declare class BrowseTheWebWithProtractor extends BrowseTheWeb {
      * @returns {BrowseTheWebWithProtractor}
      */
     static using(browser: ProtractorBrowser): BrowseTheWebWithProtractor;
-    /**
-     * @desc
-     *  Used to access the Actor's ability to {@link BrowseTheWebWithProtractor} from within the {@link Interaction} classes,
-     *  such as {@link Navigate}.
-     *
-     * @param {UsesAbilities} actor
-     * @return {BrowseTheWebWithProtractor}
-     */
-    static as(actor: UsesAbilities): BrowseTheWebWithProtractor;
     /**
      * @private
      */
@@ -63,16 +55,6 @@ export declare class BrowseTheWebWithProtractor extends BrowseTheWeb {
     cookie(name: string): Promise<Cookie>;
     setCookie(cookieData: CookieData): Promise<void>;
     deleteAllCookies(): Promise<void>;
-    findByCss(selector: string): PageElement<any, any>;
-    findByCssContainingText(selector: string, text: string): PageElement<any, any>;
-    findById(selector: string): PageElement<any, any>;
-    findByTagName(selector: string): PageElement<any, any>;
-    findByXPath(selector: string): PageElement<any, any>;
-    findAllByCss(selector: string): PageElements<any, any, any>;
-    findAllByTagName(selector: string): PageElements<any, any, any>;
-    findAllByXPath(selector: string): PageElements<any, any, any>;
-    private find;
-    private findAll;
     navigateTo(destination: string): Promise<void>;
     navigateBack(): Promise<void>;
     navigateForward(): Promise<void>;

package/lib/screenplay/abilities/BrowseTheWebWithProtractor.js

@@ -5,6 +5,7 @@ const core_1 = require("@serenity-js/core");
 const web_1 = require("@serenity-js/web");
 const protractor_1 = require("protractor");
 const models_1 = require("../models");
+const locators_1 = require("../models/locators");
 const promised_1 = require("../promised");
 /**
  * @desc
@@ -41,7 +42,12 @@ class BrowseTheWebWithProtractor extends web_1.BrowseTheWeb {
      *  An instance of a protractor browser
      */
     constructor(browser) {
-        super();
+        super(new Map()
+            .set(web_1.ByCss, (selector) => locators_1.ProtractorLocator.createRootLocator(this.browser, selector, protractor_1.by.css(selector.value)))
+            .set(web_1.ByCssContainingText, (selector) => locators_1.ProtractorLocator.createRootLocator(this.browser, selector, protractor_1.by.cssContainingText(selector.value, selector.text)))
+            .set(web_1.ById, (selector) => locators_1.ProtractorLocator.createRootLocator(this.browser, selector, protractor_1.by.id(selector.value)))
+            .set(web_1.ByTagName, (selector) => locators_1.ProtractorLocator.createRootLocator(this.browser, selector, protractor_1.by.tagName(selector.value)))
+            .set(web_1.ByXPath, (selector) => locators_1.ProtractorLocator.createRootLocator(this.browser, selector, protractor_1.by.xpath(selector.value))));
         this.browser = browser;
     }
     /**
@@ -54,17 +60,6 @@ class BrowseTheWebWithProtractor extends web_1.BrowseTheWeb {
     static using(browser) {
         return new BrowseTheWebWithProtractor(browser);
     }
-    /**
-     * @desc
-     *  Used to access the Actor's ability to {@link BrowseTheWebWithProtractor} from within the {@link Interaction} classes,
-     *  such as {@link Navigate}.
-     *
-     * @param {UsesAbilities} actor
-     * @return {BrowseTheWebWithProtractor}
-     */
-    static as(actor) {
-        return actor.abilityTo(BrowseTheWebWithProtractor);
-    }
     async browserCapabilities() {
         const capabilities = await (0, promised_1.promised)(this.browser.getCapabilities());
         return {
@@ -92,42 +87,6 @@ class BrowseTheWebWithProtractor extends web_1.BrowseTheWeb {
     deleteAllCookies() {
         return (0, promised_1.promised)(this.browser.manage().deleteAllCookies());
     }
-    findByCss(selector) {
-        return this.find(root => root.element(protractor_1.by.css(selector)));
-    }
-    findByCssContainingText(selector, text) {
-        return this.find(root => root.element(protractor_1.by.cssContainingText(selector, text)));
-    }
-    findById(selector) {
-        return this.find(root => root.element(protractor_1.by.id(selector)));
-    }
-    findByTagName(selector) {
-        return this.find(root => root.element(protractor_1.by.tagName(selector)));
-    }
-    findByXPath(selector) {
-        return this.find(root => root.element(protractor_1.by.xpath(selector)));
-    }
-    findAllByCss(selector) {
-        return this.findAll(root => root.all(protractor_1.by.css(selector)));
-    }
-    findAllByTagName(selector) {
-        return this.findAll(root => root.all(protractor_1.by.tagName(selector)));
-    }
-    findAllByXPath(selector) {
-        return this.findAll(root => root.all(protractor_1.by.xpath(selector)));
-    }
-    find(locator) {
-        return new models_1.ProtractorPageElement(() => ({
-            element: this.browser.element.bind(this.browser),
-            all: this.browser.element.all.bind(this.browser),
-        }), locator);
-    }
-    findAll(locator) {
-        return new models_1.ProtractorPageElements(() => ({
-            element: this.browser.element.bind(this.browser),
-            all: this.browser.element.all.bind(this.browser),
-        }), locator);
-    }
     navigateTo(destination) {
         return (0, promised_1.promised)(this.browser.get(destination));
     }

package/lib/screenplay/abilities/BrowseTheWebWithProtractor.js.map

@@ -1 +1 @@
-{"version":3,"file":"BrowseTheWebWithProtractor.js","sourceRoot":"","sources":["../../../src/screenplay/abilities/BrowseTheWebWithProtractor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BrowseTheWebWithProtractor.js","sourceRoot":"","sources":["../../../src/screenplay/abilities/BrowseTheWebWithProtractor.ts"],"names":[],"mappings":"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"}

package/lib/screenplay/interactions/UseAngular.js

@@ -52,7 +52,7 @@ class UseAngular {
      * @returns {@serenity-js/core/lib/screenplay~Interaction}
      */
     static disableSynchronisation() {
-        return core_1.Interaction.where(`#actor disables synchronisation with Angular`, actor => abilities_1.BrowseTheWebWithProtractor.as(actor).enableAngularSynchronisation(false).then(() => void 0));
+        return core_1.Interaction.where(`#actor disables synchronisation with Angular`, actor => actor.abilityTo(abilities_1.BrowseTheWebWithProtractor).enableAngularSynchronisation(false).then(() => void 0));
     }
     /**
      * @desc
@@ -62,7 +62,7 @@ class UseAngular {
      * @returns {@serenity-js/core/lib/screenplay~Interaction}
      */
     static enableSynchronisation() {
-        return core_1.Interaction.where(`#actor enables synchronisation with Angular`, actor => abilities_1.BrowseTheWebWithProtractor.as(actor).enableAngularSynchronisation(true).then(() => void 0));
+        return core_1.Interaction.where(`#actor enables synchronisation with Angular`, actor => actor.abilityTo(abilities_1.BrowseTheWebWithProtractor).enableAngularSynchronisation(true).then(() => void 0));
     }
 }
 exports.UseAngular = UseAngular;

package/lib/screenplay/interactions/UseAngular.js.map

@@ -1 +1 @@
-{"version":3,"file":"UseAngular.js","sourceRoot":"","sources":["../../../src/screenplay/interactions/UseAngular.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAEhD,4CAA0D;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAa,UAAU;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,sBAAsB;QACzB,OAAO,kBAAW,CAAC,KAAK,CAAC,8CAA8C,EAAE,KAAK,CAAC,EAAE,CAC7E,sCAA0B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrG,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB;QACxB,OAAO,kBAAW,CAAC,KAAK,CAAC,6CAA6C,EAAE,KAAK,CAAC,EAAE,CAC5E,sCAA0B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACpG,CAAC;CACJ;AAzBD,gCAyBC"}
+{"version":3,"file":"UseAngular.js","sourceRoot":"","sources":["../../../src/screenplay/interactions/UseAngular.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAEhD,4CAA0D;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAa,UAAU;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,sBAAsB;QACzB,OAAO,kBAAW,CAAC,KAAK,CAAC,8CAA8C,EAAE,KAAK,CAAC,EAAE,CAC5E,KAAK,CAAC,SAAS,CAAC,sCAA0B,CAAgC,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5I,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB;QACxB,OAAO,kBAAW,CAAC,KAAK,CAAC,6CAA6C,EAAE,KAAK,CAAC,EAAE,CAC3E,KAAK,CAAC,SAAS,CAAC,sCAA0B,CAAgC,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3I,CAAC;CACJ;AAzBD,gCAyBC"}

package/lib/screenplay/models/ProtractorPageElement.d.ts

@@ -1,9 +1,7 @@
 import { PageElement } from '@serenity-js/web';
 import { ElementFinder } from 'protractor';
-import { ProtractorNativeElementRoot } from './ProtractorNativeElementRoot';
-export declare class ProtractorPageElement extends PageElement<ProtractorNativeElementRoot, ElementFinder> {
-    constructor(context: () => Promise<ProtractorNativeElementRoot> | ProtractorNativeElementRoot, locator: (root: ProtractorNativeElementRoot) => Promise<ElementFinder> | ElementFinder);
-    of(parent: ProtractorPageElement): PageElement<ProtractorNativeElementRoot, ElementFinder>;
+export declare class ProtractorPageElement extends PageElement<ElementFinder> {
+    of(parent: ProtractorPageElement): PageElement<ElementFinder>;
     clearValue(): Promise<void>;
     click(): Promise<void>;
     doubleClick(): Promise<void>;
@@ -16,8 +14,8 @@ export declare class ProtractorPageElement extends PageElement<ProtractorNativeE
     value(): Promise<string>;
     isActive(): Promise<boolean>;
     isClickable(): Promise<boolean>;
-    isDisplayed(): Promise<boolean>;
     isEnabled(): Promise<boolean>;
     isPresent(): Promise<boolean>;
     isSelected(): Promise<boolean>;
+    isVisible(): Promise<boolean>;
 }

package/lib/screenplay/models/ProtractorPageElement.js

@@ -4,15 +4,9 @@ exports.ProtractorPageElement = void 0;
 const web_1 = require("@serenity-js/web");
 const protractor_1 = require("protractor");
 const promised_1 = require("../promised");
-const promisedWebElement_1 = require("../promisedWebElement");
 class ProtractorPageElement extends web_1.PageElement {
-    constructor(context, locator) {
-        super(context, context => {
-            return (0, promisedWebElement_1.promisedWebElement)(locator(context));
-        });
-    }
     of(parent) {
-        return new ProtractorPageElement(() => parent.nativeElement(), this.locator);
+        return new ProtractorPageElement(this.locator.of(parent.locator));
     }
     async clearValue() {
         function removeCharactersFrom(elf, numberOfCharacters) {
@@ -91,10 +85,6 @@ class ProtractorPageElement extends web_1.PageElement {
     async isClickable() {
         return this.isEnabled();
     }
-    async isDisplayed() {
-        const element = await this.nativeElement();
-        return element.isDisplayed();
-    }
     async isEnabled() {
         const element = await this.nativeElement();
         return element.isEnabled();
@@ -107,6 +97,33 @@ class ProtractorPageElement extends web_1.PageElement {
         const element = await this.nativeElement();
         return element.isSelected();
     }
+    async isVisible() {
+        const element = await this.nativeElement();
+        if (!await element.isDisplayed()) {
+            return false;
+        }
+        const webElement = await element.getWebElement();
+        // get element at cx/cy and see if the element we found is our element, and therefore it's visible.
+        return (0, promised_1.promised)(webElement.getDriver().executeScript(`
+            var  elem = arguments[0];
+            
+            if (! elem.getBoundingClientRect) {
+                return false;
+            }
+            
+            var
+                box = elem.getBoundingClientRect(),
+                cx = box.left + box.width / 2,
+                cy = box.top + box.height / 2,
+                e = document.elementFromPoint(cx, cy);
+            
+            for (; e; e = e.parentElement) {
+                if (e === elem)
+                    return true;
+            }
+            return false;
+            `, webElement));
+    }
 }
 exports.ProtractorPageElement = ProtractorPageElement;
 //# sourceMappingURL=ProtractorPageElement.js.map

package/lib/screenplay/models/ProtractorPageElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProtractorPageElement.js","sourceRoot":"","sources":["../../../src/screenplay/models/ProtractorPageElement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProtractorPageElement.js","sourceRoot":"","sources":["../../../src/screenplay/models/ProtractorPageElement.ts"],"names":[],"mappings":"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"}

package/lib/screenplay/models/index.d.ts

@@ -1,6 +1,4 @@
 export * from './ProtractorCookie';
 export * from './ProtractorModalDialog';
-export * from './ProtractorNativeElementRoot';
 export * from './ProtractorPage';
 export * from './ProtractorPageElement';
-export * from './ProtractorPageElements';

package/lib/screenplay/models/index.js

@@ -12,8 +12,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ProtractorCookie"), exports);
 __exportStar(require("./ProtractorModalDialog"), exports);
-__exportStar(require("./ProtractorNativeElementRoot"), exports);
 __exportStar(require("./ProtractorPage"), exports);
 __exportStar(require("./ProtractorPageElement"), exports);
-__exportStar(require("./ProtractorPageElements"), exports);
 //# sourceMappingURL=index.js.map

package/lib/screenplay/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAmC;AACnC,0DAAwC;AACxC,gEAA8C;AAC9C,mDAAiC;AACjC,0DAAwC;AACxC,2DAAyC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAmC;AACnC,0DAAwC;AACxC,mDAAiC;AACjC,0DAAwC"}

package/lib/screenplay/models/locators/ProtractorLocator.d.ts

@@ -0,0 +1,9 @@
+import { Locator, PageElement, Selector } from '@serenity-js/web';
+import { ElementFinder, Locator as ProtractorNativeLocator, ProtractorBrowser } from 'protractor';
+import { ProtractorNativeElementRoot } from './ProtractorNativeElementRoot';
+export declare class ProtractorLocator<Selector_Type extends Selector> extends Locator<ElementFinder, ProtractorNativeElementRoot, Selector_Type> {
+    static createRootLocator<ST extends Selector>(browser: ProtractorBrowser, selector: ST, protractorBy: ProtractorNativeLocator): ProtractorLocator<ST>;
+    of(parent: ProtractorLocator<unknown>): Locator<ElementFinder, ProtractorNativeElementRoot, Selector_Type>;
+    element(): PageElement<ElementFinder>;
+    allElements(): Promise<Array<PageElement<ElementFinder>>>;
+}

package/lib/screenplay/models/locators/ProtractorLocator.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtractorLocator = void 0;
+const web_1 = require("@serenity-js/web");
+const unpromisedWebElement_1 = require("../../unpromisedWebElement");
+const ProtractorPageElement_1 = require("../ProtractorPageElement");
+class ProtractorLocator extends web_1.Locator {
+    static createRootLocator(browser, selector, protractorBy) {
+        const parentRoot = {
+            element: browser.element.bind(browser),
+            all: browser.element.all.bind(browser),
+        };
+        return new ProtractorLocator(() => parentRoot, selector, (root) => (0, unpromisedWebElement_1.unpromisedWebElement)(root.element(protractorBy)), async (root) => root.all(protractorBy));
+    }
+    of(parent) {
+        return new ProtractorLocator(() => parent.nativeElement(), this.selector, (parentRoot) => this.locateElement(parentRoot), (parentRoot) => this.locateAllElements(parentRoot));
+    }
+    element() {
+        return new ProtractorPageElement_1.ProtractorPageElement(this);
+    }
+    async allElements() {
+        const parentRoot = await this.parentRoot();
+        const elements = await this.locateAllElements(parentRoot);
+        return Promise.all(elements.map(childElement => new ProtractorPageElement_1.ProtractorPageElement(new ProtractorLocator(this.parentRoot, this.selector, () => (0, unpromisedWebElement_1.unpromisedWebElement)(childElement), () => [(0, unpromisedWebElement_1.unpromisedWebElement)(childElement)]))));
+    }
+}
+exports.ProtractorLocator = ProtractorLocator;
+//# sourceMappingURL=ProtractorLocator.js.map

package/lib/screenplay/models/locators/ProtractorLocator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProtractorLocator.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/ProtractorLocator.ts"],"names":[],"mappings":";;;AAAA,0CAAkE;AAGlE,qEAAkE;AAClE,oEAAiE;AAGjE,MAAa,iBAAkD,SAAQ,aAAkE;IAErI,MAAM,CAAC,iBAAiB,CAAsB,OAA0B,EAAE,QAAY,EAAE,YAAqC;QACzH,MAAM,UAAU,GAAgC;YAC5C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;YACtC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;SACzC,CAAA;QAED,OAAO,IAAI,iBAAiB,CACxB,GAAG,EAAE,CAAC,UAAU,EAChB,QAAQ,EACR,CAAC,IAAiC,EAAE,EAAE,CAAC,IAAA,2CAAoB,EAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EACvF,KAAK,EAAE,IAAiC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CACtE,CAAC;IACN,CAAC;IAED,EAAE,CAAC,MAAkC;QACjC,OAAO,IAAI,iBAAiB,CACxB,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,EAC5B,IAAI,CAAC,QAAQ,EACb,CAAC,UAAuC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAC3E,CAAC,UAAuC,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAClF,CAAC;IACN,CAAC;IAED,OAAO;QACH,OAAO,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW;QACb,MAAM,UAAU,GAAM,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QAC7C,MAAM,QAAQ,GAAQ,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAE/D,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAC3C,IAAI,6CAAqB,CAAC,IAAI,iBAAiB,CAC3C,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,QAAQ,EACb,GAAG,EAAE,CAAC,IAAA,2CAAoB,EAAC,YAAY,CAAC,EACxC,GAAG,EAAE,CAAC,CAAE,IAAA,2CAAoB,EAAC,YAAY,CAAC,CAAE,CAC/C,CAAC,CACL,CAAC,CAAC;IACP,CAAC;CACJ;AA1CD,8CA0CC"}

package/lib/screenplay/models/{ProtractorNativeElementRoot.d.ts → locators/ProtractorNativeElementRoot.d.ts}

@@ -1,5 +1,5 @@
 import { ElementArrayFinder, ElementFinder, Locator } from 'protractor';
 export interface ProtractorNativeElementRoot {
-    element: (selector: Locator) => ElementFinder;
-    all: (selector: Locator) => ElementArrayFinder;
+    element(selector: Locator): ElementFinder;
+    all(selector: Locator): ElementArrayFinder;
 }

package/lib/screenplay/models/locators/ProtractorNativeElementRoot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProtractorNativeElementRoot.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/ProtractorNativeElementRoot.ts"],"names":[],"mappings":""}

package/lib/screenplay/models/locators/index.d.ts

@@ -0,0 +1,2 @@
+export * from './ProtractorLocator';
+export * from './ProtractorNativeElementRoot';

package/lib/screenplay/models/locators/index.js

@@ -0,0 +1,15 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ProtractorLocator"), exports);
+__exportStar(require("./ProtractorNativeElementRoot"), exports);
+//# sourceMappingURL=index.js.map

package/lib/screenplay/models/locators/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/screenplay/models/locators/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAoC;AACpC,gEAA8C"}

package/lib/screenplay/questions/ProtractorParam.js

@@ -64,7 +64,7 @@ class ProtractorParam {
     static called(name) {
         return core_1.Question.about((0, io_1.formatted) `the ${name} param specified in Protractor config`, actor => {
             return actor.answer(name)
-                .then(name => abilities_1.BrowseTheWebWithProtractor.as(actor).param(name));
+                .then(name => actor.abilityTo(abilities_1.BrowseTheWebWithProtractor).param(name));
         });
     }
 }

package/lib/screenplay/questions/ProtractorParam.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProtractorParam.js","sourceRoot":"","sources":["../../../src/screenplay/questions/ProtractorParam.ts"],"names":[],"mappings":";;;AAAA,kDAAkD;AAClD,4CAAkE;AAClE,iDAAqD;AAErD,4CAA0D;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,MAAa,eAAe;IAExB;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,CAAI,IAAwB;QACrC,OAAO,eAAQ,CAAC,KAAK,CAAa,IAAA,cAAS,EAAC,OAAQ,IAAK,uCAAuC,EAAE,KAAK,CAAC,EAAE;YACtG,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;iBACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,sCAA0B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAhBD,0CAgBC"}
+{"version":3,"file":"ProtractorParam.js","sourceRoot":"","sources":["../../../src/screenplay/questions/ProtractorParam.ts"],"names":[],"mappings":";;;AAAA,kDAAkD;AAClD,4CAAkE;AAClE,iDAAqD;AAErD,4CAA0D;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,MAAa,eAAe;IAExB;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,CAAI,IAAwB;QACrC,OAAO,eAAQ,CAAC,KAAK,CAAa,IAAA,cAAS,EAAC,OAAQ,IAAK,uCAAuC,EAAE,KAAK,CAAC,EAAE;YACtG,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;iBACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAE,KAAK,CAAC,SAAS,CAAC,sCAA0B,CAAgC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/G,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAhBD,0CAgBC"}

package/lib/screenplay/{promisedWebElement.d.ts → unpromisedWebElement.d.ts}

@@ -8,4 +8,4 @@ import { WebElement } from 'protractor';
  * @param promiseLike
  * @returns {Promise<T>}
  */
-export declare function promisedWebElement<T extends WebElement>(promiseLike: PromiseLike<T> | T): Promise<T>;
+export declare function unpromisedWebElement<T extends WebElement>(promiseLike: T): T;

package/lib/screenplay/{promisedWebElement.js → unpromisedWebElement.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promisedWebElement = void 0;
+exports.unpromisedWebElement = void 0;
 /**
  * @desc
  *  Wraps Webdriver then-ables into a Node-native promise to allow for correct promise chaining.
@@ -10,18 +10,15 @@ exports.promisedWebElement = void 0;
  * @param promiseLike
  * @returns {Promise<T>}
  */
-function promisedWebElement(promiseLike) {
-    if (promiseLike instanceof Promise) {
-        return promiseLike;
-    }
-    return Promise.resolve(new Proxy(promiseLike, {
+function unpromisedWebElement(promiseLike) {
+    return new Proxy(promiseLike, {
         has: (target, property) => property !== 'then',
         ownKeys: (target) => Reflect.ownKeys(target)
             .filter(property => property !== 'then'),
         get: (target, property, receiver) => (property in receiver)
             ? target[property]
             : undefined,
-    }));
+    });
 }
-exports.promisedWebElement = promisedWebElement;
-//# sourceMappingURL=promisedWebElement.js.map
+exports.unpromisedWebElement = unpromisedWebElement;
+//# sourceMappingURL=unpromisedWebElement.js.map

package/lib/screenplay/unpromisedWebElement.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unpromisedWebElement.js","sourceRoot":"","sources":["../../src/screenplay/unpromisedWebElement.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;GAQG;AACH,SAAgB,oBAAoB,CAAuB,WAAc;IAErE,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE;QAC1B,GAAG,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CACtB,QAAQ,KAAK,MAAM;QACvB,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAChB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;aAClB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,MAAM,CAAC;QAChD,GAAG,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAChC,CAAC,QAAQ,IAAI,QAAQ,CAAC;YAClB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;YAClB,CAAC,CAAC,SAAS;KACtB,CAAC,CAAC;AACP,CAAC;AAbD,oDAaC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/protractor",
-  "version": "3.0.0-rc.1",
+  "version": "3.0.0-rc.5",
   "description": "Test your web apps with Serenity/JS",
   "author": {
     "name": "Jan Molak",
@@ -50,16 +50,16 @@
     "npm": "^6 || ^7 || ^8"
   },
   "dependencies": {
-    "@serenity-js/assertions": "3.0.0-rc.1",
-    "@serenity-js/core": "3.0.0-rc.1",
+    "@serenity-js/assertions": "3.0.0-rc.5",
+    "@serenity-js/core": "3.0.0-rc.5",
     "deepmerge": "^4.2.2",
     "is-plain-object": "^5.0.0",
-    "tiny-types": "^1.16.1"
+    "tiny-types": "^1.17.0"
   },
   "peerDependencies": {
-    "@serenity-js/cucumber": "^3.0.0-rc.0",
-    "@serenity-js/jasmine": "^3.0.0-rc.0",
-    "@serenity-js/mocha": "^3.0.0-rc.0",
+    "@serenity-js/cucumber": "^3.0.0-rc",
+    "@serenity-js/jasmine": "^3.0.0-rc",
+    "@serenity-js/mocha": "^3.0.0-rc",
     "protractor": "^5.0.0 || ^7.0.0",
     "selenium-webdriver": "^3.6.0"
   },
@@ -77,12 +77,12 @@
   "devDependencies": {
     "@documentation/esdoc-template": "3.0.0",
     "@integration/testing-tools": "3.0.0",
-    "@serenity-js/cucumber": "3.0.0-rc.1",
-    "@serenity-js/jasmine": "3.0.0-rc.1",
-    "@serenity-js/local-server": "3.0.0-rc.1",
-    "@serenity-js/mocha": "3.0.0-rc.1",
-    "@serenity-js/rest": "3.0.0-rc.1",
-    "@serenity-js/web": "3.0.0-rc.1",
+    "@serenity-js/cucumber": "3.0.0-rc.5",
+    "@serenity-js/jasmine": "3.0.0-rc.5",
+    "@serenity-js/local-server": "3.0.0-rc.5",
+    "@serenity-js/mocha": "3.0.0-rc.5",
+    "@serenity-js/rest": "3.0.0-rc.5",
+    "@serenity-js/web": "3.0.0-rc.5",
     "@types/chai": "^4.3.0",
     "@types/express": "^4.17.13",
     "@types/html-minifier": "^4.0.1",
@@ -122,5 +122,5 @@
     "cache": true,
     "all": true
   },
-  "gitHead": "ceed4ad3a2375c14b0546a6fc2fe3e816250f746"
+  "gitHead": "b63bb1465731d922fde0ade3b77ddebb96dbf990"
 }

package/src/screenplay/abilities/BrowseTheWebWithProtractor.ts

@@ -1,9 +1,10 @@
-import { ConfigurationError, Duration, LogicError, UsesAbilities } from '@serenity-js/core';
-import { BrowserCapabilities, BrowseTheWeb, Cookie, CookieData, Key, ModalDialog, Page, PageElement, PageElements } from '@serenity-js/web';
-import { by, ElementArrayFinder, ElementFinder, ProtractorBrowser, WebElementPromise } from 'protractor';
+import { ConfigurationError, Duration, LogicError } from '@serenity-js/core';
+import { BrowserCapabilities, BrowseTheWeb, ByCss, ByCssContainingText, ById, ByTagName, ByXPath, Cookie, CookieData, Key, ModalDialog, Page, PageElement } from '@serenity-js/web';
+import { by, ElementFinder, ProtractorBrowser, WebElementPromise } from 'protractor';
 import { Capabilities } from 'selenium-webdriver';
 
-import { ProtractorCookie, ProtractorModalDialog, ProtractorNativeElementRoot, ProtractorPage, ProtractorPageElement, ProtractorPageElements } from '../models';
+import { ProtractorCookie, ProtractorModalDialog, ProtractorPage, ProtractorPageElement } from '../models';
+import { ProtractorLocator, ProtractorNativeElementRoot } from '../models/locators';
 import { promised } from '../promised';
 
 /**
@@ -35,7 +36,7 @@ import { promised } from '../promised';
  * @implements {@serenity-js/core/lib/screenplay~Ability}
  * @see {@link @serenity-js/core/lib/screenplay/actor~Actor}
  */
-export class BrowseTheWebWithProtractor extends BrowseTheWeb {
+export class BrowseTheWebWithProtractor extends BrowseTheWeb<ElementFinder, ProtractorNativeElementRoot> {
 
     /**
      * @desc
@@ -48,18 +49,6 @@ export class BrowseTheWebWithProtractor extends BrowseTheWeb {
         return new BrowseTheWebWithProtractor(browser);
     }
 
-    /**
-     * @desc
-     *  Used to access the Actor's ability to {@link BrowseTheWebWithProtractor} from within the {@link Interaction} classes,
-     *  such as {@link Navigate}.
-     *
-     * @param {UsesAbilities} actor
-     * @return {BrowseTheWebWithProtractor}
-     */
-    static as(actor: UsesAbilities): BrowseTheWebWithProtractor {
-        return actor.abilityTo(BrowseTheWebWithProtractor);
-    }
-
     /**
      * @private
      */
@@ -70,7 +59,13 @@ export class BrowseTheWebWithProtractor extends BrowseTheWeb {
      *  An instance of a protractor browser
      */
     constructor(protected browser: ProtractorBrowser) {
-        super();
+        super(new Map()
+            .set(ByCss,                 (selector: ByCss)               => ProtractorLocator.createRootLocator(this.browser, selector, by.css(selector.value)))
+            .set(ByCssContainingText,   (selector: ByCssContainingText) => ProtractorLocator.createRootLocator(this.browser, selector, by.cssContainingText(selector.value, selector.text)))
+            .set(ById,                  (selector: ById)                => ProtractorLocator.createRootLocator(this.browser, selector, by.id(selector.value)))
+            .set(ByTagName,             (selector: ByTagName)           => ProtractorLocator.createRootLocator(this.browser, selector, by.tagName(selector.value)))
+            .set(ByXPath,               (selector: ByXPath)             => ProtractorLocator.createRootLocator(this.browser, selector, by.xpath(selector.value)))
+        );
     }
 
     async browserCapabilities(): Promise<BrowserCapabilities> {
@@ -105,58 +100,6 @@ export class BrowseTheWebWithProtractor extends BrowseTheWeb {
         return promised(this.browser.manage().deleteAllCookies());
     }
 
-    findByCss(selector: string): PageElement<any, any> {
-        return this.find(root => root.element(by.css(selector)));
-    }
-
-    findByCssContainingText(selector: string, text: string): PageElement<any, any> {
-        return this.find(root => root.element(by.cssContainingText(selector, text)));
-    }
-
-    findById(selector: string): PageElement<any, any> {
-        return this.find(root => root.element(by.id(selector)));
-    }
-
-    findByTagName(selector: string): PageElement<any, any> {
-        return this.find(root => root.element(by.tagName(selector)));
-    }
-
-    findByXPath(selector: string): PageElement<any, any> {
-        return this.find(root => root.element(by.xpath(selector)));
-    }
-
-    findAllByCss(selector: string): PageElements<any, any, any> {
-        return this.findAll(root => root.all(by.css(selector)));
-    }
-
-    findAllByTagName(selector: string): PageElements<any, any, any> {
-        return this.findAll(root => root.all(by.tagName(selector)));
-    }
-
-    findAllByXPath(selector: string): PageElements<any, any, any> {
-        return this.findAll(root => root.all(by.xpath(selector)));
-    }
-
-    private find(locator: (root: ProtractorNativeElementRoot) => Promise<ElementFinder> | ElementFinder): ProtractorPageElement {
-        return new ProtractorPageElement(
-            () => ({
-                element: this.browser.element.bind(this.browser),
-                all: this.browser.element.all.bind(this.browser),
-            }),
-            locator,
-        );
-    }
-
-    private findAll(locator: (root: ProtractorNativeElementRoot) => Promise<ElementArrayFinder> | ElementArrayFinder): ProtractorPageElements {
-        return new ProtractorPageElements(
-            () => ({
-                element: this.browser.element.bind(this.browser),
-                all: this.browser.element.all.bind(this.browser),
-            }),
-            locator,
-        );
-    }
-
     navigateTo(destination: string): Promise<void> {
         return promised(this.browser.get(destination));
     }

package/src/screenplay/interactions/UseAngular.ts

@@ -53,7 +53,7 @@ export class UseAngular {
      */
     static disableSynchronisation(): Interaction {
         return Interaction.where(`#actor disables synchronisation with Angular`, actor =>
-            BrowseTheWebWithProtractor.as(actor).enableAngularSynchronisation(false).then(() => void 0));
+            (actor.abilityTo(BrowseTheWebWithProtractor) as BrowseTheWebWithProtractor).enableAngularSynchronisation(false).then(() => void 0));
     }
 
     /**
@@ -65,6 +65,6 @@ export class UseAngular {
      */
     static enableSynchronisation(): Interaction {
         return Interaction.where(`#actor enables synchronisation with Angular`, actor =>
-            BrowseTheWebWithProtractor.as(actor).enableAngularSynchronisation(true).then(() => void 0));
+            (actor.abilityTo(BrowseTheWebWithProtractor) as BrowseTheWebWithProtractor).enableAngularSynchronisation(true).then(() => void 0));
     }
 }

package/src/screenplay/models/ProtractorPageElement.ts

@@ -3,23 +3,12 @@ import { ElementFinder, protractor } from 'protractor';
 import { WebElement } from 'selenium-webdriver';
 
 import { promised } from '../promised';
-import { promisedWebElement } from '../promisedWebElement';
-import { ProtractorNativeElementRoot } from './ProtractorNativeElementRoot';
 
 export class ProtractorPageElement
-    extends PageElement<ProtractorNativeElementRoot, ElementFinder>
+    extends PageElement<ElementFinder>
 {
-    constructor(
-        context: () => Promise<ProtractorNativeElementRoot> | ProtractorNativeElementRoot,
-        locator: (root: ProtractorNativeElementRoot) => Promise<ElementFinder> | ElementFinder
-    ) {
-        super(context, context => {
-            return promisedWebElement<ElementFinder>(locator(context));
-        });
-    }
-
-    of(parent: ProtractorPageElement): PageElement<ProtractorNativeElementRoot, ElementFinder> {
-        return new ProtractorPageElement(() => parent.nativeElement(), this.locator);
+    of(parent: ProtractorPageElement): PageElement<ElementFinder> {
+        return new ProtractorPageElement(this.locator.of(parent.locator));
     }
 
     async clearValue(): Promise<void> {
@@ -141,12 +130,6 @@ export class ProtractorPageElement
         return this.isEnabled();
     }
 
-    async isDisplayed(): Promise<boolean> {
-        const element: ElementFinder = await this.nativeElement();
-
-        return element.isDisplayed();
-    }
-
     async isEnabled(): Promise<boolean> {
         const element: ElementFinder = await this.nativeElement();
 
@@ -164,4 +147,38 @@ export class ProtractorPageElement
 
         return element.isSelected();
     }
+
+    async isVisible(): Promise<boolean> {
+        const element: ElementFinder = await this.nativeElement();
+
+        if (! await element.isDisplayed()) {
+            return false;
+        }
+
+        const webElement: WebElement = await element.getWebElement();
+
+        // get element at cx/cy and see if the element we found is our element, and therefore it's visible.
+        return promised(webElement.getDriver().executeScript(
+            `
+            var  elem = arguments[0];
+            
+            if (! elem.getBoundingClientRect) {
+                return false;
+            }
+            
+            var
+                box = elem.getBoundingClientRect(),
+                cx = box.left + box.width / 2,
+                cy = box.top + box.height / 2,
+                e = document.elementFromPoint(cx, cy);
+            
+            for (; e; e = e.parentElement) {
+                if (e === elem)
+                    return true;
+            }
+            return false;
+            `,
+            webElement,
+        ));
+    }
 }

package/src/screenplay/models/index.ts

@@ -1,7 +1,5 @@
 export * from './ProtractorCookie';
 export * from './ProtractorModalDialog';
-export * from './ProtractorNativeElementRoot';
 export * from './ProtractorPage';
 export * from './ProtractorPageElement';
-export * from './ProtractorPageElements';
 

package/src/screenplay/models/locators/ProtractorLocator.ts

@@ -0,0 +1,50 @@
+import { Locator, PageElement, Selector } from '@serenity-js/web';
+import { ElementFinder, Locator as ProtractorNativeLocator, ProtractorBrowser } from 'protractor';
+
+import { unpromisedWebElement } from '../../unpromisedWebElement';
+import { ProtractorPageElement } from '../ProtractorPageElement';
+import { ProtractorNativeElementRoot } from './ProtractorNativeElementRoot';
+
+export class ProtractorLocator<Selector_Type extends Selector> extends Locator<ElementFinder, ProtractorNativeElementRoot, Selector_Type> {
+
+    static createRootLocator<ST extends Selector>(browser: ProtractorBrowser, selector: ST, protractorBy: ProtractorNativeLocator): ProtractorLocator<ST> {
+        const parentRoot: ProtractorNativeElementRoot = {
+            element: browser.element.bind(browser),
+            all: browser.element.all.bind(browser),
+        }
+
+        return new ProtractorLocator(
+            () => parentRoot,
+            selector,
+            (root: ProtractorNativeElementRoot) => unpromisedWebElement(root.element(protractorBy)),
+            async (root: ProtractorNativeElementRoot) => root.all(protractorBy)
+        );
+    }
+
+    of(parent: ProtractorLocator<unknown>): Locator<ElementFinder, ProtractorNativeElementRoot, Selector_Type> {
+        return new ProtractorLocator(
+            () => parent.nativeElement(),
+            this.selector,
+            (parentRoot: ProtractorNativeElementRoot) => this.locateElement(parentRoot),
+            (parentRoot: ProtractorNativeElementRoot) => this.locateAllElements(parentRoot),
+        );
+    }
+
+    element(): PageElement<ElementFinder> {
+        return new ProtractorPageElement(this);
+    }
+
+    async allElements(): Promise<Array<PageElement<ElementFinder>>> {
+        const parentRoot    = await this.parentRoot()
+        const elements      = await this.locateAllElements(parentRoot);
+
+        return Promise.all(elements.map(childElement =>
+            new ProtractorPageElement(new ProtractorLocator(
+                this.parentRoot,
+                this.selector,
+                () => unpromisedWebElement(childElement),
+                () => [ unpromisedWebElement(childElement) ],
+            ))
+        ));
+    }
+}

package/src/screenplay/models/{ProtractorNativeElementRoot.ts → locators/ProtractorNativeElementRoot.ts}

@@ -1,6 +1,6 @@
 import { ElementArrayFinder, ElementFinder, Locator } from 'protractor';
 
 export interface ProtractorNativeElementRoot {
-    element: (selector: Locator) => ElementFinder;
-    all: (selector: Locator) => ElementArrayFinder;
+    element(selector: Locator): ElementFinder;
+    all(selector: Locator): ElementArrayFinder;
 }

package/src/screenplay/models/locators/index.ts

@@ -0,0 +1,2 @@
+export * from './ProtractorLocator';
+export * from './ProtractorNativeElementRoot';

package/src/screenplay/questions/ProtractorParam.ts

@@ -64,7 +64,7 @@ export class ProtractorParam
     static called<R>(name: Answerable<string>): Question<Promise<R>> & Adapter<R> {
         return Question.about<Promise<R>>(formatted `the ${ name } param specified in Protractor config`, actor => {
             return actor.answer(name)
-                .then(name => BrowseTheWebWithProtractor.as(actor).param(name));
+                .then(name => (actor.abilityTo(BrowseTheWebWithProtractor) as BrowseTheWebWithProtractor).param(name));
         });
     }
 }

package/src/screenplay/{promisedWebElement.ts → unpromisedWebElement.ts}

@@ -9,12 +9,9 @@ import { WebElement } from 'protractor';
  * @param promiseLike
  * @returns {Promise<T>}
  */
-export function promisedWebElement<T extends WebElement>(promiseLike: PromiseLike<T> | T): Promise<T> {
-    if (promiseLike instanceof Promise) {
-        return promiseLike;
-    }
+export function unpromisedWebElement<T extends WebElement>(promiseLike: T): T {
 
-    return Promise.resolve(new Proxy(promiseLike, {
+    return new Proxy(promiseLike, {
         has: (target, property) =>
             property !== 'then',
         ownKeys: (target) =>
@@ -24,5 +21,5 @@ export function promisedWebElement<T extends WebElement>(promiseLike: PromiseLik
             (property in receiver)
                 ? target[property]
                 : undefined,
-    }));
+    });
 }

package/lib/screenplay/models/ProtractorNativeElementRoot.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProtractorNativeElementRoot.js","sourceRoot":"","sources":["../../../src/screenplay/models/ProtractorNativeElementRoot.ts"],"names":[],"mappings":""}

package/lib/screenplay/models/ProtractorPageElements.d.ts

@@ -1,16 +0,0 @@
-import { PageElement, PageElements } from '@serenity-js/web';
-import { ElementArrayFinder, ElementFinder } from 'protractor';
-import { ProtractorNativeElementRoot } from './ProtractorNativeElementRoot';
-import { ProtractorPageElement } from './ProtractorPageElement';
-export declare class ProtractorPageElements extends PageElements<ProtractorNativeElementRoot, ElementArrayFinder, ElementFinder> {
-    constructor(context: () => Promise<ProtractorNativeElementRoot> | ProtractorNativeElementRoot, locator: (root: ProtractorNativeElementRoot) => Promise<ElementArrayFinder> | ElementArrayFinder);
-    of(parent: PageElement<ProtractorNativeElementRoot, ElementFinder>): ProtractorPageElements;
-    count(): Promise<number>;
-    first(): Promise<ProtractorPageElement>;
-    last(): Promise<ProtractorPageElement>;
-    get(index: number): Promise<ProtractorPageElement>;
-    map<O>(fn: (element: PageElement, index?: number, elements?: PageElements) => Promise<O> | O): Promise<O[]>;
-    filter(fn: (element: PageElement, index?: number) => Promise<boolean> | boolean): PageElements;
-    forEach(fn: (element: PageElement, index?: number, elements?: PageElements) => Promise<void> | void): Promise<void>;
-    private asElement;
-}

package/lib/screenplay/models/ProtractorPageElements.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProtractorPageElements = void 0;
-const core_1 = require("@serenity-js/core");
-const web_1 = require("@serenity-js/web");
-const promisedWebElement_1 = require("../promisedWebElement");
-const ProtractorPageElement_1 = require("./ProtractorPageElement");
-class ProtractorPageElements extends web_1.PageElements {
-    constructor(context, locator) {
-        super(context, async (context) => {
-            return (0, promisedWebElement_1.promisedWebElement)(locator(context));
-        });
-    }
-    of(parent) {
-        return new ProtractorPageElements(() => parent.nativeElement(), this.locator);
-    }
-    async count() {
-        const elements = await this.nativeElementList();
-        return elements.count();
-    }
-    async first() {
-        const elements = await this.nativeElementList();
-        return this.asElement(elements.first());
-    }
-    async last() {
-        const elements = await this.nativeElementList();
-        return this.asElement(elements.last());
-    }
-    async get(index) {
-        const elements = await this.nativeElementList();
-        if (!elements.get(index)) {
-            throw new core_1.LogicError(`There's no item at index ${index}`);
-        }
-        return this.asElement(elements.get(index));
-    }
-    async map(fn) {
-        const elements = await this.nativeElementList();
-        return elements.map((element, i) => fn(new ProtractorPageElement_1.ProtractorPageElement(this.context, _context => element), i, this));
-    }
-    filter(fn) {
-        return new ProtractorPageElements(this.context, async (context) => {
-            const elements = await this.locator(context);
-            const result = elements.filter(async (nativeElement, index) => {
-                const element = new ProtractorPageElement_1.ProtractorPageElement(this.context, _context => nativeElement);
-                const result = await fn(element, index);
-                return result;
-            });
-            return (0, promisedWebElement_1.promisedWebElement)(result);
-        });
-    }
-    async forEach(fn) {
-        const elements = await this.nativeElementList();
-        return elements.each((element, index) => {
-            return fn(new ProtractorPageElement_1.ProtractorPageElement(this.context, _context => element), index, this);
-        });
-    }
-    asElement(elementFinder) {
-        return new ProtractorPageElement_1.ProtractorPageElement(this.context, _context => elementFinder);
-    }
-}
-exports.ProtractorPageElements = ProtractorPageElements;
-//# sourceMappingURL=ProtractorPageElements.js.map

package/lib/screenplay/models/ProtractorPageElements.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProtractorPageElements.js","sourceRoot":"","sources":["../../../src/screenplay/models/ProtractorPageElements.ts"],"names":[],"mappings":"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"}

package/lib/screenplay/promisedWebElement.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"promisedWebElement.js","sourceRoot":"","sources":["../../src/screenplay/promisedWebElement.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;GAQG;AACH,SAAgB,kBAAkB,CAAuB,WAA+B;IACpF,IAAI,WAAW,YAAY,OAAO,EAAE;QAChC,OAAO,WAAW,CAAC;KACtB;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE;QAC1C,GAAG,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CACtB,QAAQ,KAAK,MAAM;QACvB,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAChB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;aAClB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,MAAM,CAAC;QAChD,GAAG,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAChC,CAAC,QAAQ,IAAI,QAAQ,CAAC;YAClB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;YAClB,CAAC,CAAC,SAAS;KACtB,CAAC,CAAC,CAAC;AACR,CAAC;AAhBD,gDAgBC"}

package/src/screenplay/models/ProtractorPageElements.ts

@@ -1,86 +0,0 @@
-import { LogicError } from '@serenity-js/core';
-import { PageElement, PageElements } from '@serenity-js/web';
-import { ElementArrayFinder, ElementFinder } from 'protractor';
-
-import { promisedWebElement } from '../promisedWebElement';
-import { ProtractorNativeElementRoot } from './ProtractorNativeElementRoot';
-import { ProtractorPageElement } from './ProtractorPageElement';
-
-export class ProtractorPageElements
-    extends PageElements<ProtractorNativeElementRoot, ElementArrayFinder, ElementFinder>
-{
-    constructor(
-        context: () => Promise<ProtractorNativeElementRoot> | ProtractorNativeElementRoot,
-        locator: (root: ProtractorNativeElementRoot) => Promise<ElementArrayFinder> | ElementArrayFinder
-    ) {
-        super(context, async (context: ProtractorNativeElementRoot): Promise<ElementArrayFinder> => {
-            return promisedWebElement<ElementArrayFinder>(locator(context));
-        });
-    }
-
-    of(parent: PageElement<ProtractorNativeElementRoot, ElementFinder>): ProtractorPageElements {
-        return new ProtractorPageElements(() => parent.nativeElement(), this.locator);
-    }
-
-    async count(): Promise<number> {
-        const elements = await this.nativeElementList() as unknown as ElementArrayFinder;
-        return elements.count();
-    }
-
-    async first(): Promise<ProtractorPageElement> {
-        const elements = await this.nativeElementList() as unknown as ElementArrayFinder;
-        return this.asElement(elements.first());
-    }
-
-    async last(): Promise<ProtractorPageElement> {
-        const elements = await this.nativeElementList() as unknown as ElementArrayFinder;
-        return this.asElement(elements.last());
-    }
-
-    async get(index: number): Promise<ProtractorPageElement> {
-        const elements = await this.nativeElementList() as unknown as ElementArrayFinder;
-
-        if (! elements.get(index)) {
-            throw new LogicError(`There's no item at index ${ index }`);
-        }
-
-        return this.asElement(elements.get(index));
-    }
-
-    async map<O>(fn: (element: PageElement, index?: number, elements?: PageElements) => Promise<O> | O): Promise<O[]> {
-        const elements = await this.nativeElementList() as unknown as ElementArrayFinder;
-
-        return elements.map((element?: ElementFinder, i?: number) =>
-            fn(new ProtractorPageElement(this.context, _context => element), i, this)
-        );
-    }
-
-    filter(fn: (element: PageElement, index?: number) => Promise<boolean> | boolean): PageElements {
-        return new ProtractorPageElements(
-            this.context,
-            async (context: ProtractorNativeElementRoot): Promise<ElementArrayFinder> => {
-                const elements = await this.locator(context) as unknown as ElementArrayFinder;
-
-                const result = elements.filter(async (nativeElement: ElementFinder, index: number) => {
-                    const element = new ProtractorPageElement(this.context, _context => nativeElement);
-                    const result = await fn(element, index);
-                    return result;
-                });
-
-                return promisedWebElement<ElementArrayFinder>(result);
-            }
-        );
-    }
-
-    async forEach(fn: (element: PageElement, index?: number, elements?: PageElements) => Promise<void> | void): Promise<void> {
-        const elements = await this.nativeElementList() as unknown as ElementArrayFinder
-
-        return elements.each((element: ElementFinder, index: number) => {
-            return fn(new ProtractorPageElement(this.context, _context => element), index, this);
-        });
-    }
-
-    private asElement(elementFinder: ElementFinder): PageElement {
-        return new ProtractorPageElement(this.context, _context => elementFinder);
-    }
-}