Skip to content

Commit 8fb1025

Browse files
authored
Merge pull request #669 from magento/MQE-2043
MQE-2043 Custom helper argument in action group is not resolved
2 parents 155d846 + a879839 commit 8fb1025

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/HelperActionGroup.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
<actionGroup name="HelperActionGroup">
1111
<arguments>
1212
<argument name="test" type="string" />
13+
<argument name="entityTest" type="entity" />
1314
</arguments>
1415
<comment userInput="Action group to demonstrate helper functionality available from action groups." stepKey="comment" />
1516
<helper class="\MFTF\DevDocs\Helper\CustomHelper" method="goTo" stepKey="customHelper">
16-
<argument name="test">{{contentSection.parametrizedSelector(test)}}</argument>
17-
<argument name="module">['{{test}}', 'Bla']</argument>
17+
<argument name="test">{{contentSection.parametrizedSelector(entityTest.entityField)}}</argument>
18+
<argument name="module">['{{entityTest.entityField}}', 'Bla']</argument>
1819
<argument name="url">{{test}}</argument>
1920
<argument name="bool">true</argument>
2021
<argument name="float">4.400000000234234</argument>

dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
<actionGroup ref="HelperActionGroup" stepKey="actionGroupWithCustomHelper">
4646
<argument name="test" value="{{HelperData.entityField}}" />
47+
<argument name="entityTest" value="HelperData" />
4748
</actionGroup>
4849
</test>
4950
</tests>

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

+3
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ private function getResolvedActionsWithArgs($arguments, $actionReferenceKey)
210210
foreach ($this->parsedActions as $action) {
211211
$replacementStepKeys[$action->getStepKey()] = $action->getStepKey() . ucfirst($actionReferenceKey);
212212
$varAttributes = array_intersect($this->varAttributes, array_keys($action->getCustomActionAttributes()));
213+
if ($action->getType() === ActionObject::ACTION_TYPE_HELPER) {
214+
$varAttributes = array_keys($action->getCustomActionAttributes());
215+
}
213216

214217
// replace createDataKey attributes inside the action group
215218
$resolvedActionAttributes = $this->replaceCreateDataKeys($action, $replacementStepKeys);

0 commit comments

Comments
 (0)