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

KevinBKozan · KevinBKozan · commit ca7f802e74df · 2018-05-08T08:48:45.000-05:00
- CR fixes
diff --git a/dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt b/dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt
@@ -29,9 +29,9 @@ class ActionGroupMergedViaInsertAfterCest
 	{
 		$I->fillField("#foo", "foo");
 		$I->fillField("#bar", "bar");
-		$I->click("#mergeOne");
-		$I->click("#mergeTwo");
-		$I->click("#mergeThree");
+		$I->click("#foo2");
+		$I->click("#bar2");
+		$I->click("#baz2");
 		$I->fillField("#baz", "baz");
 	}
 }
diff --git a/dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt b/dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt
@@ -28,9 +28,9 @@ class ActionGroupMergedViaInsertBeforeCest
 	public function ActionGroupMergedViaInsertBefore(AcceptanceTester $I)
 	{
 		$I->fillField("#foo", "foo");
-		$I->click("#mergeOne");
-		$I->click("#mergeTwo");
-		$I->click("#mergeThree");
+		$I->click("#foo2");
+		$I->click("#bar2");
+		$I->click("#baz2");
 		$I->fillField("#bar", "bar");
 		$I->fillField("#baz", "baz");
 	}
diff --git a/dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml b/dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml
@@ -15,14 +15,14 @@
     </actionGroup>
 
     <actionGroup name="FunctionalActionGroupForMassMergeBefore" insertBefore="fillField2">
-        <click stepKey="clickOne" selector="#mergeOne"/>
-        <click stepKey="clickTwo" selector="#mergeTwo"/>
-        <click stepKey="clickThree" selector="#mergeThree"/>
+        <click stepKey="mergeAfterBaz" selector="#foo2"/>
+        <click stepKey="mergeAfterFoo2" selector="#bar2"/>
+        <click stepKey="mergeAfterBar2" selector="#baz2"/>
     </actionGroup>
 
     <actionGroup name="FunctionalActionGroupForMassMergeAfter" insertAfter="fillField2">
-        <click stepKey="clickOne" selector="#mergeOne"/>
-        <click stepKey="clickTwo" selector="#mergeTwo"/>
-        <click stepKey="clickThree" selector="#mergeThree"/>
+        <click stepKey="mergeAfterBaz" selector="#foo2"/>
+        <click stepKey="mergeAfterFoo2" selector="#bar2"/>
+        <click stepKey="mergeAfterBar2" selector="#baz2"/>
     </actionGroup>
 </actionGroups>
