php-webdriver · OndraM · Feb 14, 2020 · Feb 12, 2020 · Feb 13, 2020 · Feb 12, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Fixed
 - Accept array as possible input to `sendKeys()` method. (Unintentional BC break in 1.8.0.)
+- Use relative offset when moving mouse pointer in W3C WebDriver mode.
 
 ## 1.8.0 - 2020-02-10
 ### Added

diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
@@ -245,7 +245,7 @@ public function keyUp(WebDriverElement $element = null, $key = null)
 
     /**
      * Send keys by keyboard.
-     * If $element is provided, focus on that element first.
+     * If $element is provided, focus on that element first (using single mouse click).
      *
      * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
      * @param WebDriverElement $element

diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
@@ -10,6 +10,13 @@
  */
 class RemoteMouse implements WebDriverMouse
 {
+    /** @internal */
+    const BUTTON_LEFT = 0;
+    /** @internal */
+    const BUTTON_MIDDLE = 1;
+    /** @internal */
+    const BUTTON_RIGHT = 2;
+
     /**
      * @var RemoteExecuteMethod
      */
@@ -54,7 +61,7 @@ public function click(WebDriverCoordinates $where = null)
 
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::CLICK, [
-            'button' => 0,
+            'button' => self::BUTTON_LEFT,
         ]);
 
         return $this;
@@ -78,13 +85,11 @@ public function contextClick(WebDriverCoordinates $where = null)
                         'actions' => array_merge($moveAction, [
                             [
                                 'type' => 'pointerDown',
-                                'duration' => 0,
-                                'button' => 2,
+                                'button' => self::BUTTON_RIGHT,
                             ],
                             [
                                 'type' => 'pointerUp',
-                                'duration' => 0,
-                                'button' => 2,
+                                'button' => self::BUTTON_RIGHT,
                             ],
                         ]),
                     ],
@@ -96,7 +101,7 @@ public function contextClick(WebDriverCoordinates $where = null)
 
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::CLICK, [
-            'button' => 2,
+            'button' => self::BUTTON_RIGHT,
         ]);
 
         return $this;
@@ -150,8 +155,7 @@ public function mouseDown(WebDriverCoordinates $where = null)
                             $this->createMoveAction($where),
                             [
                                 'type' => 'pointerDown',
-                                'duration' => 0,
-                                'button' => 0,
+                                'button' => self::BUTTON_LEFT,
                             ],
                         ],
                     ],
@@ -229,8 +233,7 @@ public function mouseUp(WebDriverCoordinates $where = null)
                         'actions' => array_merge($moveAction, [
                             [
                                 'type' => 'pointerUp',
-                                'duration' => 0,
-                                'button' => 0,
+                                'button' => self::BUTTON_LEFT,
                             ],
                         ]),
                     ],
@@ -270,13 +273,15 @@ private function createMoveAction(
     ) {
         $move_action = [
             'type' => 'pointerMove',
-            'duration' => 0,
+            'duration' => 100, // to simulate human delay
             'x' => $x_offset === null ? 0 : $x_offset,
             'y' => $y_offset === null ? 0 : $y_offset,
         ];
 
         if ($where !== null) {
             $move_action['origin'] = [JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $where->getAuxiliary()];
+        } else {
+            $move_action['origin'] = 'pointer';
         }
 
         return $move_action;
@@ -290,13 +295,11 @@ private function createClickActions()
         return [
             [
                 'type' => 'pointerDown',
-                'duration' => 0,
-                'button' => 0,
+                'button' => self::BUTTON_LEFT,
             ],
             [
                 'type' => 'pointerUp',
-                'duration' => 0,
-                'button' => 0,
+                'button' => self::BUTTON_LEFT,
             ],
         ];
     }

diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
@@ -9,6 +9,8 @@
  */
 class RemoteKeyboardTest extends WebDriverTestCase
 {
+    use RetrieveEventsTrait;
+
     /**
      * @group exclude-firefox
      * Firefox does not properly support keyboard actions:
@@ -55,7 +57,7 @@ public function testShouldPressSendAndReleaseKeys()
                     'keyup "Shift"',
                     'keyup "f"',
                 ],
-                $this->retrieveLoggedEvents()
+                $this->retrieveLoggedKeyboardEvents()
             );
         } else {
             $this->assertEquals(
@@ -79,18 +81,8 @@ public function testShouldPressSendAndReleaseKeys()
                     'keydown "f"',
                     'keyup "f"',
                 ],
-                $this->retrieveLoggedEvents()
+                $this->retrieveLoggedKeyboardEvents()
             );
         }
     }
-
-    /**
-     * @return array
-     */
-    private function retrieveLoggedEvents()
-    {
-        $logElement = $this->driver->findElement(WebDriverBy::id('keyboardEventsLog'));
-
-        return explode("\n", $logElement->getText());
-    }
 }
diff --git a/tests/functional/RetrieveEventsTrait.php b/tests/functional/RetrieveEventsTrait.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
+trait RetrieveEventsTrait
+{
+    /** @var RemoteWebDriver $driver */
+    public $driver;
+
+    /**
+     * @return array
+     */
+    private function retrieveLoggedKeyboardEvents()
+    {
+        $logElement = $this->driver->findElement(WebDriverBy::id('keyboardEventsLog'));
+
+        return explode("\n", $logElement->getText());
+    }
+
+    /**
+     * @return array
+     */
+    private function retrieveLoggedMouseEvents()
+    {
+        $logElement = $this->driver->findElement(WebDriverBy::id('mouseEventsLog'));
+
+        return explode("\n", $logElement->getText());
+    }
+}