MQE-1185: MFTF DragAndDrop Action Is Not Using X, Y Offsets Correctly

Author: jilu1

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -596,17 +596,42 @@ public function _before(TestInterface $test)
      */
     public function dragAndDrop($source, $target, $xOffset = null, $yOffset = null)
     {
-        if ($xOffset !== null || $yOffset !== null) {
+        if ($xOffset === null && $yOffset === null) {
+            parent::dragAndDrop($source, $target);
+        } else {
             $snodes = $this->matchFirstOrFail($this->baseElement, $source);
             $tnodes = $this->matchFirstOrFail($this->baseElement, $target);
 
+            $sHeight = $snodes->getSize()->getHeight();
+            $sWidth = $snodes->getSize()->getWidth();
+
+            echo '$sHeight = ' . $sHeight . PHP_EOL;
+            echo '$sWidth = ' . $sWidth . PHP_EOL;
+
+            echo '$tHeight = ' . $tnodes->getSize()->getHeight() . PHP_EOL;
+            echo '$tWidth = ' . $tnodes->getSize()->getWidth() . PHP_EOL;
+
+            echo '$sX = ' . $snodes->getLocation()->getX() . PHP_EOL;
+            echo '$sY = ' . $snodes->getLocation()->getY() . PHP_EOL;
+
+            echo '$tX = ' . $tnodes->getLocation()->getX() . PHP_EOL;
+            echo '$tY = ' . $tnodes->getLocation()->getY() . PHP_EOL;
+
             $travelX = intval($tnodes->getLocation()->getX() - $snodes->getLocation()->getX() + $xOffset);
             $travelY = intval($tnodes->getLocation()->getY() - $snodes->getLocation()->getY() + $yOffset);
 
+            echo '$travelX = ' . $travelX . PHP_EOL;
+            echo '$travelY = ' . $travelY . PHP_EOL;
+
             $action = new WebDriverActions($this->webDriver);
-            $action->dragAndDropBy($snodes, $travelX, $travelY)->perform();
-        } else {
-            parent::dragAndDrop($source, $target);
+            if ($travelX >0 && $travelY >0 && $travelX < $sWidth && $travelY < $sHeight) {
+                $action->moveToElement($snodes)->perform();
+                $action->clickAndHold($snodes)->perform();
+                $action->moveByOffset($travelX, $travelY)->perform();
+                $action->release()->perform();
+            } else {
+                $action->dragAndDropBy($snodes, $travelX, $travelY)->perform();
+            }
         }
     }