MQE-991: The second data entity replacement is not correct when there are two in the same action inside an action group

- usecase fixed, added verification test around new case

Author: KevinBKozan

dev/tests/verification/Resources/PersistedAndXmlEntityArguments.txt

@@ -0,0 +1,32 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ */
+class PersistedAndXmlEntityArgumentsCest
+{
+	/**
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function PersistedAndXmlEntityArguments(AcceptanceTester $I)
+	{
+		$I->seeInCurrentUrl("/" . $persistedInTest->getCreatedDataByName('urlKey') . ".html?___store=" . msq("uniqueData") . "John");
+	}
+}

dev/tests/verification/TestModule/ActionGroup/FunctionalActionGroup.xml

@@ -50,4 +50,11 @@
         <grabTextFrom selector=".class" stepKey="grabTextData"/>
         <fillField stepKey="fill1" selector=".{$grabTextData}" userInput="$createSimpleData.field$"/>
     </actionGroup>
+    <actionGroup name="FunctionalActionGroupWithXmlAndPersistedData">
+        <arguments>
+            <argument name="xmlData" defaultValue="uniqueData"/>
+            <argument name="persistedData"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{persistedData.urlKey}}.html?___store={{xmlData.firstname}}" stepKey="checkUrl"/>
+    </actionGroup>
 </actionGroups>

dev/tests/verification/TestModule/Test/ActionGroupFunctionalTest.xml

@@ -182,4 +182,9 @@
             <actionGroup ref="FunctionalActionGroup" stepKey="afterGroup"/>
         </after>
     </test>
+    <test name="PersistedAndXmlEntityArguments">
+        <actionGroup ref="FunctionalActionGroupWithXmlAndPersistedData" stepKey="afterGroup">
+            <argument name="persistedData" value="$persistedInTest$"/>
+        </actionGroup>
+    </test>
 </tests>

dev/tests/verification/Tests/ActionGroupGenerationTest.php

@@ -118,4 +118,15 @@ public function testActionGroupWithNestedArgument()
     {
         $this->generateAndCompareTest('ActionGroupUsingNestedArgument');
     }
+
+    /**
+     * Test generation of a test referencing an action group that uses stepKey references (grabFrom/CreateData)
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testActionGroupWithPersistedAndXmlEntityArguments()
+    {
+        $this->generateAndCompareTest('PersistedAndXmlEntityArguments');
+    }
 }

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

@@ -332,8 +332,12 @@ private function replacePersistedArgument($replacement, $attributeValue, $fullVa
             $fullReplacement = str_replace($variable, trim($replacement, '$'), trim($fullVariable, "'"));
             $newAttributeValue = str_replace($fullVariable, $scope . $fullReplacement . $scope, $newAttributeValue);
         } else {
-            $newAttributeValue = str_replace('{{', $scope, str_replace('}}', $scope, $newAttributeValue));
-            $newAttributeValue = str_replace($variable, trim($replacement, '$'), $newAttributeValue);
+            $fullReplacement = str_replace($variable, trim($replacement, '$'), $fullVariable);
+            $newAttributeValue = str_replace(
+                '{{' . $fullVariable . '}}',
+                $scope . $fullReplacement . $scope,
+                $newAttributeValue
+            );
         }
 
         return $newAttributeValue;