Merge pull request #212 from magento/MQE-1189

MQE-1189: Suite Generation - Precondition body must always get and re…

Author: jilu1

src/Magento/FunctionalTestingFramework/Suite/Generators/GroupClassGenerator.php

@@ -129,20 +129,15 @@ private function extractClassVar($beforeArray, $afterArray)
      */
     private function buildHookMustacheArray($hookObj)
     {
-        $mustacheHookArray = [];
         $actions = [];
-        $hasWebDriverActions = false;
+        $mustacheHookArray['actions'][] = ['webDriverInit' => true];
 
         foreach ($hookObj->getActions() as $action) {
             /** @var ActionObject $action */
             $index = count($actions);
             //deleteData contains either url or createDataKey, if it contains the former it needs special formatting
             if ($action->getType() !== "createData"
                 && !array_key_exists(TestGenerator::REQUIRED_ENTITY_REFERENCE, $action->getCustomActionAttributes())) {
-                if (!$hasWebDriverActions) {
-                    $hasWebDriverActions = true;
-                }
-
                 $actions = $this->buildWebDriverActionsMustacheArray($action, $actions, $index);
                 continue;
             }
@@ -159,11 +154,8 @@ private function buildHookMustacheArray($hookObj)
             $entityArray = $this->buildPersistenceMustacheArray($action, $entityArray);
             $actions[$index] = $entityArray;
         }
-        $mustacheHookArray['actions'] = $actions;
-        if ($hasWebDriverActions) {
-            array_unshift($mustacheHookArray['actions'], ['webDriverInit' => true]);
-            $mustacheHookArray['actions'][] = ['webDriverReset' => true];
-        }
+        $mustacheHookArray['actions'] = array_merge($mustacheHookArray['actions'], $actions);
+        $mustacheHookArray['actions'][] = ['webDriverReset' => true];
 
         return $mustacheHookArray;
     }