@applitools/driver 1.9.28 → 1.9.30

package/dist/driver.js

@@ -144,42 +144,47 @@ 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, _v, _w, _x, _y, _z, _0, _1, _2, _3;
-        var _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15;
-        const capabilities = await ((_b = (_a = this._spec).getCapabilities) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
+        var _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17;
+        // NOTE: this is here because saucelabs does not provide right capabilities for the first call
+        await ((_b = (_a = this._spec).getCapabilities) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
+        const capabilities = await ((_d = (_c = this._spec).getCapabilities) === null || _d === void 0 ? void 0 : _d.call(_c, this.target));
         this._logger.log('Driver capabilities', capabilities);
         const capabilitiesInfo = capabilities ? (0, capabilities_1.parseCapabilities)(capabilities) : undefined;
-        const driverInfo = await ((_d = (_c = this._spec).getDriverInfo) === null || _d === void 0 ? void 0 : _d.call(_c, this.target));
+        const driverInfo = await ((_f = (_e = this._spec).getDriverInfo) === null || _f === void 0 ? void 0 : _f.call(_e, this.target));
         this._driverInfo = { ...capabilitiesInfo, ...driverInfo };
         if (this.isMobile) {
             this._driverInfo.orientation =
-                (_e = (await this.getOrientation().catch(() => undefined))) !== null && _e !== void 0 ? _e : this._driverInfo.orientation;
+                (_g = (await this.getOrientation().catch(() => undefined))) !== null && _g !== void 0 ? _g : this._driverInfo.orientation;
         }
         if (this.isWeb) {
-            (_f = (_4 = this._driverInfo).pixelRatio) !== null && _f !== void 0 ? _f : (_4.pixelRatio = await this.execute(snippets.getPixelRatio));
-            (_g = (_5 = this._driverInfo).viewportScale) !== null && _g !== void 0 ? _g : (_5.viewportScale = await this.execute(snippets.getViewportScale));
-            (_h = (_6 = this._driverInfo).userAgent) !== null && _h !== void 0 ? _h : (_6.userAgent = await this.execute(snippets.getUserAgent));
+            (_h = (_6 = this._driverInfo).pixelRatio) !== null && _h !== void 0 ? _h : (_6.pixelRatio = await this.execute(snippets.getPixelRatio));
+            (_j = (_7 = this._driverInfo).viewportScale) !== null && _j !== void 0 ? _j : (_7.viewportScale = await this.execute(snippets.getViewportScale));
+            (_k = (_8 = this._driverInfo).userAgent) !== null && _k !== void 0 ? _k : (_8.userAgent = await this.execute(snippets.getUserAgent));
             if (this._driverInfo.userAgent) {
                 const userAgentInfo = (0, user_agent_1.parseUserAgent)(this._driverInfo.userAgent);
-                this._driverInfo.browserName = (_j = userAgentInfo.browserName) !== null && _j !== void 0 ? _j : this._driverInfo.browserName;
-                this._driverInfo.browserVersion = (_k = userAgentInfo.browserVersion) !== null && _k !== void 0 ? _k : this._driverInfo.browserVersion;
+                this._driverInfo.browserName = (_l = userAgentInfo.browserName) !== null && _l !== void 0 ? _l : this._driverInfo.browserName;
+                this._driverInfo.browserVersion = (_m = userAgentInfo.browserVersion) !== null && _m !== void 0 ? _m : this._driverInfo.browserVersion;
                 if (this._driverInfo.isMobile) {
-                    (_l = (_7 = this._driverInfo).platformName) !== null && _l !== void 0 ? _l : (_7.platformName = userAgentInfo.platformName);
-                    (_m = (_8 = this._driverInfo).platformVersion) !== null && _m !== void 0 ? _m : (_8.platformVersion = userAgentInfo.platformVersion);
+                    (_o = (_9 = this._driverInfo).platformName) !== null && _o !== void 0 ? _o : (_9.platformName = userAgentInfo.platformName);
+                    (_p = (_10 = this._driverInfo).platformVersion) !== null && _p !== void 0 ? _p : (_10.platformVersion = userAgentInfo.platformVersion);
                 }
                 else {
-                    this._driverInfo.platformName = (_o = userAgentInfo.platformName) !== null && _o !== void 0 ? _o : this._driverInfo.platformName;
-                    this._driverInfo.platformVersion = (_p = userAgentInfo.platformVersion) !== null && _p !== void 0 ? _p : this._driverInfo.platformVersion;
+                    this._driverInfo.platformName = (_q = userAgentInfo.platformName) !== null && _q !== void 0 ? _q : this._driverInfo.platformName;
+                    this._driverInfo.platformVersion = (_r = userAgentInfo.platformVersion) !== null && _r !== void 0 ? _r : this._driverInfo.platformVersion;
                 }
             }
-            (_q = (_9 = this._driverInfo).features) !== null && _q !== void 0 ? _q : (_9.features = {});
-            (_r = (_10 = this._driverInfo.features).allCookies) !== null && _r !== void 0 ? _r : (_10.allCookies = /chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile);
+            if (!this._driverInfo.isMobile && (this.isAndroid || this.isIOS)) {
+                this._driverInfo.isMobile = true;
+            }
+            (_s = (_11 = this._driverInfo).features) !== null && _s !== void 0 ? _s : (_11.features = {});
+            (_t = (_12 = this._driverInfo.features).allCookies) !== null && _t !== void 0 ? _t : (_12.allCookies = /chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile);
         }
         else {
             // this value always excludes the height of the navigation bar, and sometimes it also excludes the height of the status bar
             let windowSize = await this._spec.getWindowSize(this.target);
-            (_s = (_11 = this._driverInfo).displaySize) !== null && _s !== void 0 ? _s : (_11.displaySize = windowSize);
-            if (((_t = this.orientation) === null || _t === void 0 ? void 0 : _t.startsWith('landscape')) &&
+            (_u = (_13 = this._driverInfo).displaySize) !== null && _u !== void 0 ? _u : (_13.displaySize = windowSize);
+            if (((_v = this.orientation) === null || _v === void 0 ? void 0 : _v.startsWith('landscape')) &&
                 this._driverInfo.displaySize.height > this._driverInfo.displaySize.width) {
                 this._driverInfo.displaySize = {
                     width: this._driverInfo.displaySize.height,
@@ -188,14 +193,14 @@ class Driver {
             }
             if (this.isAndroid) {
                 // bar sizes could be extracted only on android
-                const systemBars = await ((_v = (_u = this._spec).getSystemBars) === null || _v === void 0 ? void 0 : _v.call(_u, this.target).catch(() => null));
+                const systemBars = await ((_x = (_w = this._spec).getSystemBars) === null || _x === void 0 ? void 0 : _x.call(_w, this.target).catch(() => null));
                 const { statusBar, navigationBar } = systemBars !== null && systemBars !== void 0 ? systemBars : {};
                 if (statusBar === null || statusBar === void 0 ? void 0 : statusBar.visible) {
                     this._logger.log('Driver status bar', statusBar);
                     const statusBarSize = statusBar.height;
                     // when status bar is overlapping content on android it returns status bar height equal to display height
                     if (statusBarSize < this._driverInfo.displaySize.height) {
-                        this._driverInfo.statusBarSize = Math.max((_w = this._driverInfo.statusBarSize) !== null && _w !== void 0 ? _w : 0, statusBarSize);
+                        this._driverInfo.statusBarSize = Math.max((_y = this._driverInfo.statusBarSize) !== null && _y !== void 0 ? _y : 0, statusBarSize);
                     }
                 }
                 if (navigationBar === null || navigationBar === void 0 ? void 0 : navigationBar.visible) {
@@ -204,28 +209,28 @@ class Driver {
                     if (navigationBar.x > 0)
                         this._driverInfo.orientation = 'landscape-secondary';
                     // navigation bar size could be its height or width depending on screen orientation
-                    const navigationBarSize = navigationBar[((_x = this.orientation) === null || _x === void 0 ? void 0 : _x.startsWith('landscape')) ? 'width' : 'height'];
+                    const navigationBarSize = navigationBar[((_z = this.orientation) === null || _z === void 0 ? void 0 : _z.startsWith('landscape')) ? 'width' : 'height'];
                     // when navigation bar is invisible on android it returns navigation bar size equal to display size
                     if (navigationBarSize <
-                        this._driverInfo.displaySize[((_y = this.orientation) === null || _y === void 0 ? void 0 : _y.startsWith('landscape')) ? 'width' : 'height']) {
-                        this._driverInfo.navigationBarSize = Math.max((_z = this._driverInfo.navigationBarSize) !== null && _z !== void 0 ? _z : 0, navigationBarSize);
+                        this._driverInfo.displaySize[((_0 = this.orientation) === null || _0 === void 0 ? void 0 : _0.startsWith('landscape')) ? 'width' : 'height']) {
+                        this._driverInfo.navigationBarSize = Math.max((_1 = this._driverInfo.navigationBarSize) !== null && _1 !== void 0 ? _1 : 0, navigationBarSize);
                     }
                     else {
                         this._driverInfo.navigationBarSize = 0;
                     }
                 }
                 // bar sizes have to be scaled on android
-                (_12 = this._driverInfo).statusBarSize && (_12.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
-                (_13 = this._driverInfo).navigationBarSize && (_13.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
+                (_14 = this._driverInfo).statusBarSize && (_14.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
+                (_15 = this._driverInfo).navigationBarSize && (_15.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
                 windowSize = utils.geometry.scale(windowSize, 1 / this.pixelRatio);
-                (_14 = this._driverInfo).displaySize && (_14.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
+                (_16 = this._driverInfo).displaySize && (_16.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
             }
             if (this.isIOS) {
-                if ((_0 = this.orientation) === null || _0 === void 0 ? void 0 : _0.startsWith('landscape'))
+                if ((_2 = this.orientation) === null || _2 === void 0 ? void 0 : _2.startsWith('landscape'))
                     this._driverInfo.statusBarSize = 0;
             }
             // calculate viewport location
-            (_1 = (_15 = this._driverInfo).viewportLocation) !== null && _1 !== void 0 ? _1 : (_15.viewportLocation = {
+            (_3 = (_17 = this._driverInfo).viewportLocation) !== null && _3 !== void 0 ? _3 : (_17.viewportLocation = {
                 x: this.orientation === 'landscape' ? this.navigationBarSize : 0,
                 y: this.statusBarSize,
             });
@@ -234,7 +239,7 @@ class Driver {
                 this._driverInfo.viewportSize = { ...this._driverInfo.displaySize };
                 this._driverInfo.viewportSize.height -= this.statusBarSize;
                 if (this.isAndroid) {
-                    this._driverInfo.viewportSize[((_2 = this.orientation) === null || _2 === void 0 ? void 0 : _2.startsWith('landscape')) ? 'width' : 'height'] -=
+                    this._driverInfo.viewportSize[((_4 = this.orientation) === null || _4 === void 0 ? void 0 : _4.startsWith('landscape')) ? 'width' : 'height'] -=
                         this.navigationBarSize;
                 }
             }
@@ -257,7 +262,7 @@ class Driver {
             }
             // TODO: if user opts into NML, skip initializing the helpers
             // init helper lib
-            if (!((_3 = this._customConfig) === null || _3 === void 0 ? void 0 : _3.disableHelper)) {
+            if (!((_5 = this._customConfig) === null || _5 === void 0 ? void 0 : _5.disableHelper)) {
                 this._helper = this.isIOS
                     ? await helper_ios_1.HelperIOS.make({ spec: this._spec, driver: this, logger: this._logger })
                     : await helper_android_1.HelperAndroid.make({ spec: this._spec, driver: this, logger: this._logger });
@@ -621,6 +626,7 @@ class Driver {
 exports.Driver = Driver;
 async function makeDriver(options) {
     const driver = new Driver(options);
+    await utils.general.sleep(5000);
     await driver.init();
     await driver.refreshContexts();
     return driver;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.9.28",
+  "version": "1.9.30",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -87,9 +87,9 @@
     }
   },
   "dependencies": {
-    "@applitools/logger": "1.1.20",
+    "@applitools/logger": "1.1.21",
     "@applitools/snippets": "2.4.5",
-    "@applitools/types": "1.5.13",
+    "@applitools/types": "1.5.14",
     "@applitools/utils": "1.3.12",
     "semver": "7.3.7"
   },