@serenity-js/protractor 2.33.1 → 3.0.0-rc.11

package/lib/screenplay/abilities/{BrowseTheWeb.js → BrowseTheWebWithProtractor.js}

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrowseTheWeb = void 0;
+exports.BrowseTheWebWithProtractor = void 0;
 const core_1 = require("@serenity-js/core");
-const promiseOf_1 = require("../../promiseOf");
+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
  *  An {@link @serenity-js/core/lib/screenplay~Ability} that enables the {@link Actor} to interact with web front-ends using {@link protractor}.
@@ -32,12 +36,22 @@ const promiseOf_1 = require("../../promiseOf");
  * @implements {@serenity-js/core/lib/screenplay~Ability}
  * @see {@link @serenity-js/core/lib/screenplay/actor~Actor}
  */
-class BrowseTheWeb {
+class BrowseTheWebWithProtractor extends web_1.BrowseTheWeb {
     /**
      * @param {ProtractorBrowser} browser
      *  An instance of a protractor browser
      */
     constructor(browser) {
+        super(new Map()
+            .set(web_1.ByCss, (selector) => 
+        // todo: this is a temporary experiment; target state is for all CSS selectors to support Shadow DOM by default
+        locators_1.ProtractorLocator.createRootLocator(this.browser, selector, selector.value.startsWith('>>>') && !!protractor_1.by.shadowDomCss
+            ? protractor_1.by.shadowDomCss(selector.value.replace('>>>', ''))
+            : 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;
     }
     /**
@@ -45,241 +59,120 @@ class BrowseTheWeb {
      *  Ability to interact with web front-ends using a given protractor browser instance.
      *
      * @param {ProtractorBrowser} browser
-     * @returns {BrowseTheWeb}
+     * @returns {BrowseTheWebWithProtractor}
      */
     static using(browser) {
-        return new BrowseTheWeb(browser);
-    }
-    /**
-     * @desc
-     *  Used to access the Actor's ability to {@link BrowseTheWeb} from within the {@link Interaction} classes,
-     *  such as {@link Navigate}.
-     *
-     * @param {UsesAbilities} actor
-     * @return {BrowseTheWeb}
-     */
-    static as(actor) {
-        return actor.abilityTo(BrowseTheWeb);
-    }
-    /**
-     * @desc
-     *  Navigate to the given destination and loads mock modules before Angular.
-     *  Assumes that the page being loaded uses Angular.
-     *
-     * @param {string} destination
-     * @param {number?} timeoutInMillis
-     *
-     * @returns {Promise<void>}
-     */
-    get(destination, timeoutInMillis) {
-        return (0, promiseOf_1.promiseOf)(this.browser.get(destination, timeoutInMillis)
-            .then(() => this.browser.getWindowHandle())
-            .then(handle => {
-            this.originalWindowHandle = handle;
+        return new BrowseTheWebWithProtractor(browser);
+    }
+    async browserCapabilities() {
+        const capabilities = await (0, promised_1.promised)(this.browser.getCapabilities());
+        return {
+            platformName: capabilities.get('platform'),
+            browserName: capabilities.get('browserName'),
+            browserVersion: capabilities.get('version'),
+        };
+    }
+    async cookie(name) {
+        return new models_1.ProtractorCookie(this.browser, name);
+    }
+    async setCookie(cookieData) {
+        return (0, promised_1.promised)(this.browser.manage().addCookie({
+            name: cookieData.name,
+            value: cookieData.value,
+            path: cookieData.path,
+            domain: cookieData.domain,
+            secure: cookieData.secure,
+            httpOnly: cookieData.httpOnly,
+            expiry: cookieData.expiry
+                ? cookieData.expiry.toSeconds()
+                : undefined,
         }));
     }
-    /**
-     * @desc
-     *  Interface for navigating back and forth in the browser history.
-     *
-     *  @returns {Navigation}
-     */
-    navigate() {
-        return this.browser.navigate();
+    deleteAllCookies() {
+        return (0, promised_1.promised)(this.browser.manage().deleteAllCookies());
     }
-    /**
-     * @desc
-     *  Interface for defining sequences of complex user interactions.
-     *  Each sequence will not be executed until `perform` is called.
-     *
-     * @returns {ActionSequence}
-     *
-     * @see https://www.selenium.dev/selenium/docs/api/javascript/module/selenium-webdriver/lib/actions.html
-     */
-    actions() {
-        return this.browser.actions();
+    navigateTo(destination) {
+        return (0, promised_1.promised)(this.browser.get(destination));
     }
-    /**
-     * @desc
-     *  Interface for managing browser and driver state.
-     *
-     * @returns {Options}
-     *
-     * @see https://www.selenium.dev/selenium/docs/api/javascript/module/selenium-webdriver/lib/webdriver_exports_WebDriver.html#manage
-     */
-    manage() {
-        /*
-        this.browser.manage().deleteCookie();
-        this.browser.manage().deleteAllCookies();
-        return this.browser.manage().getCookie('asd');
-         */
-        return this.browser.manage();
+    navigateBack() {
+        return (0, promised_1.promised)(this.browser.navigate().back());
     }
-    /**
-     * @desc
-     *  Changes focus to the active modal dialog,
-     *  such as those opened by
-     *  [`Window.alert()`](https://developer.mozilla.org/en-US/docs/Web/API/Window/alert),
-     *  [`Window.prompt()`](https://developer.mozilla.org/en-US/docs/Web/API/Window/prompt), or
-     *  [`Window.confirm()`](https://developer.mozilla.org/en-US/docs/Web/API/Window/confirm).
-     *
-     * The returned promise will be rejected with an [`error.NoSuchAlertError`](https://www.selenium.dev/selenium/docs/api/javascript/module/selenium-webdriver/lib/error_exports_NoSuchAlertError.html)
-     * if there are no open alerts.
-     *
-     * @returns {AlertPromise}
-     *
-     * @see https://www.selenium.dev/selenium/docs/api/javascript/module/selenium-webdriver/lib/webdriver_exports_TargetLocator.html#alert
-     */
-    alert() {
-        return this.browser.switchTo().alert();
+    navigateForward() {
+        return (0, promised_1.promised)(this.browser.navigate().forward());
     }
-    /**
-     * @desc
-     *  Switches the focus to a [`frame`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/frame) or
-     *  [`iframe`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe) identified by `elementOrIndexOrName`,
-     *  which can be specified either as {@link selenium-webdriver~WebElement}, the name of the frame, or its index.
-     *
-     * @param {number | string | WebElement} elementOrIndexOrName
-     *
-     * @returns {Promise<void>}
-     */
-    switchToFrame(elementOrIndexOrName) {
-        // incorrect type definition in selenium-webdriver prevents us from providing a string arg
-        return (0, promiseOf_1.promiseOf)(this.browser.switchTo().frame(elementOrIndexOrName));
+    reloadPage() {
+        return (0, promised_1.promised)(this.browser.navigate().refresh());
     }
-    /**
-     * @desc
-     *  Switches the focus from any [`frame`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/frame) or
-     *  [`iframe`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe) back to its parent iframe.
-     *
-     * @returns {Promise<void>}
-     */
-    switchToParentFrame() {
-        return (0, promiseOf_1.promiseOf)(this.browser.driver.switchToParentFrame());
+    waitFor(duration) {
+        return (0, promised_1.promised)(this.browser.sleep(duration.inMilliseconds()));
     }
-    /**
-     * @desc
-     *  Switches the focus from any [`frame`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/frame)
-     *  or [`iframe`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe) back to default content,
-     *  a.k.a. "the main window".
-     *
-     * @returns {Promise<void>}
-     */
-    switchToDefaultContent() {
-        return (0, promiseOf_1.promiseOf)(this.browser.switchTo().defaultContent());
+    waitUntil(condition, timeout) {
+        return (0, promised_1.promised)(this.browser.wait(condition, timeout.inMilliseconds()));
     }
-    /**
-     * @desc
-     *  Switches browser window/tab to the one identified by `nameOrHandleOrIndex`,
-     *  which can be specified as the name of the window to switch to, its handle, or numeric index.
-     *
-     * @param {string | number} nameOrHandleOrIndex
-     *
-     * @returns {Promise<void>}
-     */
-    switchToWindow(nameOrHandleOrIndex) {
-        return typeof nameOrHandleOrIndex === 'string'
-            ? this.switchToWindowByNameOrHandle(nameOrHandleOrIndex)
-            : this.switchToWindowByIndex(nameOrHandleOrIndex);
-    }
-    /**
-     * @param {string} nameOrHandle
-     * @private
-     */
-    switchToWindowByNameOrHandle(nameOrHandle) {
-        return (0, promiseOf_1.promiseOf)(this.browser.switchTo().window(nameOrHandle));
-    }
-    /**
-     * @param {number} index
-     * @private
-     */
-    switchToWindowByIndex(index) {
-        return (0, promiseOf_1.promiseOf)(this.browser.getAllWindowHandles().then(handles => {
-            const handle = handles[index];
-            if (!handle) {
-                throw new core_1.LogicError(`Window ${index} doesn't exist`);
+    async sendKeys(keys) {
+        function isModifier(maybeKey) {
+            return web_1.Key.isKey(maybeKey) && maybeKey.isModifier;
+        }
+        function asCodePoint(maybeKey) {
+            if (!web_1.Key.isKey(maybeKey)) {
+                return maybeKey;
             }
-            return this.browser.switchTo().window(handle);
-        }));
-    }
-    /**
-     * @desc
-     *  Switches the window back to the original one that was used to call {@link get}.
-     *
-     * @returns {Promise<void>}
-     */
-    switchToOriginalWindow() {
-        return this.originalWindowHandle
-            ? (0, promiseOf_1.promiseOf)(this.browser.switchTo().window(this.originalWindowHandle))
-            : Promise.resolve();
-    }
-    /**
-     * @desc
-     *  Returns the handle of the browser window last used to navigate to a URL.
-     *
-     * @returns {Promise<string>}
-     *  A window handle
-     *
-     * @see {@link get}
-     */
-    getOriginalWindowHandle() {
-        return Promise.resolve(this.originalWindowHandle);
-    }
-    /**
-     * @desc
-     *  Returns the current window handle.
-     *  Please note that the current handle changes with each browser window you {@link Switch} to.
-     *
-     * @returns {Promise<string>}
-     *  A window handle
-     *
-     * @see {@link get}
-     */
-    getCurrentWindowHandle() {
-        return (0, promiseOf_1.promiseOf)(this.browser.getWindowHandle());
+            return maybeKey.utf16codePoint;
+        }
+        // keyDown for any modifier keys and sendKeys otherwise
+        const keyDownActions = keys.reduce((actions, key) => {
+            return isModifier(key)
+                ? actions.keyDown(asCodePoint(key))
+                : actions.sendKeys(asCodePoint(key));
+        }, this.browser.actions());
+        // keyUp for any modifier keys, ignore for regular keys
+        const keyUpActions = keys.reduce((actions, key) => {
+            return isModifier(key)
+                ? actions.keyUp(asCodePoint(key))
+                : actions;
+        }, keyDownActions);
+        return (0, promised_1.promised)(keyUpActions.perform());
+    }
+    async modalDialog() {
+        return new models_1.ProtractorModalDialog(this.browser);
+    }
+    async frame(bySelector) {
+        const locator = this.locate(bySelector);
+        return new models_1.ProtractorFrame(this.browser, locator);
     }
     /**
      * @desc
-     *  Returns the handles of all the available windows.
-     *
-     *  Please note that while some browsers organise entries of this list in the same order
-     *  new windows have been spawned, other browsers order it alphabetically.
-     *  For this reason, you should not make any assumptions about how this list is ordered.
+     *  Navigate to the given destination and loads mock modules before Angular.
+     *  Assumes that the page being loaded uses Angular.
      *
-     * @returns {Promise<string[]>}
-     *  A list of window handles
-     */
-    getAllWindowHandles() {
-        return (0, promiseOf_1.promiseOf)(this.browser.getAllWindowHandles());
-    }
-    /**
-     * @desc
-     *  Closes the currently active browser window/tab.
+     * @param {string} destination
+     * @param {number?} timeoutInMillis
      *
      * @returns {Promise<void>}
      */
-    closeCurrentWindow() {
-        return (0, promiseOf_1.promiseOf)(this.browser.close());
+    get(destination, timeoutInMillis) {
+        return (0, promised_1.promised)(this.browser.get(destination, timeoutInMillis));
     }
     /**
      * @desc
-     *  Locates a single element identified by the locator
+     *  Returns a {@link Page} representing the currently active top-level browsing context.
      *
-     * @param {Locator} locator
-     * @returns {ElementFinder}
+     * @returns {Promise<Page>}
      */
-    locate(locator) {
-        return this.browser.element(locator);
+    async currentPage() {
+        const windowHandle = await this.browser.getWindowHandle();
+        return new models_1.ProtractorPage(this.browser, windowHandle);
     }
     /**
      * @desc
-     *  Locates all elements identified by the locator
+     *  Returns an array of {@link Page} objects representing all the available
+     *  top-level browsing context, e.g. all the open browser tabs.
      *
-     * @param {Locator} locator
-     * @returns {ElementArrayFinder}
+     * @returns {Promise<Array<Page>>}
      */
-    locateAll(locator) {
-        return this.browser.element.all(locator);
+    async allPages() {
+        const windowHandles = await this.browser.getAllWindowHandles();
+        return windowHandles.map(windowHandle => new models_1.ProtractorPage(this.browser, windowHandle));
     }
     /**
      * @desc
@@ -307,7 +200,7 @@ class BrowseTheWeb {
      * @returns {Promise<boolean>}
      */
     enableAngularSynchronisation(enable) {
-        return (0, promiseOf_1.promiseOf)(this.browser.waitForAngularEnabled(enable));
+        return (0, promised_1.promised)(this.browser.waitForAngularEnabled(enable));
     }
     /**
      * @desc
@@ -343,7 +236,6 @@ class BrowseTheWeb {
      * @see https://www.protractortest.org/#/api?view=webdriver.WebDriver.prototype.executeScript
      * @see https://seleniumhq.github.io/selenium/docs/api/java/org/openqa/selenium/JavascriptExecutor.html#executeScript-java.lang.String-java.lang.Object...-
      *
-     * @param {string} description  - useful for debugging
      * @param {string | Function} script
      * @param {any[]} args
      *
@@ -351,8 +243,9 @@ class BrowseTheWeb {
      *
      * @see {@link BrowseTheWeb#getLastScriptExecutionResult}
      */
-    executeScript(description, script, ...args) {
-        return (0, promiseOf_1.promiseOf)(this.browser.executeScriptWithDescription(script, description, ...args))
+    async executeScript(script, ...args) {
+        const nativeArguments = await Promise.all(args.map(arg => arg instanceof models_1.ProtractorPageElement ? arg.nativeElement() : arg));
+        return (0, promised_1.promised)(this.browser.executeScript(script, ...nativeArguments))
             .then(result => {
             this.lastScriptExecutionSummary = new LastScriptExecutionSummary(result);
             return result;
@@ -360,15 +253,16 @@ class BrowseTheWeb {
     }
     /**
      * @desc
-     *  A simplified version of {@link BrowseTheWeb#executeScript} that doesn't affect {@link LastScriptExecution.result()}.
+     *  A simplified version of {@link BrowseTheWebWithProtractor#executeScript} that doesn't affect {@link LastScriptExecution.result()}.
      *
      * @param {Function} fn
      * @param {Parameters<fn>} args
      *
      * @returns {Promise<ReturnType<fn>>}
      */
-    executeFunction(fn, ...args) {
-        return (0, promiseOf_1.promiseOf)(this.browser.executeScriptWithDescription(fn, fn.name, ...args));
+    async executeFunction(fn, ...args) {
+        const nativeArguments = await Promise.all(args.map(arg => arg instanceof models_1.ProtractorPageElement ? arg.nativeElement() : arg));
+        return (0, promised_1.promised)(this.browser.executeScriptWithDescription(fn, fn.name, ...nativeArguments));
     }
     /**
      * @desc
@@ -382,7 +276,7 @@ class BrowseTheWeb {
      *  Arrays and objects may also be used as script arguments as long as each item adheres
      *  to the types previously mentioned.
      *
-     *  Unlike executing synchronous JavaScript with {@link BrowseTheWeb#executeScript},
+     *  Unlike executing synchronous JavaScript with {@link BrowseTheWebWithProtractor#executeScript},
      *  scripts executed with this function must explicitly signal they are finished by invoking the provided callback.
      *
      *  This callback will always be injected into the executed function as the last argument,
@@ -422,13 +316,13 @@ class BrowseTheWeb {
      *
      * @see {@link BrowseTheWeb#getLastScriptExecutionResult}
      */
-    executeAsyncScript(script, ...args) {
-        return (0, promiseOf_1.promiseOf)(this.browser.executeAsyncScript(script, ...args))
+    async executeAsyncScript(script, ...args) {
+        const nativeArguments = await Promise.all(args.map(arg => arg instanceof models_1.ProtractorPageElement ? arg.nativeElement() : arg));
+        return (0, promised_1.promised)(this.browser.executeAsyncScript(script, ...nativeArguments))
             .then(result => {
             this.lastScriptExecutionSummary = new LastScriptExecutionSummary(result);
             return result;
         });
-        // todo: should I wrap this an provide additional diagnostic information? execution time? error handling?
     }
     /**
      * @desc
@@ -443,27 +337,7 @@ class BrowseTheWeb {
      * @return {Promise<string>} A promise that will be resolved to a base64-encoded screenshot PNG
      */
     takeScreenshot() {
-        return (0, promiseOf_1.promiseOf)(this.browser.takeScreenshot());
-    }
-    /**
-     * @desc
-     *  Returns the title of the current page.
-     *
-     * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title
-     *
-     * @returns {Promise<string>}
-     */
-    getTitle() {
-        return (0, promiseOf_1.promiseOf)(this.browser.getTitle());
-    }
-    /**
-     * @desc
-     *  Returns the url of the current page.
-     *
-     * @returns {Promise<string>}
-     */
-    getCurrentUrl() {
-        return (0, promiseOf_1.promiseOf)(this.browser.getCurrentUrl());
+        return (0, promised_1.promised)(this.browser.takeScreenshot());
     }
     /**
      * @desc
@@ -475,8 +349,8 @@ class BrowseTheWeb {
      *
      * @returns {Promise<Capabilities>} The actual capabilities of this browser.
      */
-    getCapabilities() {
-        return (0, promiseOf_1.promiseOf)(this.browser.getCapabilities());
+    capabilities() {
+        return (0, promised_1.promised)(this.browser.getCapabilities());
     }
     /**
      * @desc
@@ -486,7 +360,7 @@ class BrowseTheWeb {
      * @returns {Promise<void>}
      */
     sleep(millis) {
-        return (0, promiseOf_1.promiseOf)(this.browser.sleep(millis));
+        return (0, promised_1.promised)(this.browser.sleep(millis));
     }
     /**
      * @desc
@@ -497,20 +371,24 @@ class BrowseTheWeb {
      * @returns {Promise<boolean>}
      */
     wait(condition, timeoutInMillis) {
-        return (0, promiseOf_1.promiseOf)(this.browser.wait(condition, timeoutInMillis));
+        return (0, promised_1.promised)(this.browser.wait(condition, timeoutInMillis));
     }
     /**
      * @desc
-     *  Returns the last result of calling {@link BrowseTheWeb#executeAsyncScript}
-     *  or {@link BrowseTheWeb#executeScript}
+     *  Returns the last result of calling {@link BrowseTheWebWithProtractor#executeAsyncScript}
+     *  or {@link BrowseTheWebWithProtractor#executeScript}
      *
      * @returns {any}
      */
-    getLastScriptExecutionResult() {
+    lastScriptExecutionResult() {
         if (!this.lastScriptExecutionSummary) {
             throw new core_1.LogicError(`Make sure to execute a script before checking on the result`);
         }
-        return this.lastScriptExecutionSummary.result;
+        // Selenium 3 returns `null` when the script it executed returns `undefined`
+        // so we're mapping the result back.
+        return this.lastScriptExecutionSummary.result !== null
+            ? this.lastScriptExecutionSummary.result
+            : undefined;
     }
     /**
      * @desc
@@ -551,7 +429,7 @@ class BrowseTheWeb {
         }, this.browser.params);
     }
 }
-exports.BrowseTheWeb = BrowseTheWeb;
+exports.BrowseTheWebWithProtractor = BrowseTheWebWithProtractor;
 /**
  * @package
  */
@@ -560,4 +438,4 @@ class LastScriptExecutionSummary {
         this.result = result;
     }
 }
-//# sourceMappingURL=BrowseTheWeb.js.map
+//# sourceMappingURL=BrowseTheWebWithProtractor.js.map

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

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

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

@@ -1 +1 @@
-export * from './BrowseTheWeb';
+export * from './BrowseTheWebWithProtractor';

package/lib/screenplay/abilities/index.js

@@ -10,5 +10,5 @@ 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("./BrowseTheWeb"), exports);
+__exportStar(require("./BrowseTheWebWithProtractor"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/abilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/abilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA6C"}

package/lib/screenplay/index.d.ts

@@ -1,3 +1,4 @@
 export * from './abilities';
 export * from './interactions';
+export * from './models';
 export * from './questions';

package/lib/screenplay/index.js

@@ -12,5 +12,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./abilities"), exports);
 __exportStar(require("./interactions"), exports);
+__exportStar(require("./models"), exports);
 __exportStar(require("./questions"), exports);
 //# sourceMappingURL=index.js.map

package/lib/screenplay/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/screenplay/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4B;AAC5B,iDAA+B;AAC/B,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/screenplay/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4B;AAC5B,iDAA+B;AAC/B,2CAAyB;AACzB,8CAA4B"}

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.BrowseTheWeb.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.BrowseTheWeb.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,4CAA4C;AAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAa,UAAU;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,sBAAsB;QACzB,OAAO,kBAAW,CAAC,KAAK,CAAC,8CAA8C,EAAE,KAAK,CAAC,EAAE,CAC7E,wBAAY,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvF,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,qBAAqB;QACxB,OAAO,kBAAW,CAAC,KAAK,CAAC,6CAA6C,EAAE,KAAK,CAAC,EAAE,CAC5E,wBAAY,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtF,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/interactions/index.d.ts

@@ -1,20 +1 @@
-export * from './Accept';
-export * from './Clear';
-export * from './Click';
-export * from './Close';
-export * from './DeleteCookies';
-export * from './Dismiss';
-export * from './DoubleClick';
-export * from './Enter';
-export * from './ExecuteScript';
-export * from './Hover';
-export * from './Navigate';
-export * from './Press';
-export * from './ResizeBrowserWindow';
-export * from './RightClick';
-export * from './Scroll';
-export * from './Select';
-export * from './Switch';
-export * from './TakeScreenshot';
 export * from './UseAngular';
-export * from './Wait';