Merge branch 'bug-fixes' of github.com:magento/magento2-functional-testing-framework into develop

okolesnyk · okolesnyk · commit a75d1f496999 · 2018-03-27T15:56:47.000+03:00
diff --git a/dev/tests/verification/Resources/BasicFunctionalTest.txt b/dev/tests/verification/Resources/BasicFunctionalTest.txt
@@ -60,6 +60,8 @@ class BasicFunctionalTestCest
 	 */
 	public function BasicFunctionalTest(AcceptanceTester $I)
 	{
+		$I->comment("");
+		$I->comment("");
 		$someVarDefinition = $I->grabValueFrom();
 		$I->acceptPopup();
 		$I->amOnPage("/test/url");
@@ -70,6 +72,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");
diff --git a/dev/tests/verification/TestModule/Data/ReplacementData.xml b/dev/tests/verification/TestModule/Data/ReplacementData.xml
@@ -26,4 +26,12 @@
         <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>
+    <entity name="emptyData" type="backend">
+        <data key="noData"></data>
+        <data key="definitelyNoData"/>
+    </entity>
 </entities>
diff --git a/dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml b/dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml
@@ -22,6 +22,8 @@
         <after>
             <amOnPage url="/afterUrl" stepKey="afterAmOnPageKey"/>
         </after>
+        <comment stepKey="basicCommentWithNoData" userInput="{{emptyData.noData}}"/>
+        <comment stepKey="basicCommentWithDefinitelyNoData" userInput="{{emptyData.definitelyNoData}}"/>
         <grabValueFrom stepKey="someVarDefinition"/>
         <acceptPopup stepKey="acceptPopupKey1"/>
         <amOnPage stepKey="amOnPageKey1" url="/test/url"/>
@@ -32,6 +34,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" />
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
@@ -206,7 +206,7 @@ private function resolveUrlReference($urlIn, $entityObjects)
                         EntityDataObject::CEST_UNIQUE_VALUE
                     );
                     if (null !== $param) {
-                        $urlOut = str_replace($paramValue, $param, $urlIn);
+                        $urlOut = str_replace($paramValue, $param, $urlOut);
                         continue;
                     }
                 }
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -20,7 +20,7 @@
 class ActionObject
 {
     const __ENV = "_ENV";
-    const DATA_ENABLED_ATTRIBUTES = ["userInput", "parameterArray", "expected", "actual"];
+    const DATA_ENABLED_ATTRIBUTES = ["userInput", "parameterArray", "expected", "actual", "x", "y"];
     const SELECTOR_ENABLED_ATTRIBUTES = [
         'selector',
         'dependentSelector',
@@ -40,8 +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\[\]]+}}/';
-    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS= '/{{[\w]+\.[\w]+\(.+\)}}/';
+    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\(.+\)}})/';
 
     /**
      * The unique identifier for the action
@@ -371,7 +370,7 @@ private function resolveDataInputReferences()
         foreach ($relevantDataAttributes as $dataAttribute) {
             $varInput = $this->actionAttributes[$dataAttribute];
             $replacement = $this->findAndReplaceReferences(DataObjectHandler::getInstance(), $varInput);
-            if ($replacement != null) {
+            if ($replacement !== null) {
                 $this->resolvedCustomAttributes[$dataAttribute] = $replacement;
             }
         }
@@ -444,7 +443,7 @@ private function stripAndReturnParameters($reference)
     private function findAndReplaceReferences($objectHandler, $inputString)
     {
         //look for parameter area, if so use different regex
-        $regex = $this->resolveRegexPatternForReference($inputString);
+        $regex = ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN;
 
         preg_match_all($regex, $inputString, $matches);
 
@@ -482,7 +481,7 @@ private function findAndReplaceReferences($objectHandler, $inputString)
                 $replacement = $this->resolveEntityDataObjectReference($obj, $match);
             }
 
-            if ($replacement == null) {
+            if ($replacement === null) {
                 if (get_class($objectHandler) != DataObjectHandler::class) {
                     return $this->findAndReplaceReferences(DataObjectHandler::getInstance(), $outputString);
                 } else {
@@ -514,20 +513,6 @@ private function validateUrlAreaAgainstActionType($obj)
         }
     }
 
-    /**
-     * Determines whether the given $inputString has (params), and returns the appropriate regex for use in matching.
-     * @param string $inputString
-     * @return string
-     */
-    private function resolveRegexPatternForReference($inputString)
-    {
-        if (preg_match(ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS, $inputString) === 1) {
-            return ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS;
-        } else {
-            return ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN;
-        }
-    }
-
     /**
      * Gets the object's dataByName with given $match, differentiating behavior between <array> and <data> nodes.
      * @param string $obj
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -839,7 +839,7 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                     break;
                 case "switchToNextTab":
                 case "switchToPreviousTab":
-                    $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $this->stripWrappedQuotes($input));
+                    $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $input);
                     break;
                 case "clickWithLeftButton":
                 case "clickWithRightButton":
@@ -1595,6 +1595,9 @@ private function wrapFunctionCall($actor, $action, ...$args)
             if (!$isFirst) {
                 $output .= ', ';
             }
+            if ($args[$i] === "") {
+                $args[$i] = '"' . $args[$i] . '"';
+            }
             $output .= $args[$i];
             $isFirst = false;
         }
@@ -1626,6 +1629,9 @@ private function wrapFunctionCallWithReturnValue($returnVariable, $actor, $actio
             if (!$isFirst) {
                 $output .= ', ';
             }
+            if ($args[$i] === "") {
+                $args[$i] = '"' . $args[$i] . '"';
+            }
             $output .= $args[$i];
             $isFirst = false;
         }

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ private function resolveUrlReference($urlIn, $entityObjects)`
`206`	`206`	`EntityDataObject::CEST_UNIQUE_VALUE`
`207`	`207`	`);`
`208`	`208`	`if (null !== $param) {`
`209`		`- $urlOut = str_replace($paramValue, $param, $urlIn);`
	`209`	`+ $urlOut = str_replace($paramValue, $param, $urlOut);`
`210`	`210`	`continue;`
`211`	`211`	`}`
`212`	`212`	`}`