webdriverio 5.11.12 → 5.12.1

package/build/commands/element/dragAndDrop.js

@@ -21,12 +21,16 @@ async function dragAndDrop(target, duration = 100) {
     return this.buttonUp(ACTION_BUTTON);
   }
 
+  const {
+    scrollX,
+    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 + sourceRect.width / 2, 10);
-  const sourceY = parseInt(sourceRect.y + sourceRect.height / 2, 10);
-  const targetX = parseInt(targetRect.x + targetRect.width / 2, 10) - sourceX;
-  const targetY = parseInt(targetRect.y + targetRect.height / 2, 10) - sourceY;
+  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;
   return this.performActions([{
     type: 'pointer',
     id: 'finger1',

package/build/commands/element/moveTo.js

@@ -18,8 +18,12 @@ async function moveTo(xoffset, yoffset) {
     width,
     height
   } = await (0, _utils.getElementRect)(this);
-  const newXoffset = parseInt(x + (typeof xoffset === 'number' ? xoffset : width / 2), 10);
-  const newYoffset = parseInt(y + (typeof yoffset === 'number' ? yoffset : height / 2), 10);
+  const {
+    scrollX,
+    scrollY
+  } = await (0, _utils.getScrollPosition)(this);
+  const newXoffset = parseInt(x + (typeof xoffset === 'number' ? xoffset : width / 2), 10) - scrollX;
+  const newYoffset = parseInt(y + (typeof yoffset === 'number' ? yoffset : height / 2), 10) - scrollY;
   return this.performActions([{
     type: 'pointer',
     id: 'finger1',

package/build/constants.js

@@ -167,9 +167,9 @@ const WDIO_DEFAULTS = {
   beforeFeature: HOOK_DEFINITION,
   beforeScenario: HOOK_DEFINITION,
   beforeStep: HOOK_DEFINITION,
-  afterFeature: HOOK_DEFINITION,
+  afterStep: HOOK_DEFINITION,
   afterScenario: HOOK_DEFINITION,
-  afterStep: HOOK_DEFINITION
+  afterFeature: HOOK_DEFINITION
 };
 exports.WDIO_DEFAULTS = WDIO_DEFAULTS;
 const UNICODE_CHARACTERS = {

package/build/utils.js

@@ -14,6 +14,7 @@ exports.getElementRect = getElementRect;
 exports.getAbsoluteFilepath = getAbsoluteFilepath;
 exports.assertDirectoryExists = assertDirectoryExists;
 exports.validateUrl = validateUrl;
+exports.getScrollPosition = getScrollPosition;
 exports.getElementFromResponse = exports.getPrototype = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
@@ -306,4 +307,8 @@ function validateUrl(url, origError) {
 
     return validateUrl(`http://${url}`, e);
   }
+}
+
+function getScrollPosition(scope) {
+  return getBrowserObject(scope).execute('return { scrollX: this.pageXOffset, scrollY: this.pageYOffset };');
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen WebDriver test automation framework for Node.js",
-  "version": "5.11.12",
+  "version": "5.12.1",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "license": "MIT",
@@ -55,9 +55,9 @@
     "test:unit": "jest"
   },
   "dependencies": {
-    "@wdio/config": "^5.11.0",
-    "@wdio/logger": "^5.11.0",
-    "@wdio/repl": "^5.11.0",
+    "@wdio/config": "^5.12.1",
+    "@wdio/logger": "^5.12.1",
+    "@wdio/repl": "^5.12.1",
     "archiver": "^3.0.0",
     "css-value": "^0.0.1",
     "grapheme-splitter": "^1.0.2",
@@ -68,7 +68,7 @@
     "resq": "^1.5.0",
     "rgb2hex": "^0.1.0",
     "serialize-error": "^4.1.0",
-    "webdriver": "^5.11.12"
+    "webdriver": "^5.12.1"
   },
-  "gitHead": "32d9805f8dee10f0665e31eed14f774aaa48c914"
+  "gitHead": "848151e5fdcb8b694c1a273b9b69852c22875687"
 }

package/webdriverio-core.d.ts

@@ -157,6 +157,8 @@ declare namespace WebdriverIO {
     type TouchActions = string | TouchAction | TouchAction[];
 
     interface Element {
+        "element-6066-11e4-a52e-4f735466cecf"?: string;
+        ELEMENT?: string;
         selector: string;
         elementId: string;
         addCommand(
@@ -298,7 +300,7 @@ declare namespace WebdriverIO {
         getCookies(
             names?: string[]
         ): Cookie[];
-        getWindowSize(): object;
+        getWindowSize(): WebDriver.RectReturn;
         keys(
             value: string | string[]
         ): void;
@@ -345,7 +347,7 @@ declare namespace WebdriverIO {
         ): void;
         uploadFile(
             localPath: string
-        ): void;
+        ): string;
         url(
             url?: string
         ): void;

package/webdriverio.d.ts

@@ -4,7 +4,15 @@ type $ = (selector: string | Function) => Promise<WebdriverIOAsync.Element>;
 type $$ = (selector: string | Function) => Promise<WebdriverIOAsync.Element[]>;
 
 // Element commands that should be wrapper with Promise
-type ElementPromise = Omit<WebdriverIO.Element, 'addCommand' | '$' | '$$' | 'selector' | 'elementId'>;
+type ElementPromise = Omit<WebdriverIO.Element,
+    'addCommand'
+    | '$'
+    | '$$'
+    | 'selector'
+    | 'elementId'
+    | 'element-6066-11e4-a52e-4f735466cecf'
+    | 'ELEMENT'
+>;
 
 // Methods which return async element(s) so non-async equivalents cannot just be promise-wrapped
 interface AsyncSelectors {
@@ -19,7 +27,13 @@ type ElementAsync = {
 } & AsyncSelectors;
 
 // Element commands that should not be wrapper with promise
-type ElementStatic = Pick<WebdriverIO.Element, 'addCommand' | 'selector' | 'elementId'>
+type ElementStatic = Pick<WebdriverIO.Element,
+    'addCommand'
+    | 'selector'
+    | 'elementId'
+    | 'element-6066-11e4-a52e-4f735466cecf'
+    | 'ELEMENT'
+>;
 
 // Browser commands that should be wrapper with Promise
 type BrowserPromise = Omit<WebdriverIO.Browser, 'addCommand' | 'overwriteCommand' | 'options' | '$' | '$$'>;