diff --git a/src/Magento/FunctionalTestingFramework/Test/Config/Dom.php b/src/Magento/FunctionalTestingFramework/Test/Config/Dom.php
@@ -123,20 +123,18 @@ protected function appendMergePointerToActions($testNode, $insertType, $insertKe
         }
         for ($i = 0; $i < $childNodes->length; $i++) {
             $currentNode = $childNodes->item($i);
-            if (!is_a($currentNode, \DOMElement::class)) {
+            if (!is_a($currentNode, \DOMElement::class) || !$currentNode->hasAttribute('stepKey')) {
                 continue;
             }
-            if ($currentNode->hasAttribute('stepKey')) {
-                if ($currentNode->hasAttribute($insertType) && $testNode->hasAttribute($insertType)) {
-                    $errorMsg = "Actions cannot have merge pointers if contained in tests that has a merge pointer.";
-                    $errorMsg .= "\n\tstepKey: {$currentNode->getAttribute('stepKey')}\tin file: {$filename}";
-                    $exceptionCollector->addError($filename, $errorMsg);
-                }
-                $currentNode->setAttribute($actionInsertType, $previousStepKey);
-                $previousStepKey = $currentNode->getAttribute('stepKey');
-                // All actions after the first need to insert AFTER.
-                $actionInsertType = ActionObject::MERGE_ACTION_ORDER_AFTER;
+            if ($currentNode->hasAttribute($insertType) && $testNode->hasAttribute($insertType)) {
+                $errorMsg = "Actions cannot have merge pointers if contained in tests that has a merge pointer.";
+                $errorMsg .= "\n\tstepKey: {$currentNode->getAttribute('stepKey')}\tin file: {$filename}";
+                $exceptionCollector->addError($filename, $errorMsg);
             }
+            $currentNode->setAttribute($actionInsertType, $previousStepKey);
+            $previousStepKey = $currentNode->getAttribute('stepKey');
+            // All actions after the first need to insert AFTER.
+            $actionInsertType = ActionObject::MERGE_ACTION_ORDER_AFTER;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ class ActionGroupMergedViaInsertAfterCest`
`29`	`29`	`{`
`30`	`30`	`$I->fillField("#foo", "foo");`
`31`	`31`	`$I->fillField("#bar", "bar");`
`32`		`- $I->click("#mergeOne");`
`33`		`- $I->click("#mergeTwo");`
`34`		`- $I->click("#mergeThree");`
	`32`	`+ $I->click("#foo2");`
	`33`	`+ $I->click("#bar2");`
	`34`	`+ $I->click("#baz2");`
`35`	`35`	`$I->fillField("#baz", "baz");`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ class ActionGroupMergedViaInsertBeforeCest`
`28`	`28`	`public function ActionGroupMergedViaInsertBefore(AcceptanceTester $I)`
`29`	`29`	`{`
`30`	`30`	`$I->fillField("#foo", "foo");`
`31`		`- $I->click("#mergeOne");`
`32`		`- $I->click("#mergeTwo");`
`33`		`- $I->click("#mergeThree");`
	`31`	`+ $I->click("#foo2");`
	`32`	`+ $I->click("#bar2");`
	`33`	`+ $I->click("#baz2");`
`34`	`34`	`$I->fillField("#bar", "bar");`
`35`	`35`	`$I->fillField("#baz", "baz");`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,20 +123,18 @@ protected function appendMergePointerToActions($testNode, $insertType, $insertKe`
`123`	`123`	`}`
`124`	`124`	`for ($i = 0; $i < $childNodes->length; $i++) {`
`125`	`125`	`$currentNode = $childNodes->item($i);`
`126`		`- if (!is_a($currentNode, \DOMElement::class)) {`
	`126`	`+ if (!is_a($currentNode, \DOMElement::class) \|\| !$currentNode->hasAttribute('stepKey')) {`
`127`	`127`	`continue;`
`128`	`128`	`}`
`129`		`- if ($currentNode->hasAttribute('stepKey')) {`
`130`		`- if ($currentNode->hasAttribute($insertType) && $testNode->hasAttribute($insertType)) {`
`131`		`- $errorMsg = "Actions cannot have merge pointers if contained in tests that has a merge pointer.";`
`132`		`- $errorMsg .= "\n\tstepKey: {$currentNode->getAttribute('stepKey')}\tin file: {$filename}";`
`133`		`- $exceptionCollector->addError($filename, $errorMsg);`
`134`		`- }`
`135`		`- $currentNode->setAttribute($actionInsertType, $previousStepKey);`
`136`		`- $previousStepKey = $currentNode->getAttribute('stepKey');`
`137`		`- // All actions after the first need to insert AFTER.`
`138`		`- $actionInsertType = ActionObject::MERGE_ACTION_ORDER_AFTER;`
	`129`	`+ if ($currentNode->hasAttribute($insertType) && $testNode->hasAttribute($insertType)) {`
	`130`	`+ $errorMsg = "Actions cannot have merge pointers if contained in tests that has a merge pointer.";`
	`131`	`+ $errorMsg .= "\n\tstepKey: {$currentNode->getAttribute('stepKey')}\tin file: {$filename}";`
	`132`	`+ $exceptionCollector->addError($filename, $errorMsg);`
`139`	`133`	`}`
	`134`	`+ $currentNode->setAttribute($actionInsertType, $previousStepKey);`
	`135`	`+ $previousStepKey = $currentNode->getAttribute('stepKey');`
	`136`	`+ // All actions after the first need to insert AFTER.`
	`137`	`+ $actionInsertType = ActionObject::MERGE_ACTION_ORDER_AFTER;`
`140`	`138`	`}`
`141`	`139`	`}`
`142`	`140`