Skip to content

Commit d4dd552

Browse files
committed
Merge branch 'ACP2E-3671' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-02-28-2025
2 parents 9c05217 + 912f1ea commit d4dd552

File tree

3 files changed

+29
-14
lines changed

3 files changed

+29
-14
lines changed

app/code/Magento/Store/Test/Mftf/Data/StoreData.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2017 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
99
<entity name="_defaultStore" type="store">
@@ -225,4 +225,8 @@
225225
<data key="store_type">store</data>
226226
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
227227
</entity>
228+
<entity name="abcCustomStoreView" extends="customStore">
229+
<data key="name" unique="suffix">Abc</data>
230+
<data key="code" unique="suffix">abc</data>
231+
</entity>
228232
</entities>

app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2017 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
99
<entity name="_defaultStoreGroup" type="group">
@@ -55,9 +55,16 @@
5555
<data key="root_category_id">2</data>
5656
<data key="website_id">1</data>
5757
</entity>
58-
5958
<entity name="staticFirstStoreGroup" extends="staticStoreGroup">
6059
<data key="name">NewStore</data>
6160
<data key="code">Base1</data>
6261
</entity>
62+
<entity name="staticFirstStoreGroup" extends="staticStoreGroup">
63+
<data key="name">NewStore</data>
64+
<data key="code">Base1</data>
65+
</entity>
66+
<entity name="abcCustomStoreGroup" extends="customStoreGroup">
67+
<data key="name" unique="suffix">Abc</data>
68+
<data key="code" unique="suffix">abc</data>
69+
</entity>
6370
</entities>

app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2017 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
99
<entity name="_defaultWebsite" type="website">
@@ -27,4 +27,8 @@
2727
<data key="name" unique="suffix">website_upd</data>
2828
<data key="code" unique="suffix">code_upd</data>
2929
</entity>
30-
</entities>
30+
<entity name="abcCustomWebsite" extends="customWebsite">
31+
<data key="name" unique="suffix">Abc</data>
32+
<data key="code" unique="suffix">abc</data>
33+
</entity>
34+
</entities>

0 commit comments

Comments
 (0)