Merge remote-tracking branch 'origin/sprint-develop' into MQE-494

Author: tomreece

dev/tests/verification/Resources/ActionGroupFunctionalCest.txt

@@ -35,6 +35,14 @@ class ActionGroupFunctionalCest
 		$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
 		$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson);
 		$this->createPersonParam->createEntity();
+		$I->fillField("#foo", "myData1");
+		$I->fillField("#bar", "myData2");
+	}
+
+	public function _after(AcceptanceTester $I)
+	{
+		$I->fillField("#foo", "myData1");
+		$I->fillField("#bar", "myData2");
 	}
 
 	/**
@@ -162,4 +170,15 @@ class ActionGroupFunctionalCest
 		$I->amOnPage("/Jane/Dane.html");
 	}
 
+	/**
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 */
+	public function ArgumentWithSameNameAsElement(AcceptanceTester $I)
+	{
+		$I->seeElement("#element");
+		$I->seeElement("#element .John");
+	}
+
 }

dev/tests/verification/TestModule/ActionGroup/FunctionalActionGroup.xml

@@ -38,4 +38,11 @@
         <see selector="{{SampleSection.oneParamElement(myArg.firstname)}}" mergeKey="see1"/>
         <amOnPage url="{{SamplePage.url(myArg.firstname,myArg.lastname)}}" mergeKey="amOnPage1"/>
     </actionGroup>
+    <actionGroup name="FunctionalActionGroupWithTrickyArgument">
+        <arguments>
+            <argument name="simple" defaultValue="simpleData"/>
+        </arguments>
+        <seeElement mergeKey="see1" selector="{{SampleSection.simpleElement}}"/>
+        <seeElement mergeKey="see2" selector="{{SampleSection.simpleElementOneParam(simple.firstname)}}"/>
+    </actionGroup>
 </config>

dev/tests/verification/TestModule/Cest/ActionGroupFunctionalCest.xml

@@ -18,6 +18,7 @@
         </annotations>
         <before>
             <createData entity="ReplacementPerson" mergeKey="createPersonParam"/>
+            <actionGroup ref="FunctionalActionGroup" mergeKey="beforeGroup"/>
         </before>
         <test name="BasicActionGroupTest">
             <amOnPage mergeKey="step1" url="/someUrl"/>
@@ -67,5 +68,11 @@
                 <argument name="myArg" value="DefaultPerson"/>
             </actionGroup>
         </test>
+        <test name="ArgumentWithSameNameAsElement">
+            <actionGroup ref="FunctionalActionGroupWithTrickyArgument" mergeKey="actionGroup1"/>
+        </test>
+        <after>
+            <actionGroup ref="FunctionalActionGroup" mergeKey="afterGroup"/>
+        </after>
     </cest>
 </config>

dev/tests/verification/TestModule/Section/SampleSection.xml

@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="SampleSection">
         <element name="simpleElement" type="button" selector="#element"/>
+        <element name="simpleElementOneParam" type="button" selector="#element .{{var1}}" parameterized="true"/>
         <element name="oneParamElement" type="button" selector="#element .{{var1}}" parameterized="true"/>
         <element name="twoParamElement" type="button" selector="#{{var1}} .{{var2}}" parameterized="true"/>
         <element name="threeParamElement" type="button" selector="#{{var1}}-{{var2}} .{{var3}}" parameterized="true"/>

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

@@ -217,7 +217,8 @@ private function replaceAttributeArgumentInVariable(
             );
         }
 
-        return  str_replace($variableName, $arguments[$variableName], $attributeValue);
+        //replace argument ONLY when there is no letters attached before after (ex. category.name vs categoryTreeButton)
+        return preg_replace("/(?<![\w]){$variableName}(?![(\w])/", $arguments[$variableName], $attributeValue);
     }
 
     /**

src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd

@@ -69,18 +69,24 @@
     </xs:complexType>
     <xs:complexType name="hookType">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:group ref="actionTypeTags"/>
+            <xs:group ref="testTypeTags"/>
         </xs:choice>
     </xs:complexType>
     <xs:complexType name="testType">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:group ref="actionTypeTags" />
+            <xs:group ref="testTypeTags" />
             <xs:element type="annotationsType" name="annotations" minOccurs="0"/>
-            <xs:element type="actions" name="actionGroup" minOccurs="0"/>
         </xs:choice>
         <xs:attribute type="xs:string" name="name"/>
         <xs:attribute type="xs:boolean" name="remove" default="false"/>
     </xs:complexType>
+    <xs:group name="testTypeTags">
+        <xs:choice>
+            <xs:group ref="actionTypeTags"/>
+            <xs:element type="actions" name="actionGroup" minOccurs="0"/>
+        </xs:choice>
+    </xs:group>
+
     <xs:group name="actionTypeTags">
         <xs:choice>
             <xs:group ref="dataOperationTags"/>