MQE-2140: [chrome81] dragAndDrop with x and y offsets no longer works

Author: soumyau

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -745,20 +745,22 @@ public function _before(TestInterface $test)
      */
     public function dragAndDrop($source, $target, $xOffset = null, $yOffset = null)
     {
-        if ($xOffset !== null || $yOffset !== null) {
-            $snodes = $this->matchFirstOrFail($this->baseElement, $source);
-            $tnodes = $this->matchFirstOrFail($this->baseElement, $target);
+        $snodes = $this->matchFirstOrFail($this->baseElement, $source);
+        $tnodes = $this->matchFirstOrFail($this->baseElement, $target);
+        $action = new WebDriverActions($this->webDriver);
 
+        if ($xOffset !== null || $yOffset !== null) {
             $targetX = intval($tnodes->getLocation()->getX() + $xOffset);
             $targetY = intval($tnodes->getLocation()->getY() + $yOffset);
 
             $travelX = intval($targetX - $snodes->getLocation()->getX());
             $travelY = intval($targetY - $snodes->getLocation()->getY());
 
-            $action = new WebDriverActions($this->webDriver);
             $action->dragAndDropBy($snodes, $travelX, $travelY)->perform();
         } else {
-            parent::dragAndDrop($source, $target);
+            $action->clickAndHold($snodes)->perform();
+            $action->moveToElement($tnodes)->perform();
+            $action->release($tnodes)->perform();
         }
     }
 
@@ -933,7 +935,6 @@ public function makeScreenshot($name = null)
         if (!is_dir($debugDir)) {
             mkdir($debugDir, 0777);
         }
-        $screenName = $debugDir . DIRECTORY_SEPARATOR . $name . '.png';
         $this->_saveScreenshot($screenName);
         $this->debug("Screenshot saved to $screenName");
         AllureHelper::addAttachmentToCurrentStep($screenName, 'Screenshot');