Merge branch 'develop' into MQE-974

Author: KevinBKozan

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

@@ -27,7 +27,6 @@ class GroupClassGenerator
     const LAST_REQUIRED_ENTITY_TAG = 'last';
     const MUSTACHE_VAR_TAG = 'var';
     const MAGENTO_CLI_COMMAND_COMMAND = 'command';
-    const DATA_PERSISTENCE_ACTIONS = ["createData", "deleteData"];
     const REPLACEMENT_ACTIONS = [
         'comment' => 'print'
     ];
@@ -133,7 +132,9 @@ private function buildHookMustacheArray($hookObj)
         foreach ($hookObj->getActions() as $action) {
             /** @var ActionObject $action */
             $index = count($actions);
-            if (!in_array($action->getType(), self::DATA_PERSISTENCE_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;
                 }