webdriverio 7.1.1 → 7.2.3

package/build/commands/browser/getPuppeteer.js

@@ -41,7 +41,7 @@ const constants_1 = require("../../constants");
  * @return {PuppeteerBrowser}  initiated puppeteer instance connected to the browser
  */
 async function getPuppeteer() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     /**
      * check if we already connected Puppeteer and if so return
      * that instance
@@ -53,7 +53,7 @@ async function getPuppeteer() {
     /**
      * attach to a Selenium 4 CDP Session if it's returned in the capabilities
      */
-    const cdpEndpoint = (_a = caps['se:options']) === null || _a === void 0 ? void 0 : _a.cdp;
+    const cdpEndpoint = caps['se:cdp'];
     if (cdpEndpoint) {
         this.puppeteer = await puppeteer_core_1.default.connect({
             browserWSEndpoint: cdpEndpoint,
@@ -77,7 +77,7 @@ async function getPuppeteer() {
     /**
      * attach to Firefox debugger session
      */
-    if (((_b = caps.browserName) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'firefox') {
+    if (((_a = caps.browserName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'firefox') {
         if (!caps.browserVersion) {
             throw new Error('Can\'t find "browserVersion" in capabilities');
         }
@@ -85,10 +85,10 @@ async function getPuppeteer() {
         if (majorVersion >= 79) {
             const reqCaps = this.requestedCapabilities.alwaysMatch || this.requestedCapabilities;
             const ffOptions = caps['moz:firefoxOptions'];
-            const ffArgs = (_c = reqCaps['moz:firefoxOptions']) === null || _c === void 0 ? void 0 : _c.args;
+            const ffArgs = (_b = reqCaps['moz:firefoxOptions']) === null || _b === void 0 ? void 0 : _b.args;
             const rdPort = ffOptions && ffOptions.debuggerAddress
                 ? ffOptions.debuggerAddress
-                : (_d = ffArgs === null || ffArgs === void 0 ? void 0 : ffArgs[ffArgs.findIndex((arg) => arg === constants_1.FF_REMOTE_DEBUG_ARG) + 1]) !== null && _d !== void 0 ? _d : null;
+                : (_c = ffArgs === null || ffArgs === void 0 ? void 0 : ffArgs[ffArgs.findIndex((arg) => arg === constants_1.FF_REMOTE_DEBUG_ARG) + 1]) !== null && _c !== void 0 ? _c : null;
             if (!rdPort) {
                 throw new Error('Could\'t find remote debug port in Firefox options');
             }

package/build/commands/browser/url.js

@@ -39,7 +39,7 @@ function url(path) {
     if (typeof path !== 'string') {
         throw new Error('Parameter for "url" command needs to be type of string');
     }
-    if (typeof this.options.baseUrl === 'string') {
+    if (typeof this.options.baseUrl === 'string' && this.options.baseUrl) {
         path = (new URL(path, this.options.baseUrl)).href;
     }
     return this.navigateTo(utils_1.validateUrl(path));

package/build/commands/browser/waitUntil.d.ts

@@ -40,5 +40,5 @@ import type { WaitUntilOptions } from '../../types';
  * @type utility
  *
  */
-export default function waitUntil(this: WebdriverIO.Browser | WebdriverIO.Element, condition: () => boolean | Promise<boolean>, { timeout, interval, timeoutMsg }?: Partial<WaitUntilOptions>): any;
+export default function waitUntil(this: WebdriverIO.Browser | WebdriverIO.Element, condition: () => boolean | Promise<boolean>, { timeout, interval, timeoutMsg }?: Partial<WaitUntilOptions>): Promise<true | void>;
 //# sourceMappingURL=waitUntil.d.ts.map

package/build/commands/browser/waitUntil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"waitUntil.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/waitUntil.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAC7B,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,EAC/C,SAAS,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,EAC3C,EACI,OAAqC,EACrC,QAAuC,EACvC,UAAU,EACb,GAAE,OAAO,CAAC,gBAAgB,CAAM,OA6BpC"}
+{"version":3,"file":"waitUntil.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/waitUntil.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAC7B,IAAI,EAAE,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,EAC/C,SAAS,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,EAC3C,EACI,OAAqC,EACrC,QAAuC,EACvC,UAAU,EACb,GAAE,OAAO,CAAC,gBAAgB,CAAM,GAClC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CA4BtB"}

package/build/commands/element/dragAndDrop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dragAndDrop.d.ts","sourceRoot":"","sources":["../../../src/commands/element/dragAndDrop.ts"],"names":[],"mappings":"AAMA,aAAK,kBAAkB,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,aAAK,kBAAkB,GAAG;IACtB,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,CAAC,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAA8B,WAAW,CACrC,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,MAAM,EAAE,WAAW,CAAC,OAAO,GAAG,kBAAkB,EAChD,EAAE,QAAa,EAAE,GAAE,kBAAuB,iBAkF7C"}
+{"version":3,"file":"dragAndDrop.d.ts","sourceRoot":"","sources":["../../../src/commands/element/dragAndDrop.ts"],"names":[],"mappings":"AAOA,aAAK,kBAAkB,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,aAAK,kBAAkB,GAAG;IACtB,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,CAAC,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAA8B,WAAW,CACrC,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,MAAM,EAAE,WAAW,CAAC,OAAO,GAAG,kBAAkB,EAChD,EAAE,QAAa,EAAE,GAAE,kBAAuB,iBAyE7C"}

package/build/commands/element/dragAndDrop.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../utils");
+const constants_1 = require("../../constants");
 const ACTION_BUTTON = 0;
 const sleep = (time = 0) => new Promise((resolve) => setTimeout(resolve, time));
 /**
@@ -73,23 +73,12 @@ async function dragAndDrop(target, { duration = 10 } = {}) {
         await sleep(duration);
         return this.buttonUp(ACTION_BUTTON);
     }
-    /**
-     * get coordinates to drag and drop
-     */
-    const { scrollX, scrollY } = await utils_1.getScrollPosition(this);
-    const sourceRect = await utils_1.getElementRect(this);
-    const sourceX = Math.floor(sourceRect.x - scrollX + (sourceRect.width / 2));
-    const sourceY = Math.floor(sourceRect.y - scrollY + (sourceRect.height / 2));
-    let targetX, targetY;
-    if (isMovingToElement) {
-        const targetRect = await utils_1.getElementRect(moveToElement);
-        targetX = Math.floor(targetRect.x - scrollX + (targetRect.width / 2) - sourceX);
-        targetY = Math.floor(targetRect.y - scrollY + (targetRect.height / 2) - sourceY);
-    }
-    else {
-        targetX = moveToCoordinates.x;
-        targetY = moveToCoordinates.y;
-    }
+    const sourceRef = { [constants_1.ELEMENT_KEY]: this[constants_1.ELEMENT_KEY] };
+    const targetRef = { [constants_1.ELEMENT_KEY]: moveToElement[constants_1.ELEMENT_KEY] };
+    const origin = sourceRef;
+    const targetOrigin = isMovingToElement ? targetRef : 'pointer';
+    const targetX = isMovingToElement ? 0 : moveToCoordinates.x;
+    const targetY = isMovingToElement ? 0 : moveToCoordinates.y;
     /**
      * W3C way of handle the drag and drop action
      */
@@ -98,10 +87,10 @@ async function dragAndDrop(target, { duration = 10 } = {}) {
             id: 'finger1',
             parameters: { pointerType: 'mouse' },
             actions: [
-                { type: 'pointerMove', duration: 0, x: sourceX, y: sourceY },
+                { type: 'pointerMove', duration: 0, origin, x: 0, y: 0 },
                 { type: 'pointerDown', button: ACTION_BUTTON },
                 { type: 'pause', duration: 10 },
-                { type: 'pointerMove', duration, origin: 'pointer', x: targetX, y: targetY },
+                { type: 'pointerMove', duration, origin: targetOrigin, x: targetX, y: targetY },
                 { type: 'pointerUp', button: ACTION_BUTTON }
             ]
         }]).then(() => this.releaseActions());

package/build/commands/element/waitForClickable.d.ts

@@ -24,5 +24,5 @@ import type { WaitForOptions } from '../../types';
  * @return {Boolean} `true` if element is clickable (or doesn't if flag is set)
  *
  */
-export default function waitForClickable(this: WebdriverIO.Element, { timeout, interval, reverse, timeoutMsg }?: WaitForOptions): Promise<any>;
+export default function waitForClickable(this: WebdriverIO.Element, { timeout, interval, reverse, timeoutMsg }?: WaitForOptions): Promise<true | void>;
 //# sourceMappingURL=waitForClickable.d.ts.map

package/build/commands/element/waitForClickable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"waitForClickable.d.ts","sourceRoot":"","sources":["../../../src/commands/element/waitForClickable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAA8B,gBAAgB,CAC1C,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,EACI,OAAqC,EACrC,QAAuC,EACvC,OAAe,EACf,UAAsG,EACzG,GAAE,cAAmB,gBAMzB"}
+{"version":3,"file":"waitForClickable.d.ts","sourceRoot":"","sources":["../../../src/commands/element/waitForClickable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAA8B,gBAAgB,CAC1C,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,EACI,OAAqC,EACrC,QAAuC,EACvC,OAAe,EACf,UAAsG,EACzG,GAAE,cAAmB,wBAMzB"}

package/build/commands/element/waitForDisplayed.d.ts

@@ -34,5 +34,5 @@ import type { WaitForOptions } from '../../types';
  * @type utility
  *
  */
-export default function waitForDisplayed(this: WebdriverIO.Element, { timeout, interval, reverse, timeoutMsg }?: WaitForOptions): Promise<any>;
+export default function waitForDisplayed(this: WebdriverIO.Element, { timeout, interval, reverse, timeoutMsg }?: WaitForOptions): Promise<true | void>;
 //# sourceMappingURL=waitForDisplayed.d.ts.map

package/build/commands/element/waitForDisplayed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"waitForDisplayed.d.ts","sourceRoot":"","sources":["../../../src/commands/element/waitForDisplayed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAA8B,gBAAgB,CAC1C,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,EACI,OAAqC,EACrC,QAAuC,EACvC,OAAe,EACf,UAAsG,EACzG,GAAE,cAAmB,gBAMzB"}
+{"version":3,"file":"waitForDisplayed.d.ts","sourceRoot":"","sources":["../../../src/commands/element/waitForDisplayed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAA8B,gBAAgB,CAC1C,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,EACI,OAAqC,EACrC,QAAuC,EACvC,OAAe,EACf,UAAsG,EACzG,GAAE,cAAmB,wBAMzB"}

package/build/commands/element/waitForEnabled.d.ts

@@ -35,5 +35,5 @@ import type { WaitForOptions } from '../../types';
  * @type utility
  *
  */
-export default function waitForEnabled(this: WebdriverIO.Element, { timeout, interval, reverse, timeoutMsg }?: WaitForOptions): Promise<any>;
+export default function waitForEnabled(this: WebdriverIO.Element, { timeout, interval, reverse, timeoutMsg }?: WaitForOptions): Promise<true | void>;
 //# sourceMappingURL=waitForEnabled.d.ts.map

package/build/commands/element/waitForEnabled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"waitForEnabled.d.ts","sourceRoot":"","sources":["../../../src/commands/element/waitForEnabled.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAA8B,cAAc,CACxC,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,EACI,OAAqC,EACrC,QAAuC,EACvC,OAAe,EACf,UAAoG,EACvG,GAAE,cAAmB,gBAazB"}
+{"version":3,"file":"waitForEnabled.d.ts","sourceRoot":"","sources":["../../../src/commands/element/waitForEnabled.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAA8B,cAAc,CACxC,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,EACI,OAAqC,EACrC,QAAuC,EACvC,OAAe,EACf,UAAoG,EACvG,GAAE,cAAmB,wBAazB"}

package/build/commands/element/waitForExist.d.ts

@@ -35,5 +35,5 @@ import type { WaitForOptions } from '../../types';
  * @type utility
  *
  */
-export default function waitForExist(this: WebdriverIO.Element, { timeout, interval, reverse, timeoutMsg }?: WaitForOptions): any;
+export default function waitForExist(this: WebdriverIO.Element, { timeout, interval, reverse, timeoutMsg }?: WaitForOptions): Promise<true | void>;
 //# sourceMappingURL=waitForExist.d.ts.map

package/build/commands/element/waitForExist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"waitForExist.d.ts","sourceRoot":"","sources":["../../../src/commands/element/waitForExist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAChC,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,EACI,OAAqC,EACrC,QAAuC,EACvC,OAAe,EACf,UAAqG,EACxG,GAAE,cAAmB,OAMzB"}
+{"version":3,"file":"waitForExist.d.ts","sourceRoot":"","sources":["../../../src/commands/element/waitForExist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAChC,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,EACI,OAAqC,EACrC,QAAuC,EACvC,OAAe,EACf,UAAqG,EACxG,GAAE,cAAmB,wBAMzB"}

package/build/utils/findStrategy.js

@@ -14,7 +14,7 @@ const XPATH_SELECTORS_START = [
     '/', '(', '../', './', '*/'
 ];
 const NAME_MOBILE_SELECTORS_START = [
-    'uia', 'xcuielementtype', 'android.widget', 'cyi'
+    'uia', 'xcuielementtype', 'android.widget', 'cyi', 'android.view'
 ];
 const XPATH_SELECTOR_REGEXP = [
     // HTML tag

package/build/utils/index.js

@@ -262,7 +262,7 @@ function verifyArgsAndStripIfElement(args) {
         if (lodash_isobject_1.default(arg) && arg.constructor.name === 'Element') {
             const elem = arg;
             if (!elem.elementId) {
-                throw new Error(`The element with selector "${elem.selector}" you trying to pass into the execute method wasn't found`);
+                throw new Error(`The element with selector "${elem.selector}" you are trying to pass into the execute method wasn't found`);
             }
             return {
                 [constants_1.ELEMENT_KEY]: elem.elementId,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen browser and mobile automation test framework for Node.js",
-  "version": "7.1.1",
+  "version": "7.2.3",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "license": "MIT",
@@ -57,19 +57,19 @@
   },
   "dependencies": {
     "@types/aria-query": "^4.2.1",
-    "@wdio/config": "7.1.1",
+    "@wdio/config": "7.2.1",
     "@wdio/logger": "7.0.0",
     "@wdio/protocols": "7.1.1",
-    "@wdio/repl": "7.1.1",
-    "@wdio/types": "7.1.1",
-    "@wdio/utils": "7.1.1",
+    "@wdio/repl": "7.2.1",
+    "@wdio/types": "7.2.1",
+    "@wdio/utils": "7.2.1",
     "archiver": "^5.0.0",
     "aria-query": "^4.2.2",
     "atob": "^2.1.2",
     "css-shorthand-properties": "^1.1.1",
     "css-value": "^0.0.1",
-    "devtools": "7.1.1",
-    "devtools-protocol": "^0.0.856957",
+    "devtools": "7.2.1",
+    "devtools-protocol": "^0.0.863986",
     "fs-extra": "^9.0.1",
     "get-port": "^5.1.1",
     "grapheme-splitter": "^1.0.2",
@@ -82,7 +82,7 @@
     "resq": "^1.9.1",
     "rgb2hex": "0.2.3",
     "serialize-error": "^8.0.0",
-    "webdriver": "7.1.1"
+    "webdriver": "7.2.1"
   },
-  "gitHead": "39b675448969b8548e119a28a1ebc065ec3e6914"
+  "gitHead": "773eb18dcc851d35fc9136c21848b723906a055a"
 }