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

- Fix to old verification tests, found and fixed a bug with old merging.
- final test fixes.

Author: KevinBKozan

dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt

@@ -0,0 +1,37 @@
+<?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
+{
+	/**
+	 * @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("#mergeOne");
+		$I->click("#mergeTwo");
+		$I->click("#mergeThree");
+		$I->fillField("#baz", "baz");
+	}
+}

dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt

@@ -0,0 +1,37 @@
+<?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
+{
+	/**
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function ActionGroupMergedViaInsertBefore(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");
 	}
 }

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

@@ -136,14 +136,20 @@ private function getResolvedActionsWithArgs($arguments, $actionReferenceKey)
                 );
             }
 
+            // translate 0/1 back to before/after
+            $orderOffset = ActionObject::MERGE_ACTION_ORDER_BEFORE;
+            if ($action->getOrderOffset() === 1) {
+                $orderOffset = ActionObject::MERGE_ACTION_ORDER_AFTER;
+            }
+
             // we append the action reference key to any linked action and the action's merge key as the user might
             // use this action group multiple times in the same test.
             $resolvedActions[$action->getStepKey() . ucfirst($actionReferenceKey)] = new ActionObject(
                 $action->getStepKey() . ucfirst($actionReferenceKey),
                 $action->getType(),
                 array_replace_recursive($action->getCustomActionAttributes(), $newActionAttributes),
                 $action->getLinkedAction() == null ? null : $action->getLinkedAction() . ucfirst($actionReferenceKey),
-                $action->getOrderOffset(),
+                $orderOffset,
                 [self::ACTION_GROUP_ORIGIN_NAME => $this->name,
                     self::ACTION_GROUP_ORIGIN_TEST_REF => $actionReferenceKey]
             );