@applitools/driver 1.11.37 → 1.11.39

package/dist/capabilities.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCapabilities = void 0;
-function parseCapabilities(capabilities) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+exports.extractCapabilitiesViewport = exports.extractCapabilitiesEnvironment = void 0;
+function extractCapabilitiesEnvironment(capabilities) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if (capabilities.capabilities)
         capabilities = capabilities.capabilities;
-    const info = {
+    const environment = {
         browserName: !capabilities.app && !capabilities.bundleId
             ? ((_a = capabilities.browserName) !== null && _a !== void 0 ? _a : (_b = capabilities.desired) === null || _b === void 0 ? void 0 : _b.browserName) || undefined
             : undefined,
@@ -17,36 +17,43 @@ function parseCapabilities(capabilities) {
         isChrome: isChrome(capabilities),
         isECClient: Boolean(capabilities['applitools:isECClient']),
     };
-    if (info.isMobile) {
-        info.deviceName = ((_h = (_g = capabilities.desired) === null || _g === void 0 ? void 0 : _g.deviceName) !== null && _h !== void 0 ? _h : capabilities.deviceName) || undefined;
-        info.orientation = (_k = ((_j = capabilities.deviceOrientation) !== null && _j !== void 0 ? _j : capabilities.orientation)) === null || _k === void 0 ? void 0 : _k.toLowerCase();
-        info.isIOS = isIOS(capabilities);
-        info.isAndroid = isAndroid(capabilities);
-        if (!info.browserName) {
-            info.isNative = true;
+    if (environment === null || environment === void 0 ? void 0 : environment.isMobile) {
+        environment.deviceName = ((_h = (_g = capabilities.desired) === null || _g === void 0 ? void 0 : _g.deviceName) !== null && _h !== void 0 ? _h : capabilities.deviceName) || undefined;
+        environment.isIOS = isIOS(capabilities);
+        environment.isAndroid = isAndroid(capabilities);
+        if (!environment.browserName) {
+            environment.isNative = true;
         }
-        else if (info.isIOS && !/mobilesafari/i.test(capabilities.CFBundleIdentifier)) {
-            info.browserName = undefined;
-            info.isNative = true;
+        else if (environment.isIOS && !/mobilesafari/i.test(capabilities.CFBundleIdentifier)) {
+            environment.browserName = undefined;
+            environment.isNative = true;
         }
         else {
-            info.isNative = false;
+            environment.isNative = false;
         }
     }
-    if (info.isNative) {
-        info.displaySize = extractDisplaySize(capabilities);
-        info.pixelRatio = capabilities.pixelRatio;
-        info.statusBarSize = (_l = capabilities.statBarHeight) !== null && _l !== void 0 ? _l : (_m = capabilities.viewportRect) === null || _m === void 0 ? void 0 : _m.top;
-        if (info.displaySize && info.orientation && capabilities.viewportRect) {
-            info.navigationBarSize =
-                info.orientation === 'landscape'
-                    ? info.displaySize.width - (capabilities.viewportRect.left + capabilities.viewportRect.width)
-                    : info.displaySize.height - (capabilities.viewportRect.top + capabilities.viewportRect.height);
-        }
+    return environment;
+}
+exports.extractCapabilitiesEnvironment = extractCapabilitiesEnvironment;
+function extractCapabilitiesViewport(capabilities) {
+    var _a, _b, _c, _d;
+    if (capabilities.capabilities)
+        capabilities = capabilities.capabilities;
+    const viewport = {
+        displaySize: extractDisplaySize(capabilities),
+        orientation: (_b = ((_a = capabilities.deviceOrientation) !== null && _a !== void 0 ? _a : capabilities.orientation)) === null || _b === void 0 ? void 0 : _b.toLowerCase(),
+        pixelRatio: capabilities.pixelRatio,
+        statusBarSize: (_c = capabilities.statBarHeight) !== null && _c !== void 0 ? _c : (_d = capabilities.viewportRect) === null || _d === void 0 ? void 0 : _d.top,
+    };
+    if (viewport.displaySize && viewport.orientation && capabilities.viewportRect) {
+        viewport.navigationBarSize =
+            viewport.orientation === 'landscape'
+                ? viewport.displaySize.width - (capabilities.viewportRect.left + capabilities.viewportRect.width)
+                : viewport.displaySize.height - (capabilities.viewportRect.top + capabilities.viewportRect.height);
     }
-    return info;
+    return viewport;
 }
-exports.parseCapabilities = parseCapabilities;
+exports.extractCapabilitiesViewport = extractCapabilitiesViewport;
 function isW3C(capabilities) {
     const isW3C = Boolean((capabilities.platformName || capabilities.browserVersion) &&
         (capabilities.platformVersion || capabilities.hasOwnProperty('setWindowRect')));

package/dist/context.js

@@ -101,11 +101,12 @@ class Context {
         var _a;
         await this.focus();
         const { parent, all, wait } = options;
-        const transformedSelector = specUtils.transformSelector(this._spec, selector, this.driver);
+        const environment = await this.driver.getEnvironment();
+        const transformedSelector = specUtils.transformSelector(this._spec, selector, environment);
         let elements = [];
         if (wait) {
             if (this._spec.waitForSelector) {
-                const element = await this._spec.waitForSelector(this.target, specUtils.transformSelector(this._spec, selector, this.driver), parent, wait);
+                const element = await this._spec.waitForSelector(this.target, specUtils.transformSelector(this._spec, selector, environment), parent, wait);
                 if (element)
                     elements = [element];
             }
@@ -113,7 +114,7 @@ class Context {
                 let waiting = true;
                 const timeout = setTimeout(() => (waiting = false), wait.timeout);
                 while (waiting) {
-                    const element = await this._spec.findElement(this.target, specUtils.transformSelector(this._spec, selector, this.driver), parent);
+                    const element = await this._spec.findElement(this.target, specUtils.transformSelector(this._spec, selector, environment), parent);
                     if (element) {
                         clearTimeout(timeout);
                         elements = [element];
@@ -393,12 +394,13 @@ class Context {
     async getScrollingElement() {
         if (!(this._scrollingElement instanceof element_1.Element)) {
             await this.focus();
+            const environment = await this.driver.getEnvironment();
             if (this._scrollingElement) {
                 this._scrollingElement = await this.element(this._scrollingElement);
             }
-            else if (this.driver.isWeb) {
+            else if (environment.isWeb) {
                 let selector;
-                if (this.driver.isIOS && !this.driver.isEmulation) {
+                if (environment.isIOS && !environment.isEmulation) {
                     selector = 'html';
                     this._logger.log(`Using hardcoded default scrolling element for Safari on iOS - "${selector}"`);
                 }
@@ -518,12 +520,13 @@ class Context {
         else
             region = { x: 0, y: 0, width: Infinity, height: Infinity };
         let currentContext = this;
+        const environment = await this.driver.getEnvironment();
         while (currentContext) {
             const contextRegion = await currentContext.getClientRegion();
             // const contextScrollingRegion = await currentContext.getScrollingRegion()
             const parentContextInnerOffset = (_b = (await ((_a = currentContext.parent) === null || _a === void 0 ? void 0 : _a.getInnerOffset()))) !== null && _b !== void 0 ? _b : { x: 0, y: 0 };
             // TODO revisit
-            if (this.driver.isWeb ||
+            if (environment.isWeb ||
                 (!utils.geometry.equals(contextRegion, region) && utils.geometry.contains(contextRegion, region))) {
                 this._logger.log('Intersecting context region', contextRegion, 'with context region', region);
                 region = utils.geometry.intersect(contextRegion, utils.geometry.offset(region, contextRegion));
@@ -535,11 +538,14 @@ class Context {
         return region;
     }
     async getCookies() {
-        var _a, _b, _c;
-        if (this.driver.isNative)
+        var _a, _b;
+        const environment = await this.driver.getEnvironment();
+        if (!environment.isWeb)
             return [];
         await this.focus();
-        return (_c = (_b = (_a = this._spec).getCookies) === null || _b === void 0 ? void 0 : _b.call(_a, this.target, true)) !== null && _c !== void 0 ? _c : [];
+        const cookies = await ((_b = (_a = this._spec).getCookies) === null || _b === void 0 ? void 0 : _b.call(_a, this.target, true));
+        this._logger.log('Extracted context cookies', cookies);
+        return cookies !== null && cookies !== void 0 ? cookies : [];
     }
     async preserveInnerOffset() {
         this._state.innerOffset = await this.getInnerOffset();