@applitools/driver 1.4.11 → 1.4.15

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 ## Unreleased
 
 
+## 1.4.15 - 2022/2/15
+
+- updated to @applitools/snippets@2.1.14 (from 2.1.13)
+
+## 1.4.14 - 2022/2/15
+
+- add `viewportScale` getter to `Driver` class
+- updated to @applitools/snippets@2.1.13 (from 2.1.12)
+- updated to @applitools/types@1.0.25 (from 1.0.24)
+- updated to @applitools/utils@1.2.13 (from 1.2.12)
+
+## 1.4.13 - 2022/2/10
+
+- fix android helper
+- updated to @applitools/utils@1.2.12 (from 1.2.11)
+
+## 1.4.12 - 2022/2/8
+
+- fix usage of `-ios class chain` selectors
+
 ## 1.4.11 - 2022/2/8
 
 - use `-ios class chain` selectors instead of `class name` for iOS specific elements

package/dist/driver.js

@@ -99,6 +99,10 @@ class Driver {
         var _a;
         return (_a = this._driverInfo.pixelRatio) !== null && _a !== void 0 ? _a : 1;
     }
+    get viewportScale() {
+        var _a;
+        return (_a = this._driverInfo.viewportScale) !== null && _a !== void 0 ? _a : 1;
+    }
     get statusBarHeight() {
         var _a;
         return (_a = this._driverInfo.statusBarHeight) !== null && _a !== void 0 ? _a : (this.isNative ? 0 : undefined);
@@ -134,42 +138,43 @@ class Driver {
         this._currentContext = context;
     }
     async init() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        var _v, _w, _x, _y, _z, _0, _1;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _w, _x, _y, _z, _0, _1, _2, _3;
         const capabilities = await ((_b = (_a = this._spec).getCapabilities) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
         this._logger.log('Driver capabilities', capabilities);
         const capabilitiesInfo = capabilities ? capabilities_1.parseCapabilities(capabilities) : undefined;
         const driverInfo = await ((_d = (_c = this._spec).getDriverInfo) === null || _d === void 0 ? void 0 : _d.call(_c, this.target));
         this._driverInfo = Object.assign(Object.assign({}, capabilitiesInfo), driverInfo);
         if (this.isWeb) {
-            (_e = (_v = this._driverInfo).pixelRatio) !== null && _e !== void 0 ? _e : (_v.pixelRatio = await this.execute(snippets.getPixelRatio));
-            (_f = (_w = this._driverInfo).userAgent) !== null && _f !== void 0 ? _f : (_w.userAgent = await this.execute(snippets.getUserAgent));
+            (_e = (_w = this._driverInfo).pixelRatio) !== null && _e !== void 0 ? _e : (_w.pixelRatio = await this.execute(snippets.getPixelRatio));
+            (_f = (_x = this._driverInfo).viewportScale) !== null && _f !== void 0 ? _f : (_x.viewportScale = await this.execute(snippets.getViewportScale));
+            (_g = (_y = this._driverInfo).userAgent) !== null && _g !== void 0 ? _g : (_y.userAgent = await this.execute(snippets.getUserAgent));
             if (this._driverInfo.userAgent) {
                 const userAgentInfo = user_agent_1.parseUserAgent(this._driverInfo.userAgent);
-                this._driverInfo.browserName = (_g = userAgentInfo.browserName) !== null && _g !== void 0 ? _g : this._driverInfo.browserName;
-                this._driverInfo.browserVersion = (_h = userAgentInfo.browserVersion) !== null && _h !== void 0 ? _h : this._driverInfo.browserVersion;
+                this._driverInfo.browserName = (_h = userAgentInfo.browserName) !== null && _h !== void 0 ? _h : this._driverInfo.browserName;
+                this._driverInfo.browserVersion = (_j = userAgentInfo.browserVersion) !== null && _j !== void 0 ? _j : this._driverInfo.browserVersion;
                 if (this._driverInfo.isMobile) {
-                    (_j = (_x = this._driverInfo).platformName) !== null && _j !== void 0 ? _j : (_x.platformName = userAgentInfo.platformName);
-                    (_k = (_y = this._driverInfo).platformVersion) !== null && _k !== void 0 ? _k : (_y.platformVersion = userAgentInfo.platformVersion);
+                    (_k = (_z = this._driverInfo).platformName) !== null && _k !== void 0 ? _k : (_z.platformName = userAgentInfo.platformName);
+                    (_l = (_0 = this._driverInfo).platformVersion) !== null && _l !== void 0 ? _l : (_0.platformVersion = userAgentInfo.platformVersion);
                 }
                 else {
-                    this._driverInfo.platformName = (_l = userAgentInfo.platformName) !== null && _l !== void 0 ? _l : this._driverInfo.platformName;
-                    this._driverInfo.platformVersion = (_m = userAgentInfo.platformVersion) !== null && _m !== void 0 ? _m : this._driverInfo.platformVersion;
+                    this._driverInfo.platformName = (_m = userAgentInfo.platformName) !== null && _m !== void 0 ? _m : this._driverInfo.platformName;
+                    this._driverInfo.platformVersion = (_o = userAgentInfo.platformVersion) !== null && _o !== void 0 ? _o : this._driverInfo.platformVersion;
                 }
             }
-            (_o = (_z = this._driverInfo).features) !== null && _o !== void 0 ? _o : (_z.features = {});
-            (_p = (_0 = this._driverInfo.features).allCookies) !== null && _p !== void 0 ? _p : (_0.allCookies = /chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile);
+            (_p = (_1 = this._driverInfo).features) !== null && _p !== void 0 ? _p : (_1.features = {});
+            (_q = (_2 = this._driverInfo.features).allCookies) !== null && _q !== void 0 ? _q : (_2.allCookies = /chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile);
         }
         else {
-            const barsHeight = await ((_r = (_q = this._spec).getBarsHeight) === null || _r === void 0 ? void 0 : _r.call(_q, this.target).catch(() => undefined));
+            const barsHeight = await ((_s = (_r = this._spec).getBarsHeight) === null || _s === void 0 ? void 0 : _s.call(_r, this.target).catch(() => undefined));
             const displaySize = await this.getDisplaySize();
             // calculate status and navigation bars sizes
             if (barsHeight) {
                 // when status bar is overlapping content on android it returns status bar height equal to viewport height
                 if (this.isAndroid && barsHeight.statusBarHeight / this.pixelRatio < displaySize.height) {
-                    this._driverInfo.statusBarHeight = Math.max((_s = this._driverInfo.statusBarHeight) !== null && _s !== void 0 ? _s : 0, barsHeight.statusBarHeight);
+                    this._driverInfo.statusBarHeight = Math.max((_t = this._driverInfo.statusBarHeight) !== null && _t !== void 0 ? _t : 0, barsHeight.statusBarHeight);
                 }
-                this._driverInfo.navigationBarHeight = Math.max((_t = this._driverInfo.navigationBarHeight) !== null && _t !== void 0 ? _t : 0, barsHeight.navigationBarHeight);
+                this._driverInfo.navigationBarHeight = Math.max((_u = this._driverInfo.navigationBarHeight) !== null && _u !== void 0 ? _u : 0, barsHeight.navigationBarHeight);
             }
             if (this.isAndroid) {
                 this._driverInfo.statusBarHeight /= this.pixelRatio;
@@ -185,14 +190,14 @@ class Driver {
             // calculate safe area
             if (this.isIOS && !this._driverInfo.safeArea) {
                 this._driverInfo.safeArea = Object.assign({ x: 0, y: 0 }, displaySize);
-                const topElement = await this.element({ type: '-ios class chain', selector: 'XCUIElementTypeNavigationBar' });
+                const topElement = await this.element({ type: '-ios class chain', selector: '**/XCUIElementTypeNavigationBar' });
                 if (topElement) {
                     const topRegion = await this._spec.getElementRegion(this.target, topElement.target);
                     const topOffset = topRegion.y + topRegion.height;
                     this._driverInfo.safeArea.y = topOffset;
                     this._driverInfo.safeArea.height -= topOffset;
                 }
-                const bottomElement = await this.element({ type: '-ios class chain', selector: 'XCUIElementTypeTabBar' });
+                const bottomElement = await this.element({ type: '-ios class chain', selector: '**/XCUIElementTypeTabBar' });
                 if (bottomElement) {
                     const bottomRegion = await this._spec.getElementRegion(this.target, bottomElement.target);
                     const bottomOffset = bottomRegion.height;
@@ -205,7 +210,7 @@ class Driver {
                 : await helper_android_1.HelperAndroid.make({ spec: this._spec, driver: this, logger: this._logger });
         }
         if (this.isMobile) {
-            (_u = (_1 = this._driverInfo).orientation) !== null && _u !== void 0 ? _u : (_1.orientation = await this.getOrientation().catch(() => undefined));
+            (_v = (_3 = this._driverInfo).orientation) !== null && _v !== void 0 ? _v : (_3.orientation = await this.getOrientation().catch(() => undefined));
         }
         this._logger.log('Combined driver info', this._driverInfo);
         return this;

package/dist/element.js

@@ -220,14 +220,17 @@ class Element {
         });
     }
     async getTouchPadding() {
+        var _a;
         if (this._touchPadding == null) {
             if (this.driver.isWeb)
                 this._touchPadding = 0;
             else if (this.driver.isIOS)
                 this._touchPadding = 10;
             else if (this.driver.isAndroid) {
-                const { touchPadding } = JSON.parse(await this.getAttribute('contentSize'));
-                this._touchPadding = touchPadding !== null && touchPadding !== void 0 ? touchPadding : 0;
+                const data = await this.getAttribute('contentSize')
+                    .then(JSON.parse)
+                    .catch(() => null);
+                this._touchPadding = (_a = data === null || data === void 0 ? void 0 : data.touchPadding) !== null && _a !== void 0 ? _a : 24;
             }
         }
         return this._touchPadding;

package/dist/helper-android.js

@@ -12,8 +12,8 @@ class HelperAndroid {
         const { spec, driver, logger } = options;
         let legacy = false;
         let element = await driver.element({
-            type: '-android uiautomator',
-            selector: 'new UiSelector().description("EyesAppiumHelperEDT")',
+            type: 'xpath',
+            selector: '//*[@content-desc="EyesAppiumHelperEDT"]',
         });
         if (!element) {
             legacy = true;
@@ -37,7 +37,7 @@ class HelperAndroid {
             contentHeight = await this._element.getText();
         }
         else {
-            const elementId = this._getElementId(element);
+            const elementId = await this._getElementId(element);
             if (!elementId)
                 return null;
             await this._element.type(`offset;${elementId};0;0;0`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.4.11",
+  "version": "1.4.15",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -73,9 +73,9 @@
     }
   },
   "dependencies": {
-    "@applitools/snippets": "2.1.12",
-    "@applitools/types": "1.0.24",
-    "@applitools/utils": "1.2.11"
+    "@applitools/snippets": "2.1.14",
+    "@applitools/types": "1.0.25",
+    "@applitools/utils": "1.2.13"
   },
   "devDependencies": {
     "@applitools/sdk-release-kit": "0.13.11",

package/types/driver.d.ts

@@ -34,6 +34,7 @@ export declare class Driver<TDriver, TContext, TElement, TSelector> {
     get userAgent(): string;
     get orientation(): 'portrait' | 'landscape';
     get pixelRatio(): number;
+    get viewportScale(): number;
     get statusBarHeight(): number;
     get navigationBarHeight(): number;
     get isNative(): boolean;