@applitools/driver 1.9.9 → 1.9.12

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');
@@ -58,19 +58,22 @@ class HelperAndroid {
     async getContentSize(element) {
         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 +85,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 +104,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 +117,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.9",
+  "version": "1.9.12",
   "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/snippets": "2.4.3",
-    "@applitools/types": "1.5.5",
-    "@applitools/utils": "1.3.9"
+    "@applitools/logger": "1.1.14",
+    "@applitools/snippets": "2.4.4",
+    "@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;
     });