Skip to content

Commit 21ea982

Browse files
committed
MQE-914: Multiple Uniqueness References On Same Entity Generates Incorrectly
- CR Fixes
1 parent fccb252 commit 21ea982

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

dev/tests/verification/Resources/DataReplacementTest.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ class DataReplacementTestCest
3939
$I->conditionalClick(msq("uniqueData") . "John", "#" . msq("uniqueData") . "John", true);
4040
$I->amOnUrl(msq("uniqueData") . "John.html");
4141
$I->searchAndMultiSelectOption("#selector", [msq("uniqueData") . "John", "Doe"]);
42+
$I->click("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John");
43+
$I->click("#Doe" . msq("uniqueData") . "#Doe" . msq("uniqueData"));
4244
$I->fillField("#selector", "StringBefore Doe" . msq("uniqueData") . " StringAfter");
4345
$I->fillField("#Doe" . msq("uniqueData"), "input");
4446
$I->dragAndDrop("#Doe" . msq("uniqueData"), "Doe" . msq("uniqueData"));

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<conditionalClick stepKey="dependentSelectorReplaceMSQPrefix" dependentSelector="#{{uniqueData.firstname}}" selector="{{uniqueData.firstname}}" visible="true"/>
2323
<amOnUrl stepKey="urlReplaceMSQPrefix" url="{{uniqueData.firstname}}.html"/>
2424
<searchAndMultiSelectOption stepKey="parameterArrayReplacementMSQPrefix" selector="#selector" parameterArray="[{{uniqueData.firstname}}, {{simpleData.lastname}}]"/>
25+
<click stepKey="selectorReplaceDupedMSQPrefix" selector="#{{uniqueData.firstname}}#{{uniqueData.firstname}}"/>
26+
<click stepKey="selectorReplaceDupedMSQSuffix" selector="#{{uniqueData.lastname}}#{{uniqueData.lastname}}"/>
2527

2628
<fillField stepKey="inputReplaceMSQSuffix" selector="#selector" userInput="StringBefore {{uniqueData.lastname}} StringAfter"/>
2729
<fillField stepKey="selectorReplaceMSQSuffix" selector="#{{uniqueData.lastname}}" userInput="input"/>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,7 @@ private function addUniquenessFunctionCall($input)
15691569

15701570
//Match on msq(\"entityName\")
15711571
preg_match_all('/' . EntityDataObject::CEST_UNIQUE_FUNCTION . '\(\\\\"[\w]+\\\\"\)/', $output, $matches);
1572-
foreach ($matches[0] as $match) {
1572+
foreach (array_unique($matches[0]) as $match) {
15731573
preg_match('/\\\\"([\w]+)\\\\"/', $match, $entityMatch);
15741574
$entity = $entityMatch[1];
15751575
$output = str_replace($match, '" . msq("' . $entity . '") . "', $output);

0 commit comments

Comments
 (0)