@applitools/driver 1.9.20 → 1.9.23

package/dist/context.js

@@ -258,16 +258,13 @@ class Context {
             throw new TypeError('Cannot find element using argument of unknown type!');
         }
     }
-    async elements(elementOrSelector) {
-        if (this._spec.isElement(elementOrSelector)) {
-            return [new element_1.Element({ spec: this._spec, context: this, element: elementOrSelector, logger: this._logger })];
-        }
-        else if (specUtils.isSelector(this._spec, elementOrSelector)) {
+    async elements(selectorOrElement) {
+        if (specUtils.isSelector(this._spec, selectorOrElement)) {
             if (this.isRef) {
-                return [new element_1.Element({ spec: this._spec, context: this, selector: elementOrSelector, logger: this._logger })];
+                return [new element_1.Element({ spec: this._spec, context: this, selector: selectorOrElement, logger: this._logger })];
             }
-            this._logger.log('Finding elements by selector: ', elementOrSelector);
-            const root = await this.root(elementOrSelector);
+            this._logger.log('Finding elements by selector: ', selectorOrElement);
+            const root = await this.root(selectorOrElement);
             if (!root)
                 return [];
             const elements = await this._spec.findElements(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), root.shadow && (await root.shadow.getShadowRoot()));
@@ -283,6 +280,9 @@ class Context {
                 });
             });
         }
+        else if (this._spec.isElement(selectorOrElement)) {
+            return [new element_1.Element({ spec: this._spec, context: this, element: selectorOrElement, logger: this._logger })];
+        }
         else {
             throw new TypeError('Cannot find elements using argument of unknown type!');
         }

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, _y, _z, _0, _1, _2;
-        var _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
+        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));
         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 = (_3 = this._driverInfo).pixelRatio) !== null && _f !== void 0 ? _f : (_3.pixelRatio = await this.execute(snippets.getPixelRatio));
-            (_g = (_4 = this._driverInfo).viewportScale) !== null && _g !== void 0 ? _g : (_4.viewportScale = await this.execute(snippets.getViewportScale));
-            (_h = (_5 = this._driverInfo).userAgent) !== null && _h !== void 0 ? _h : (_5.userAgent = await this.execute(snippets.getUserAgent));
+            (_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));
             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 = (_6 = this._driverInfo).platformName) !== null && _l !== void 0 ? _l : (_6.platformName = userAgentInfo.platformName);
-                    (_m = (_7 = this._driverInfo).platformVersion) !== null && _m !== void 0 ? _m : (_7.platformVersion = userAgentInfo.platformVersion);
+                    (_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);
                 }
                 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 = (_8 = this._driverInfo).features) !== null && _q !== void 0 ? _q : (_8.features = {});
-            (_r = (_9 = this._driverInfo.features).allCookies) !== null && _r !== void 0 ? _r : (_9.allCookies = /chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile);
+            (_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);
         }
         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 = (_10 = this._driverInfo).displaySize) !== null && _s !== void 0 ? _s : (_10.displaySize = windowSize);
+            (_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')) &&
                 this._driverInfo.displaySize.height > this._driverInfo.displaySize.width) {
                 this._driverInfo.displaySize = {
@@ -215,17 +215,17 @@ class Driver {
                     }
                 }
                 // bar sizes have to be scaled on android
-                (_11 = this._driverInfo).statusBarSize && (_11.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
-                (_12 = this._driverInfo).navigationBarSize && (_12.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
+                (_12 = this._driverInfo).statusBarSize && (_12.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
+                (_13 = this._driverInfo).navigationBarSize && (_13.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
                 windowSize = utils.geometry.scale(windowSize, 1 / this.pixelRatio);
-                (_13 = this._driverInfo).displaySize && (_13.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
+                (_14 = this._driverInfo).displaySize && (_14.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'))
                     this._driverInfo.statusBarSize = 0;
             }
             // calculate viewport location
-            (_1 = (_14 = this._driverInfo).viewportLocation) !== null && _1 !== void 0 ? _1 : (_14.viewportLocation = {
+            (_1 = (_15 = this._driverInfo).viewportLocation) !== null && _1 !== void 0 ? _1 : (_15.viewportLocation = {
                 x: this.orientation === 'landscape' ? this.navigationBarSize : 0,
                 y: this.statusBarSize,
             });
@@ -256,9 +256,11 @@ class Driver {
                 }
             }
             // init helper lib
-            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 });
+            if (!((_3 = this._customConfig) === null || _3 === void 0 ? void 0 : _3.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 });
+            }
         }
         this._logger.log('Combined driver info', this._driverInfo);
         return this;

package/dist/fake/mock-driver.js

@@ -273,7 +273,7 @@ class MockDriver {
             : null;
     }
     async findElements(selector, rootElement) {
-        const elements = this._elements.get(selector);
+        const elements = this._elements.get(typeof selector === 'string' ? selector : selector.id);
         return elements
             ? elements.filter(element => element.parentContextId === this._contextId &&
                 element.parentRootId === ((rootElement || {}).shadowRootId || null))

package/dist/fake/spec-driver.js

@@ -30,11 +30,15 @@ function isDriver(driver) {
 }
 exports.isDriver = isDriver;
 function isElement(element) {
+    if ((element === null || element === void 0 ? void 0 : element.notting) === true)
+        return false;
     return utils.types.has(element, 'id');
 }
 exports.isElement = isElement;
 function isSelector(selector) {
-    return utils.types.isString(selector) || utils.types.has(selector, ['using', 'value']);
+    if ((selector === null || selector === void 0 ? void 0 : selector.notting) === true)
+        return false;
+    return (utils.types.isString(selector) || utils.types.has(selector, ['using', 'value']) || (selector === null || selector === void 0 ? void 0 : selector.forceSelector) === true);
 }
 exports.isSelector = isSelector;
 function transformSelector(selector) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.9.20",
+  "version": "1.9.23",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -78,9 +78,9 @@
     }
   },
   "dependencies": {
-    "@applitools/logger": "1.1.15",
+    "@applitools/logger": "1.1.16",
     "@applitools/snippets": "2.4.5",
-    "@applitools/types": "1.5.8",
+    "@applitools/types": "1.5.9",
     "@applitools/utils": "1.3.10"
   },
   "devDependencies": {

package/types/context.d.ts

@@ -54,7 +54,7 @@ export declare class Context<TDriver, TContext, TElement, TSelector> {
         selector: types.Selector<TSelector>;
     }>;
     element(elementOrSelector: TElement | types.Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>>;
-    elements(elementOrSelector: TElement | types.Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>[]>;
+    elements(selectorOrElement: types.Selector<TSelector> | TElement): Promise<Element<TDriver, TContext, TElement, TSelector>[]>;
     waitFor(selector: types.Selector<TSelector>, options?: types.WaitOptions): Promise<Element<TDriver, TContext, TElement, TSelector>>;
     execute(script: ((args: any) => any) | string, arg?: any): Promise<any>;
     getContextElement(): Promise<Element<TDriver, TContext, TElement, TSelector>>;