MQE-881: Cannot Pass Arguments In Action Groups To X, Y Attributes On Actions

MQE-877: Passing Multiple Element References In Selector Parameters Does Not Generate Correctly When Element(s) Are Parameterized

- added verification tests

Author: okolesnyk

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -70,6 +70,8 @@ class BasicFunctionalTestCest
 		$I->click(".functionalTestSelector");
 		$I->clickWithLeftButton(".functionalTestSelector");
 		$I->clickWithRightButton(".functionalTestSelector");
+		$I->clickWithLeftButton("#element#element .200", 200, 300);
+		$I->clickWithRightButton("#element .4123#element", 200, 300);
 		$I->closeTab();
 		$I->conditionalClick(".functionalTestSelector", ".functionalDependentTestSelector", true);
 		$I->dontSee("someInput", ".functionalTestSelector");

dev/tests/verification/TestModule/Data/ReplacementData.xml

@@ -26,4 +26,8 @@
         <data key="sampleField2">moreData</data>
         <requiredEntity type="test2">originalValue2</requiredEntity>
     </entity>
+    <entity name="offset" type="simpleData">
+        <data key="x">200</data>
+        <data key="y">300</data>
+    </entity>
 </entities>

dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml

@@ -32,6 +32,8 @@
         <click selector=".functionalTestSelector" stepKey="clickKey1"/>
         <clickWithLeftButton selector=".functionalTestSelector" stepKey="clickWithLeftButtonKey1"/>
         <clickWithRightButton selector=".functionalTestSelector" stepKey="clickWithRightButtonKey1"/>
+        <clickWithLeftButton selector="{{SampleSection.simpleElement}}{{SampleSection.simpleElementOneParam(offset.x)}}" x="{{offset.x}}" y="{{offset.y}}" stepKey="clickWithLeftButtonKeyXY1" />
+        <clickWithRightButton selector="{{SampleSection.simpleElementOneParam('4123')}}{{SampleSection.simpleElement}}" x="{{offset.x}}" y="{{offset.y}}" stepKey="clickWithRightButtonKeyXY1" />
         <closeTab stepKey="closeTabKey1"/>
         <conditionalClick selector=".functionalTestSelector" dependentSelector=".functionalDependentTestSelector" visible="true" stepKey="conditionalClickKey1"/>
         <dontSee userInput="someInput" selector=".functionalTestSelector" stepKey="dontSeeKey1" />

src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

@@ -40,7 +40,7 @@ class ActionObject
     const ACTION_ATTRIBUTE_URL = 'url';
     const ACTION_ATTRIBUTE_SELECTOR = 'selector';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
-    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.?[\w\[\]]+}})|({{[\w]+\.[\w]+\(.+\)}})/';
+    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\(.+\)}})/';
 
     /**
      * The unique identifier for the action

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -832,7 +832,7 @@ private function generateStepsPhp($actionObjects, $hookObject = false)
                     break;
                 case "switchToNextTab":
                 case "switchToPreviousTab":
-                    $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $this->stripWrappedQuotes($input));
+                    $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $input);
                     break;
                 case "clickWithLeftButton":
                 case "clickWithRightButton":