MQE-371:[Framework] CestHookObject does order or replace {{}} references

    - add support for order and ref replacement in before/after blocks

Author: imeron2433

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

@@ -65,7 +65,7 @@ public function getSteps($arguments)
             $args = array_merge($args, $arguments);
         }
 
-        return $mergeUtil->mergeStepsAndInsertWaits($this->getResolvedActionsWithArgs($args));
+        return $mergeUtil->resolveActionSteps($this->getResolvedActionsWithArgs($args), true);
     }
 
     /**

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

@@ -6,6 +6,8 @@
 
 namespace Magento\FunctionalTestingFramework\Test\Objects;
 
+use Magento\FunctionalTestingFramework\Test\Util\ActionMergeUtil;
+
 /**
  * Class CestHookObject
  */
@@ -61,7 +63,8 @@ public function getType()
      */
     public function getActions()
     {
-        return $this->actions;
+        $mergeUtil = new ActionMergeUtil();
+        return $mergeUtil->resolveActionSteps($this->actions);
     }
 
     /**

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

@@ -99,34 +99,6 @@ public function getCustomData()
     public function getOrderedActions()
     {
         $mergeUtil = new ActionMergeUtil();
-        $mergedSteps = $mergeUtil->mergeStepsAndInsertWaits($this->parsedSteps);
-        return $this->extractActionGroups($mergedSteps);
-    }
-
-    /**
-     * Method to insert action group references into step flow
-     *
-     * @param array $mergedSteps
-     * @return array
-     */
-    private function extractActionGroups($mergedSteps)
-    {
-        $newOrderedList = [];
-
-        foreach ($mergedSteps as $key => $mergedStep) {
-            /**@var ActionObject $mergedStep**/
-            if ($mergedStep->getType() == ActionObjectExtractor::ACTION_GROUP_TAG) {
-                $actionGroup = ActionGroupObjectHandler::getInstance()->getObject(
-                    $mergedStep->getCustomActionAttributes()[ActionObjectExtractor::ACTION_GROUP_REF]
-                );
-                $args = $mergedStep->getCustomActionAttributes()[ActionObjectExtractor::ACTION_GROUP_ARGUMENTS] ?? null;
-                $actionsToMerge = $actionGroup->getSteps($args);
-                $newOrderedList = $newOrderedList + $actionsToMerge;
-            } else {
-                $newOrderedList[$key]  = $mergedStep;
-            }
-        }
-
-        return $newOrderedList;
+        return $mergeUtil->resolveActionSteps($this->parsedSteps);
     }
 }

src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php

@@ -6,6 +6,7 @@
 
 namespace Magento\FunctionalTestingFramework\Test\Util;
 
+use Magento\FunctionalTestingFramework\Test\Handlers\ActionGroupObjectHandler;
 use Magento\FunctionalTestingFramework\Test\Objects\ActionObject;
 
 /**
@@ -44,14 +45,46 @@ public function __construct()
      * Method to execute merge of steps and insert wait steps.
      *
      * @param array $parsedSteps
+     * @param bool $skipActionGroupResolution
      * @return array
      */
-    public function mergeStepsAndInsertWaits($parsedSteps)
+    public function resolveActionSteps($parsedSteps, $skipActionGroupResolution = false)
     {
         $this->mergeActions($parsedSteps);
         $this->insertWaits();
 
-        return $this->orderedSteps;
+        if ($skipActionGroupResolution) {
+            return $this->orderedSteps;
+        }
+
+        return $this->resolveActionGroups($this->orderedSteps);
+    }
+
+    /**
+     * Method to resolve action group references and insert relevant actions into step flow
+     *
+     * @param array $mergedSteps
+     * @return array
+     */
+    private function resolveActionGroups($mergedSteps)
+    {
+        $newOrderedList = [];
+
+        foreach ($mergedSteps as $key => $mergedStep) {
+            /**@var ActionObject $mergedStep**/
+            if ($mergedStep->getType() == ActionObjectExtractor::ACTION_GROUP_TAG) {
+                $actionGroup = ActionGroupObjectHandler::getInstance()->getObject(
+                    $mergedStep->getCustomActionAttributes()[ActionObjectExtractor::ACTION_GROUP_REF]
+                );
+                $args = $mergedStep->getCustomActionAttributes()[ActionObjectExtractor::ACTION_GROUP_ARGUMENTS] ?? null;
+                $actionsToMerge = $actionGroup->getSteps($args);
+                $newOrderedList = $newOrderedList + $actionsToMerge;
+            } else {
+                $newOrderedList[$key]  = $mergedStep;
+            }
+        }
+
+        return $newOrderedList;
     }
 
     /**