From 39f62b8f89da5d07cbfabac17fd015f9029ffe38 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Wed, 1 Apr 2020 11:53:46 -0500
Subject: [PATCH] MQE-2043: Custom helper argument in action group is not
 resolved

---
 .../tests/MFTF/DevDocs/ActionGroup/HelperActionGroup.xml     | 5 +++--
 dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml | 1 +
 .../Test/Objects/ActionGroupObject.php                       | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/HelperActionGroup.xml b/dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/HelperActionGroup.xml
index 4e39a2da1..42159fc66 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/HelperActionGroup.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/HelperActionGroup.xml
@@ -10,11 +10,12 @@
     <actionGroup name="HelperActionGroup">
         <arguments>
             <argument name="test" type="string" />
+            <argument name="entityTest" type="entity" />
         </arguments>
         <comment userInput="Action group to demonstrate helper functionality available from action groups." stepKey="comment" />
         <helper class="\MFTF\DevDocs\Helper\CustomHelper" method="goTo" stepKey="customHelper">
-            <argument name="test">{{contentSection.parametrizedSelector(test)}}</argument>
-            <argument name="module">['{{test}}', 'Bla']</argument>
+            <argument name="test">{{contentSection.parametrizedSelector(entityTest.entityField)}}</argument>
+            <argument name="module">['{{entityTest.entityField}}', 'Bla']</argument>
             <argument name="url">{{test}}</argument>
             <argument name="bool">true</argument>
             <argument name="float">4.400000000234234</argument>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml b/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml
index e7c3bed54..3470a2440 100644
--- a/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml
+++ b/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml
@@ -44,6 +44,7 @@
 
         <actionGroup ref="HelperActionGroup" stepKey="actionGroupWithCustomHelper">
             <argument name="test" value="{{HelperData.entityField}}" />
+            <argument name="entityTest" value="HelperData" />
         </actionGroup>
     </test>
 </tests>
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
index 3e1afae31..a8027764b 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
@@ -210,6 +210,9 @@ private function getResolvedActionsWithArgs($arguments, $actionReferenceKey)
         foreach ($this->parsedActions as $action) {
             $replacementStepKeys[$action->getStepKey()] = $action->getStepKey() . ucfirst($actionReferenceKey);
             $varAttributes = array_intersect($this->varAttributes, array_keys($action->getCustomActionAttributes()));
+            if ($action->getType() === ActionObject::ACTION_TYPE_HELPER) {
+                $varAttributes = array_keys($action->getCustomActionAttributes());
+            }
 
             // replace createDataKey attributes inside the action group
             $resolvedActionAttributes = $this->replaceCreateDataKeys($action, $replacementStepKeys);