Skip to content

Commit 64944fe

Browse files
committed
MQE-2160: Extended data entity won't merge array items
1 parent 9082403 commit 64944fe

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

dev/tests/functional/tests/MFTF/DevDocs/Data/MessageData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,10 @@
1717
<item name="three">3</item>
1818
</array>
1919
</entity>
20+
21+
<entity name="ExtendedMessageData" extends="MessageData">
22+
<array key="numbers">
23+
<item name="TESTING CASE">TESTING CASE</item>
24+
</array>
25+
</entity>
2026
</entities>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
</actionGroup>
4949

5050
<assertEqualsCanonicalizing stepKey="assertMergedArray">
51-
<actualResult type="array">{{MessageData.numbers}}</actualResult>
52-
<expectedResult type="array">["Something New", "0", "1", "2", "3"]</expectedResult>
51+
<actualResult type="array">{{ExtendedMessageData.numbers}}</actualResult>
52+
<expectedResult type="array">["Something New", "0", "1", "2", "3", "TESTING CASE"]</expectedResult>
5353
</assertEqualsCanonicalizing>
5454
</test>
5555
</tests>

dev/tests/verification/Resources/ExtendedParameterArrayTest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class ExtendParentDataTestCest
2626
public function ExtendParentDataTest(AcceptanceTester $I)
2727
{
2828
$I->createEntity("simpleDataKey", "test", "extendParentData", [], []); // stepKey: simpleDataKey
29-
$I->searchAndMultiSelectOption("#selector", ["otherName"]);
29+
$I->searchAndMultiSelectOption("#selector", ["name", "otherName"]);
3030
$I->searchAndMultiSelectOption("#selector", ["extendName"]);
31-
$I->searchAndMultiSelectOption("#selector", ["item"]);
31+
$I->searchAndMultiSelectOption("#selector", ["postname", "item"]);
3232
$I->searchAndMultiSelectOption("#selector", [msq("extendParentData") . "prename"]);
3333
$I->searchAndMultiSelectOption("#selector", ["postnameExtend" . msq("extendParentData")]);
3434
}

src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataExtensionUtil.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function extendEntity($entityObject)
6262

6363
// Get all data for both parent and child and merge
6464
$referencedData = $parentEntity->getAllData();
65-
$newData = array_merge($referencedData, $entityObject->getAllData());
65+
$newData = array_merge_recursive($referencedData, $entityObject->getAllData());
6666

6767
// Get all linked references for both parent and child and merge
6868
$referencedLinks = $parentEntity->getLinkedEntities();

0 commit comments

Comments
 (0)