webdriverio 5.22.1 → 5.23.0

package/build/commands/element/dragAndDrop.js

@@ -10,14 +10,22 @@ var _utils = require("../../utils");
 const ACTION_BUTTON = 0;
 
 async function dragAndDrop(target, duration = 100) {
-  if (!target || target.constructor.name !== 'Element') {
+  if (!target || target.constructor.name !== 'Element' && (!target.x || !target.y)) {
     throw new Error('command dragAndDrop requires an WebdriverIO Element as first parameter');
   }
 
+  const moveToElement = target.constructor.name === 'Element';
+
   if (!this.isW3C) {
     await this.moveTo();
     await this.buttonDown(ACTION_BUTTON);
-    await target.moveTo();
+
+    if (moveToElement) {
+      await target.moveTo();
+    } else {
+      await this.moveToElement(null, target.x, target.y);
+    }
+
     return this.buttonUp(ACTION_BUTTON);
   }
 
@@ -26,11 +34,19 @@ async function dragAndDrop(target, duration = 100) {
     scrollY
   } = await (0, _utils.getScrollPosition)(this);
   const sourceRect = await (0, _utils.getElementRect)(this);
-  const targetRect = await (0, _utils.getElementRect)(target);
   const sourceX = parseInt(sourceRect.x - scrollX + sourceRect.width / 2, 10);
   const sourceY = parseInt(sourceRect.y - scrollY + sourceRect.height / 2, 10);
-  const targetX = parseInt(targetRect.x - scrollX + targetRect.width / 2, 10) - sourceX;
-  const targetY = parseInt(targetRect.y - scrollY + targetRect.height / 2, 10) - sourceY;
+  let targetX, targetY;
+
+  if (moveToElement) {
+    const targetRect = await (0, _utils.getElementRect)(target);
+    targetX = parseInt(targetRect.x - scrollX + targetRect.width / 2, 10) - sourceX;
+    targetY = parseInt(targetRect.y - scrollY + targetRect.height / 2, 10) - sourceY;
+  } else {
+    targetX = target.x;
+    targetY = target.y;
+  }
+
   return this.performActions([{
     type: 'pointer',
     id: 'finger1',

package/build/multiremote.js

@@ -63,7 +63,7 @@ class MultiRemote {
   }
 
   static elementWrapper(instances, result, propertiesObject) {
-    const prototype = _objectSpread({}, propertiesObject, {}, (0, _lodash2.default)((0, _utils2.getPrototype)('element')), {
+    const prototype = _objectSpread(_objectSpread(_objectSpread({}, propertiesObject), (0, _lodash2.default)((0, _utils2.getPrototype)('element'))), {}, {
       scope: 'element'
     });
 

package/build/scripts/isElementClickable.js

@@ -13,14 +13,16 @@ function isElementClickable(elem) {
   const isOldEdge = !!window.StyleMedia;
   const scrollIntoViewFullSupport = !(window.safari || isOldEdge);
 
-  function getOverlappingElement(elem, context = document) {
+  function getOverlappingElement(elem, context) {
+    context = context || document;
     const elemDimension = elem.getBoundingClientRect();
     const x = elemDimension.left + elem.clientWidth / 2;
     const y = elemDimension.top + elem.clientHeight / 2;
     return context.elementFromPoint(x, y);
   }
 
-  function getOverlappingRects(elem, context = document) {
+  function getOverlappingRects(elem, context) {
+    context = context || document;
     const elems = [];
     const rects = elem.getClientRects();
     const rect = rects[0];
@@ -31,7 +33,7 @@ function isElementClickable(elem) {
   }
 
   function getOverlappingElements(elem, context) {
-    return [getOverlappingElement(elem, context), ...getOverlappingRects(elem, context)];
+    return [getOverlappingElement(elem, context)].concat(getOverlappingRects(elem, context));
   }
 
   function nodeContains(elem, otherNode) {
@@ -57,20 +59,27 @@ function isElementClickable(elem) {
   }
 
   function isOverlappingElementMatch(elementsFromPoint, elem) {
-    if (elementsFromPoint.some(elementFromPoint => elementFromPoint === elem || nodeContains(elem, elementFromPoint))) {
+    if (elementsFromPoint.some(function (elementFromPoint) {
+      return elementFromPoint === elem || nodeContains(elem, elementFromPoint);
+    })) {
       return true;
     }
 
-    let elemsWithShadowRoot = [...new Set(elementsFromPoint)];
-    elemsWithShadowRoot = elemsWithShadowRoot.filter(x => x && x.shadowRoot && x.shadowRoot.elementFromPoint);
+    let elemsWithShadowRoot = [].concat(elementsFromPoint);
+    elemsWithShadowRoot = elemsWithShadowRoot.filter(function (x) {
+      return x && x.shadowRoot && x.shadowRoot.elementFromPoint;
+    });
     let shadowElementsFromPoint = [];
 
-    for (let shadowElement of elemsWithShadowRoot) {
-      shadowElementsFromPoint.push(...getOverlappingElements(elem, shadowElement.shadowRoot));
+    for (let i = 0; i < elemsWithShadowRoot.length; ++i) {
+      let shadowElement = elemsWithShadowRoot[i];
+      shadowElementsFromPoint = shadowElementsFromPoint.concat(getOverlappingElements(elem, shadowElement.shadowRoot));
     }
 
-    shadowElementsFromPoint = [...new Set(shadowElementsFromPoint)];
-    shadowElementsFromPoint = shadowElementsFromPoint.filter(x => !elementsFromPoint.includes(x));
+    shadowElementsFromPoint = [].concat(shadowElementsFromPoint);
+    shadowElementsFromPoint = shadowElementsFromPoint.filter(function (x) {
+      return !elementsFromPoint.includes(x);
+    });
 
     if (shadowElementsFromPoint.length === 0) {
       return false;

package/build/scripts/newWindow.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = newWindow;
 
-function newWindow(url, windowName = 'new window', windowFeatures = '') {
-  window.open(url, windowName, windowFeatures);
+function newWindow(url, windowName, windowFeatures) {
+  window.open(url, windowName || 'new window', windowFeatures || '');
 }

package/build/scripts/resq.js

@@ -11,7 +11,9 @@ const waitToLoadReact = function waitToLoadReact() {
 
 exports.waitToLoadReact = waitToLoadReact;
 
-const react$ = function react$(selector, props = {}, state = {}, reactElement) {
+const react$ = function react$(selector, props, state, reactElement) {
+  props = props || {};
+  state = state || {};
   let element = window.resq.resq$(selector, reactElement);
 
   if (Object.keys(props).length) {

package/build/utils/getElementObject.js

@@ -26,7 +26,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 const getElement = function findElement(selector, res, isReactElement = false) {
   const browser = (0, _utils2.getBrowserObject)(this);
 
-  const propertiesObject = _objectSpread({}, (0, _lodash.default)(browser.__propertiesObject__), {}, (0, _utils2.getPrototype)('element'), {
+  const propertiesObject = _objectSpread(_objectSpread(_objectSpread({}, (0, _lodash.default)(browser.__propertiesObject__)), (0, _utils2.getPrototype)('element')), {}, {
     scope: 'element'
   });
 
@@ -69,7 +69,7 @@ exports.getElement = getElement;
 const getElements = function getElements(selector, elemResponse, isReactElement = false) {
   const browser = (0, _utils2.getBrowserObject)(this);
 
-  const propertiesObject = _objectSpread({}, (0, _lodash.default)(browser.__propertiesObject__), {}, (0, _utils2.getPrototype)('element'), {
+  const propertiesObject = _objectSpread(_objectSpread(_objectSpread({}, (0, _lodash.default)(browser.__propertiesObject__)), (0, _utils2.getPrototype)('element')), {}, {
     scope: 'element'
   });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen WebDriver test automation framework for Node.js",
-  "version": "5.22.1",
+  "version": "5.23.0",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "license": "MIT",
@@ -56,10 +56,10 @@
     "test:unit": "jest"
   },
   "dependencies": {
-    "@wdio/config": "5.18.4",
+    "@wdio/config": "5.22.4",
     "@wdio/logger": "5.16.10",
-    "@wdio/repl": "5.18.6",
-    "@wdio/utils": "5.18.6",
+    "@wdio/repl": "5.23.0",
+    "@wdio/utils": "5.23.0",
     "archiver": "^3.0.0",
     "css-value": "^0.0.1",
     "grapheme-splitter": "^1.0.2",
@@ -70,7 +70,7 @@
     "resq": "^1.6.0",
     "rgb2hex": "^0.1.0",
     "serialize-error": "^5.0.0",
-    "webdriver": "5.22.1"
+    "webdriver": "5.23.0"
   },
-  "gitHead": "35907149e4faa3f84e3cb4803b54606ab31b11fa"
+  "gitHead": "a9b8098ad18074e05a72c0458a7845a41a40aa93"
 }

package/webdriverio-core-v5.d.ts

@@ -195,6 +195,11 @@ declare namespace WebdriverIO {
         y?: number
     }
 
+    type DragAndDropCoordinate = {
+        x: number,
+        y: number
+    }
+
     interface Element {
         selector: string;
         elementId: string;
@@ -300,7 +305,7 @@ declare namespace WebdriverIO {
          * Drag an item to a destination element.
          */
         dragAndDrop(
-            target: Element,
+            target: Element | DragAndDropCoordinate,
             duration?: number
         ): void;
 
@@ -585,7 +590,7 @@ declare namespace WebdriverIO {
         script?: number
     }
 
-    interface Browser {
+    interface Browser extends WebDriver.BaseClient {
         config: Config;
         options: RemoteOptions;
 

package/webdriverio-core.d.ts

@@ -195,6 +195,11 @@ declare namespace WebdriverIO {
         y?: number
     }
 
+    type DragAndDropCoordinate = {
+        x: number,
+        y: number
+    }
+
     interface Element {
         selector: string;
         elementId: string;
@@ -300,7 +305,7 @@ declare namespace WebdriverIO {
          * Drag an item to a destination element.
          */
         dragAndDrop(
-            target: Element,
+            target: Element | DragAndDropCoordinate,
             duration?: number
         ): Promise<void>;
 
@@ -585,7 +590,7 @@ declare namespace WebdriverIO {
         script?: number
     }
 
-    interface Browser {
+    interface Browser extends WebDriver.BaseClient {
         config: Config;
         options: RemoteOptions;
 

package/webdriverio.d.ts

@@ -42,7 +42,7 @@ type ElementStatic = Pick<WebdriverIO.Element,
 >;
 
 // Browser commands that should be wrapper with Promise
-type BrowserPromise = Omit<WebdriverIO.Browser, 'addCommand' | 'overwriteCommand' | 'options' | 'config' | '$' | '$$' | 'touchAction'>;
+type BrowserPromise = Omit<WebdriverIO.Browser, 'addCommand' | 'overwriteCommand' | 'options' | 'config' | '$' | '$$' | 'touchAction' | 'sessionId' | 'capabilities' | 'requestedCapabilities' | 'isMobile' | 'isIOS' | 'isAndroid'>;
 
 // Browser commands wrapper with Promise
 type BrowserAsync = {
@@ -72,6 +72,10 @@ declare namespace WebdriverIOAsync {
     interface TouchAction extends TouchActionSync {
         element?: Element
     }
+    type DragAndDropCoordinate = {
+        x: number,
+        y: number
+    }
     type TouchActions = string | TouchAction | TouchAction[];
     interface Browser extends BrowserAsync, BrowserStatic {
         waitUntil(
@@ -95,7 +99,7 @@ declare namespace WebdriverIOAsync {
     }
 
     interface Element extends ElementAsync, ElementStatic {
-        dragAndDrop(target: Element, duration?: number): Promise<void>;
+        dragAndDrop(target: Element | DragAndDropCoordinate, duration?: number): Promise<void>;
         touchAction(action: TouchActions): Promise<void>;
     }
     interface ElementArray extends Array<Element> {
@@ -107,7 +111,7 @@ declare namespace WebdriverIOAsync {
 
     interface Config { }
 
-    interface BrowserObject extends WebDriver.ClientOptions, WebDriver.ClientAsync, WebdriverIOAsync.Browser { }
+    interface BrowserObject extends WebDriver.ClientOptions, WebDriver.BaseClient, WebdriverIOAsync.Browser { }
 }
 
 declare namespace WebdriverIO {
@@ -120,4 +124,4 @@ declare var $$: $$;
 
 declare module "webdriverio" {
     export = WebdriverIOAsync
-}
+}