@applitools/driver 1.9.8 → 1.9.11

package/dist/driver.js

@@ -144,8 +144,8 @@ 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;
-        var _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
+        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;
+        var _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
         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 ? (0, capabilities_1.parseCapabilities)(capabilities, this._customConfig) : undefined;
@@ -156,29 +156,29 @@ class Driver {
                 (_e = (await this.getOrientation().catch(() => undefined))) !== null && _e !== void 0 ? _e : this._driverInfo.orientation;
         }
         if (this.isWeb) {
-            (_f = (_y = this._driverInfo).pixelRatio) !== null && _f !== void 0 ? _f : (_y.pixelRatio = await this.execute(snippets.getPixelRatio));
-            (_g = (_z = this._driverInfo).viewportScale) !== null && _g !== void 0 ? _g : (_z.viewportScale = await this.execute(snippets.getViewportScale));
-            (_h = (_0 = this._driverInfo).userAgent) !== null && _h !== void 0 ? _h : (_0.userAgent = await this.execute(snippets.getUserAgent));
+            (_f = (_1 = this._driverInfo).pixelRatio) !== null && _f !== void 0 ? _f : (_1.pixelRatio = await this.execute(snippets.getPixelRatio));
+            (_g = (_2 = this._driverInfo).viewportScale) !== null && _g !== void 0 ? _g : (_2.viewportScale = await this.execute(snippets.getViewportScale));
+            (_h = (_3 = this._driverInfo).userAgent) !== null && _h !== void 0 ? _h : (_3.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;
                 if (this._driverInfo.isMobile) {
-                    (_l = (_1 = this._driverInfo).platformName) !== null && _l !== void 0 ? _l : (_1.platformName = userAgentInfo.platformName);
-                    (_m = (_2 = this._driverInfo).platformVersion) !== null && _m !== void 0 ? _m : (_2.platformVersion = userAgentInfo.platformVersion);
+                    (_l = (_4 = this._driverInfo).platformName) !== null && _l !== void 0 ? _l : (_4.platformName = userAgentInfo.platformName);
+                    (_m = (_5 = this._driverInfo).platformVersion) !== null && _m !== void 0 ? _m : (_5.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;
                 }
             }
-            (_q = (_3 = this._driverInfo).features) !== null && _q !== void 0 ? _q : (_3.features = {});
-            (_r = (_4 = this._driverInfo.features).allCookies) !== null && _r !== void 0 ? _r : (_4.allCookies = /chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile);
+            (_q = (_6 = this._driverInfo).features) !== null && _q !== void 0 ? _q : (_6.features = {});
+            (_r = (_7 = this._driverInfo.features).allCookies) !== null && _r !== void 0 ? _r : (_7.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 = (_5 = this._driverInfo).displaySize) !== null && _s !== void 0 ? _s : (_5.displaySize = windowSize);
+            (_s = (_8 = this._driverInfo).displaySize) !== null && _s !== void 0 ? _s : (_8.displaySize = windowSize);
             if (this.isAndroid) {
                 // bar sizes could be extracted only on android
                 const systemBars = await ((_u = (_t = this._spec).getSystemBars) === null || _u === void 0 ? void 0 : _u.call(_t, this.target).catch(() => null));
@@ -197,47 +197,39 @@ 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[this.orientation.startsWith('landscape') ? 'width' : 'height'];
+                    const navigationBarSize = navigationBar[((_w = this.orientation) === null || _w === void 0 ? void 0 : _w.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[this.orientation.startsWith('landscape') ? 'width' : 'height']) {
-                        this._driverInfo.navigationBarSize = Math.max((_w = this._driverInfo.navigationBarSize) !== null && _w !== void 0 ? _w : 0, navigationBarSize);
+                        this._driverInfo.displaySize[((_x = this.orientation) === null || _x === void 0 ? void 0 : _x.startsWith('landscape')) ? 'width' : 'height']) {
+                        this._driverInfo.navigationBarSize = Math.max((_y = this._driverInfo.navigationBarSize) !== null && _y !== void 0 ? _y : 0, navigationBarSize);
                     }
                     else {
                         this._driverInfo.navigationBarSize = 0;
                     }
                 }
                 // bar sizes have to be scaled on android
-                (_6 = this._driverInfo).statusBarSize && (_6.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
-                (_7 = this._driverInfo).navigationBarSize && (_7.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
+                (_9 = this._driverInfo).statusBarSize && (_9.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
+                (_10 = this._driverInfo).navigationBarSize && (_10.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
                 windowSize = utils.geometry.scale(windowSize, 1 / this.pixelRatio);
-                (_8 = this._driverInfo).displaySize && (_8.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
+                (_11 = this._driverInfo).displaySize && (_11.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
             }
             // calculate viewport location
-            (_x = (_9 = this._driverInfo).viewportLocation) !== null && _x !== void 0 ? _x : (_9.viewportLocation = {
+            (_z = (_12 = this._driverInfo).viewportLocation) !== null && _z !== void 0 ? _z : (_12.viewportLocation = {
                 x: this.orientation === 'landscape' ? this.navigationBarSize : 0,
                 y: this.statusBarSize,
             });
             // calculate viewport size
             if (!this._driverInfo.viewportSize) {
-                if (this.navigationBarSize > 1) {
-                    if (this.orientation.startsWith('landscape')) {
-                        this._driverInfo.viewportSize = {
-                            width: this._driverInfo.displaySize.height - this.navigationBarSize,
-                            height: this._driverInfo.displaySize.width - this.statusBarSize,
-                        };
-                    }
-                    else {
-                        this._driverInfo.viewportSize = {
-                            width: this._driverInfo.displaySize.width,
-                            height: this._driverInfo.displaySize.height - this.statusBarSize - this.navigationBarSize,
-                        };
-                    }
+                if ((_0 = this.orientation) === null || _0 === void 0 ? void 0 : _0.startsWith('landscape')) {
+                    this._driverInfo.viewportSize = {
+                        width: this._driverInfo.displaySize.height - this.navigationBarSize,
+                        height: this._driverInfo.displaySize.width - this.statusBarSize,
+                    };
                 }
                 else {
                     this._driverInfo.viewportSize = {
-                        width: windowSize.width,
-                        height: windowSize.height - this.statusBarSize,
+                        width: this._driverInfo.displaySize.width,
+                        height: this._driverInfo.displaySize.height - this.statusBarSize - this.navigationBarSize,
                     };
                 }
             }
@@ -540,7 +532,7 @@ class Driver {
         throw new Error('Failed to set viewport size!');
     }
     async getDisplaySize() {
-        var _a;
+        var _a, _b;
         if (this.isWeb && !this.isMobile)
             return;
         if ((_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.displaySize) {
@@ -548,7 +540,7 @@ class Driver {
             return this._driverInfo.displaySize;
         }
         let size = await this._spec.getWindowSize(this.target);
-        if ((await this.getOrientation()).startsWith('landscape') && size.height > size.width) {
+        if (((_b = (await this.getOrientation())) === null || _b === void 0 ? void 0 : _b.startsWith('landscape')) && size.height > size.width) {
             size = { width: size.height, height: size.width };
         }
         const normalizedSize = this.isAndroid ? utils.geometry.scale(size, 1 / this.pixelRatio) : size;

package/dist/helper-android.js

@@ -28,7 +28,8 @@ const utils = __importStar(require("@applitools/utils"));
 class HelperAndroid {
     constructor(options) {
         this._spec = options.spec;
-        this._element = options.element;
+        this._input = options.input;
+        this._action = options.action;
         this._legacy = options.legacy;
         this._logger = options.logger;
         this.name = this._legacy ? 'android-legacy' : 'android';
@@ -36,18 +37,17 @@ class HelperAndroid {
     static async make(options) {
         const { spec, driver, logger } = options;
         let legacy = false;
-        let element = await driver.element({
-            type: 'xpath',
-            selector: '//*[@content-desc="EyesAppiumHelperEDT"]',
-        });
-        if (!element) {
+        let input = await driver.element({ type: 'xpath', selector: '//*[@content-desc="EyesAppiumHelperEDT"]' });
+        if (!input) {
             legacy = true;
-            element = await driver.element({
-                type: '-android uiautomator',
-                selector: 'new UiSelector().description("EyesAppiumHelper")',
-            });
+            input = await driver.element({ type: 'xpath', selector: '//*[@content-desc="EyesAppiumHelper"]' });
         }
-        return element ? new HelperAndroid({ spec, element, legacy, logger }) : null;
+        const action = !legacy
+            ? await driver.element({ type: 'xpath', selector: '//*[@content-desc="EyesAppiumHelper_Action"]' })
+            : null;
+        return input
+            ? new HelperAndroid({ spec, input, action, legacy, logger })
+            : null;
     }
     async _getElementId(element) {
         const resourceId = await element.getAttribute('resource-id');
@@ -56,21 +56,25 @@ class HelperAndroid {
         return resourceId.split('/')[1];
     }
     async getContentSize(element) {
+        console.log('getContentSize', !!this._action);
         let contentHeightString;
         if (this._legacy) {
-            await this._element.click();
-            contentHeightString = await this._element.getText();
+            await this._input.click();
+            contentHeightString = await this._input.getText();
         }
         else {
             const elementId = await this._getElementId(element);
             if (!elementId)
                 return null;
-            await this._element.type(`offset;${elementId};0;0;0`);
-            await this._element.click();
-            contentHeightString = await this._element.getText();
-            await this._element.type('');
+            await this._input.type(`offset;${elementId};0;0;0`);
+            if (this._action)
+                await this._action.type('1');
+            else
+                await this._input.click();
+            contentHeightString = await this._input.getText();
+            await this._input.type('');
         }
-        const region = await this._spec.getElementRegion(this._element.driver.target, element.target);
+        const region = await this._spec.getElementRegion(this._input.driver.target, element.target);
         const contentHeight = Number(contentHeightString);
         if (Number.isNaN(contentHeight))
             return utils.geometry.size(region);
@@ -82,10 +86,13 @@ class HelperAndroid {
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
-        await this._element.type(`getRect;${elementId};0;0`);
-        await this._element.click();
-        const regionString = await this._element.getText();
-        await this._element.type('');
+        await this._input.type(`getRect;${elementId};0;0`);
+        if (this._action)
+            await this._action.type('1');
+        else
+            await this._input.click();
+        const regionString = await this._input.getText();
+        await this._input.type('');
         const [, x, y, height, width] = regionString.match(/\[(-?\d+(?:\.\d+)?);(-?\d+(?:\.\d+)?);(-?\d+(?:\.\d+)?);(-?\d+(?:\.\d+)?)\]/);
         const region = { x: Number(x), y: Number(y), width: Number(width), height: Number(height) };
         if (Number.isNaN(region.x + region.y + region.width + region.height))
@@ -98,9 +105,12 @@ class HelperAndroid {
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
-        await this._element.type(`moveToTop;${elementId};0;-1`);
-        await this._element.click();
-        await this._element.type('');
+        await this._input.type(`moveToTop;${elementId};0;-1`);
+        if (this._action)
+            await this._action.type('1');
+        else
+            await this._input.click();
+        await this._input.type('');
     }
     async scrollBy(element, offset) {
         if (this._legacy)
@@ -108,17 +118,23 @@ class HelperAndroid {
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
-        await this._element.type(`scroll;${elementId};${offset.y};0;0`);
-        await this._element.click();
-        await this._element.type('');
+        await this._input.type(`scroll;${elementId};${offset.y};0;0`);
+        if (this._action)
+            await this._action.type('1');
+        else
+            await this._input.click();
+        await this._input.type('');
     }
     async getTouchPadding() {
         if (this._legacy)
             return null;
-        await this._element.type(`getTouchPadding;0;0;0;0`);
-        await this._element.click();
-        const touchPaddingString = await this._element.getText();
-        await this._element.type('');
+        await this._input.type(`getTouchPadding;0;0;0;0`);
+        if (this._action)
+            await this._action.type('1');
+        else
+            await this._input.click();
+        const touchPaddingString = await this._input.getText();
+        await this._input.type('');
         const touchPadding = Number(touchPaddingString);
         if (Number.isNaN(touchPadding))
             return null;

package/dist/spec-utils.js

@@ -40,10 +40,12 @@ function transformSelector(spec, selector, environment) {
     if ((environment === null || environment === void 0 ? void 0 : environment.isWeb) && isCommonSelector(spec, selector)) {
         if (selector.type === 'id')
             selector = { type: 'css', selector: `#${selector.selector}` };
-        if (selector.type === 'name')
+        else if (selector.type === 'name')
             selector = { type: 'css', selector: `[name="${selector.selector}"]` };
-        if (selector.type === 'class name')
+        else if (selector.type === 'class name')
             selector = { type: 'css', selector: `.${selector.selector}` };
+        else if (selector.type === 'tag name')
+            selector = { type: 'css', selector: `${selector.selector}` };
     }
     return (_b = (_a = spec.transformSelector) === null || _a === void 0 ? void 0 : _a.call(spec, selector)) !== null && _b !== void 0 ? _b : selector;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.9.8",
+  "version": "1.9.11",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "git://github.com/applitools/eyes.sdk.javascript1.git",
-    "directory": "packages/driver"
+    "directory": "js/packages/driver"
   },
   "license": "SEE LICENSE IN LICENSE",
   "author": {
@@ -64,7 +64,9 @@
   "scripts": {
     "lint": "eslint '**/*.ts'",
     "build": "tsc",
-    "test": "mocha --no-timeouts -r ts-node/register ./test/**/*.spec.ts",
+    "test": "yarn test:unit",
+    "test:sanity": "yarn test:unit",
+    "test:unit": "mocha --no-timeouts -r ts-node/register ./test/unit/*.spec.ts",
     "deps": "bongo deps",
     "preversion": "bongo preversion",
     "version": "bongo version",
@@ -76,13 +78,13 @@
     }
   },
   "dependencies": {
-    "@applitools/logger": "1.1.13",
+    "@applitools/logger": "1.1.14",
     "@applitools/snippets": "2.4.3",
-    "@applitools/types": "1.5.5",
-    "@applitools/utils": "1.3.9"
+    "@applitools/types": "1.5.6",
+    "@applitools/utils": "1.3.10"
   },
   "devDependencies": {
-    "@applitools/bongo": "^2.1.5",
+    "@applitools/bongo": "^2.1.6",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "@typescript-eslint/eslint-plugin": "^5.22.0",

package/types/helper-android.d.ts

@@ -9,13 +9,15 @@ export declare class HelperAndroid<TDriver, TContext, TElement, TSelector> {
         logger: Logger;
     }): Promise<HelperAndroid<TDriver, TContext, TElement, TSelector> | null>;
     private readonly _spec;
-    private readonly _element;
+    private readonly _input;
+    private readonly _action?;
     private readonly _legacy;
     private _logger;
     readonly name: 'android' | 'android-legacy';
     constructor(options: {
         spec: types.SpecDriver<TDriver, TContext, TElement, TSelector>;
-        element: Element<TDriver, TContext, TElement, TSelector>;
+        input: Element<TDriver, TContext, TElement, TSelector>;
+        action?: Element<TDriver, TContext, TElement, TSelector>;
         legacy: boolean;
         logger?: any;
     });