MQE-812: Tests/Action Groups should infer order based on the top level argument

dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt

@@ -0,0 +1,38 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ */
+class ActionGroupMergedViaInsertAfterCest
+{
+	/**
+	 * @Features({"TestModule"})
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function ActionGroupMergedViaInsertAfter(AcceptanceTester $I)
+	{
+		$I->fillField("#foo", "foo");
+		$I->fillField("#bar", "bar");
+		$I->click("#foo2");
+		$I->click("#bar2");
+		$I->click("#baz2");
+		$I->fillField("#baz", "baz");
+	}
+}

dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt

@@ -0,0 +1,38 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ */
+class ActionGroupMergedViaInsertBeforeCest
+{
+	/**
+	 * @Features({"TestModule"})
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function ActionGroupMergedViaInsertBefore(AcceptanceTester $I)
+	{
+		$I->fillField("#foo", "foo");
+		$I->click("#foo2");
+		$I->click("#bar2");
+		$I->click("#baz2");
+		$I->fillField("#bar", "bar");
+		$I->fillField("#baz", "baz");
+	}
+}

dev/tests/verification/Resources/MergeMassViaInsertAfter.txt

@@ -0,0 +1,38 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ */
+class MergeMassViaInsertAfterCest
+{
+	/**
+	 * @Features({"TestModule"})
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function MergeMassViaInsertAfter(AcceptanceTester $I)
+	{
+		$I->fillField("#foo", "foo");
+		$I->fillField("#bar", "bar");
+		$I->click("#mergeOne");
+		$I->click("#mergeTwo");
+		$I->click("#mergeThree");
+		$I->fillField("#baz", "baz");
+	}
+}

dev/tests/verification/Resources/MergeMassViaInsertBefore.txt

@@ -0,0 +1,38 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ */
+class MergeMassViaInsertBeforeCest
+{
+	/**
+	 * @Features({"TestModule"})
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function MergeMassViaInsertBefore(AcceptanceTester $I)
+	{
+		$I->fillField("#foo", "foo");
+		$I->click("#mergeOne");
+		$I->click("#mergeTwo");
+		$I->click("#mergeThree");
+		$I->fillField("#bar", "bar");
+		$I->fillField("#baz", "baz");
+	}
+}

dev/tests/verification/Resources/MergedActionGroupTest.txt

@@ -70,9 +70,9 @@ class MergedActionGroupTestCest
 	 */
 	public function MergedActionGroupTest(AcceptanceTester $I)
 	{
-		$I->see("#element .Jane");
 		$I->see(".merge .Jane");
-		$I->click(".merge .Dane");
+		$I->see("#element .Jane");
 		$I->amOnPage("/Jane/Dane.html");
+		$I->click(".merge .Dane");
 	}
 }

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

@@ -50,6 +50,16 @@
         <grabTextFrom selector=".class" stepKey="grabTextData"/>
         <fillField stepKey="fill1" selector=".{$grabTextData}" userInput="$createSimpleData.field$"/>
     </actionGroup>
+    <actionGroup name="FunctionalActionGroupForMassMergeBefore">
+        <fillField selector="#foo" userInput="foo" stepKey="fillField1"/>
+        <fillField selector="#bar" userInput="bar" stepKey="fillField2"/>
+        <fillField selector="#baz" userInput="baz" stepKey="fillField3"/>
+    </actionGroup>
+    <actionGroup name="FunctionalActionGroupForMassMergeAfter">
+        <fillField selector="#foo" userInput="foo" stepKey="fillField1"/>
+        <fillField selector="#bar" userInput="bar" stepKey="fillField2"/>
+        <fillField selector="#baz" userInput="baz" stepKey="fillField3"/>
+    </actionGroup>
     <actionGroup name="FunctionalActionGroupWithXmlAndPersistedData">
         <arguments>
             <argument name="xmlData" defaultValue="uniqueData"/>

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

@@ -13,4 +13,16 @@
         <click stepKey="myMergedClick" selector=".merge .{{myArg.lastname}}" after="amOnPage1"/>
         <remove keyForRemoval="deleteMe"/>
     </actionGroup>
+
+    <actionGroup name="FunctionalActionGroupForMassMergeBefore" insertBefore="fillField2">
+        <click stepKey="mergeBeforeBar" selector="#foo2"/>
+        <click stepKey="mergeAfterFoo2" selector="#bar2"/>
+        <click stepKey="mergeAfterBar2" selector="#baz2"/>
+    </actionGroup>
+
+    <actionGroup name="FunctionalActionGroupForMassMergeAfter" insertAfter="fillField2">
+        <click stepKey="mergeAfterBar" selector="#foo2"/>
+        <click stepKey="mergeAfterFoo2" selector="#bar2"/>
+        <click stepKey="mergeAfterBar2" selector="#baz2"/>
+    </actionGroup>
 </actionGroups>

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

@@ -182,6 +182,12 @@
             <actionGroup ref="FunctionalActionGroup" stepKey="afterGroup"/>
         </after>
     </test>
+    <test name="ActionGroupMergedViaInsertBefore">
+        <actionGroup ref="FunctionalActionGroupForMassMergeBefore" stepKey="keyone"/>
+    </test>
+    <test name="ActionGroupMergedViaInsertAfter">
+        <actionGroup ref="FunctionalActionGroupForMassMergeAfter" stepKey="keyone"/>
+    </test>
     <test name="PersistedAndXmlEntityArguments">
         <actionGroup ref="FunctionalActionGroupWithXmlAndPersistedData" stepKey="afterGroup">
             <argument name="persistedData" value="$persistedInTest$"/>

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

@@ -119,4 +119,14 @@
         <waitForJS function="someJsFunction" time="30" stepKey="waitForJSKey1" />
         <waitForText selector=".functionalTestSelector" userInput="someInput" time="30" stepKey="waitForText1"/>
     </test>
+    <test name="MergeMassViaInsertBefore">
+        <fillField selector="#foo" userInput="foo" stepKey="fillField1"/>
+        <fillField selector="#bar" userInput="bar" stepKey="fillField2"/>
+        <fillField selector="#baz" userInput="baz" stepKey="fillField3"/>
+    </test>
+    <test name="MergeMassViaInsertAfter">
+        <fillField selector="#foo" userInput="foo" stepKey="fillField1"/>
+        <fillField selector="#bar" userInput="bar" stepKey="fillField2"/>
+        <fillField selector="#baz" userInput="baz" stepKey="fillField3"/>
+    </test>
 </tests>

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

@@ -45,4 +45,14 @@
         <fillField stepKey="fillField1" selector="{{SampleSection.mergeElement}}" userInput="{{DefaultPerson.mergedField}}"/>
         <fillField stepKey="fillField2" selector="{{SampleSection.newElement}}" userInput="{{DefaultPerson.newField}}" />
     </test>
+    <test name="MergeMassViaInsertBefore" insertBefore="fillField2">
+        <click stepKey="clickOne" selector="#mergeOne"/>
+        <click stepKey="clickTwo" selector="#mergeTwo"/>
+        <click stepKey="clickThree" selector="#mergeThree"/>
+    </test>
+    <test name="MergeMassViaInsertAfter" insertAfter="fillField2">
+        <click stepKey="clickOne" selector="#mergeOne"/>
+        <click stepKey="clickTwo" selector="#mergeTwo"/>
+        <click stepKey="clickThree" selector="#mergeThree"/>
+    </test>
 </tests>

dev/tests/verification/Tests/ActionGroupMergeGenerationTest.php

@@ -108,4 +108,26 @@ public function testArgumentWithSameNameAsElement()
     {
         $this->generateAndCompareTest('ArgumentWithSameNameAsElement');
     }
+
+    /**
+     * Test an action group with a merge counterpart that's merged via insertBefore
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testMergedActionGroupViaInsertBefore()
+    {
+        $this->generateAndCompareTest('ActionGroupMergedViaInsertBefore');
+    }
+
+    /**
+     * Test an action group with a merge counterpart that's merged via insertAfter
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testMergedActionGroupViaInsertAfter()
+    {
+        $this->generateAndCompareTest('ActionGroupMergedViaInsertAfter');
+    }
 }

dev/tests/verification/Tests/MergedGenerationTest.php

@@ -40,4 +40,26 @@ public function testParsedArray()
         $entity = DataObjectHandler::getInstance()->getObject('testEntity');
         $this->assertCount(3, $entity->getLinkedEntities());
     }
+
+    /**
+     * Tests generation of a test merge file via insertBefore
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testMergeMassViaInsertBefore()
+    {
+        $this->generateAndCompareTest('MergeMassViaInsertBefore');
+    }
+
+    /**
+     * Tests generation of a test merge file via insertBefore
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testMergeMassViaInsertAfter()
+    {
+        $this->generateAndCompareTest('MergeMassViaInsertAfter');
+    }
 }

src/Magento/FunctionalTestingFramework/Test/Config/ActionGroupDom.php

@@ -30,9 +30,25 @@ public function initDom($xml, $filename = null, $exceptionCollector = null)
                 /** @var \DOMElement $actionGroupNode */
                 $actionGroupNode->setAttribute(self::TEST_META_FILENAME_ATTRIBUTE, $filename);
                 $this->validateDomStepKeys($actionGroupNode, $filename, 'Action Group', $exceptionCollector);
+                if ($actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_AFTER) !== "") {
+                    $this->appendMergePointerToActions(
+                        $actionGroupNode,
+                        self::TEST_MERGE_POINTER_AFTER,
+                        $actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_AFTER),
+                        $filename,
+                        $exceptionCollector
+                    );
+                } elseif ($actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_BEFORE) !== "") {
+                    $this->appendMergePointerToActions(
+                        $actionGroupNode,
+                        self::TEST_MERGE_POINTER_BEFORE,
+                        $actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_BEFORE),
+                        $filename,
+                        $exceptionCollector
+                    );
+                }
             }
         }
-
         return $dom;
     }
 }