Skip to content

Commit 220d87a

Browse files
Naveen-AC24Naveen-AC24
committed
Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into ACQE-7280
2 parents 8ef37be + 40cd9ed commit 220d87a

File tree

74 files changed

+2447
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2447
-195
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateCategoryDescriptionActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminUpdateCategoryDescriptionActionGroup">
10+
<annotations>
11+
<description>Update Category Description</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="description" type="string"/>
15+
</arguments>
16+
<scrollTo selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
17+
<click selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="selectContent"/>
18+
<scrollTo selector="{{AdminCategoryContentSection.description}}" x="0" y="-80" stepKey="scrollToDescription"/>
19+
<conditionalClick selector="{{AdminCategoryContentSection.categoryDescriptionUseDefault}}" dependentSelector="{{AdminCategoryContentSection.categoryDescriptionUseDefault}}" visible="true" stepKey="uncheckUseDefaultValueStoreView"/>
20+
<fillField selector="{{AdminCategoryContentSection.description}}" userInput="{{description}}" stepKey="fillUpdatedDescription"/>
21+
</actionGroup>
22+
</actionGroups>
23+

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateCategoryDisplaySettingsActionGroup.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminUpdateCategoryDisplaySettingsActionGroup">
10+
<annotations>
11+
<description>Update Category Display settings</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="availableSortOptions" type="string" defaultValue="Position"/>
15+
<argument name="defaultSortingOption" type="string" defaultValue="position"/>
16+
<argument name="priceRange" type="string" defaultValue="0"/>
17+
</arguments>
18+
<!--Select Display Setting and fill the options-->
19+
<scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
20+
<click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
21+
<checkOption selector="{{CategoryDisplaySettingsSection.productListCheckBox}}" stepKey="enableTheAvailableProductList"/>
22+
<selectOption selector="{{CategoryDisplaySettingsSection.productList}}" parameterArray="[{{availableSortOptions}}]" stepKey="selectPrice"/>
23+
<scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80" stepKey="scrollToDefaultProductList"/>
24+
<checkOption selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" stepKey="enableTheDefaultProductList"/>
25+
<selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}" userInput="{{defaultSortingOption}}" stepKey="selectPosition"/>
26+
<scrollTo selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" x="0" y="-80" stepKey="scrollToLayeredNavPrice"/>
27+
<click selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceCheckBox}}" stepKey="enableLayeredNavigationPrice"/>
28+
<fillField selector="{{CategoryDisplaySettingsSection.layeredNavigationPriceInput}}" userInput="{{priceRange}}" stepKey="fillThePrice"/>
29+
</actionGroup>
30+
</actionGroups>
31+

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateCategoryMetaInformationActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminUpdateCategoryMetaInformationActionGroup">
10+
<annotations>
11+
<description>Update meta information</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="metaTitle" type="string"/>
15+
</arguments>
16+
<scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization"/>
17+
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
18+
<conditionalClick selector="{{AdminCategorySEOSection.MetaTitleDefaultValueCheckbox}}" dependentSelector="{{AdminCategorySEOSection.MetaTitleDefaultValueCheckbox}}" visible="true" stepKey="uncheckUseDefaultValueStoreView"/>
19+
<waitForElementVisible selector="{{AdminCategorySEOSection.MetaTitleInput}}" stepKey="waitForElementVisible"/>
20+
<fillField selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{metaTitle}}" stepKey="fillUpdatedMetaTitle"/>
21+
</actionGroup>
22+
</actionGroups>
23+

‎app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="_defaultCategory" type="category">
1212
<data key="name" unique="suffix">simpleCategory</data>
1313
<data key="name_lwr" unique="suffix">simplecategory</data>
@@ -316,4 +316,9 @@
316316
<var key="category_id" entityKey="id" entityType="category"/>
317317
<var key="sku" entityKey="sku" entityType="product"/>
318318
</entity>
319+
<entity name="ApiCategoryNonAnchor" type="category">
320+
<data key="name" unique="suffix">ApiCategoryNonAnchor</data>
321+
<data key="is_active">true</data>
322+
<requiredEntity type="custom_attribute">CustomAttributeCategoryNonAnchor</requiredEntity>
323+
</entity>
319324
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,4 +1580,28 @@
15801580
<requiredEntity type="product_option">ProductOptionDropDownFor2</requiredEntity>
15811581
<requiredEntity type="product_option">ProductOptionCheckboxFor2</requiredEntity>
15821582
</entity>
1583+
<entity name="ProductWithTwentyOneTextFieldOptions" type="product">
1584+
<var key="sku" entityType="product" entityKey="sku" />
1585+
<requiredEntity type="product_option">ProductOptionField</requiredEntity>
1586+
<requiredEntity type="product_option">ProductOptionField2</requiredEntity>
1587+
<requiredEntity type="product_option">ProductOptionField3</requiredEntity>
1588+
<requiredEntity type="product_option">ProductOptionField4</requiredEntity>
1589+
<requiredEntity type="product_option">ProductOptionField5</requiredEntity>
1590+
<requiredEntity type="product_option">ProductOptionField6</requiredEntity>
1591+
<requiredEntity type="product_option">ProductOptionField7</requiredEntity>
1592+
<requiredEntity type="product_option">ProductOptionField8</requiredEntity>
1593+
<requiredEntity type="product_option">ProductOptionField9</requiredEntity>
1594+
<requiredEntity type="product_option">ProductOptionField10</requiredEntity>
1595+
<requiredEntity type="product_option">ProductOptionField11</requiredEntity>
1596+
<requiredEntity type="product_option">ProductOptionField12</requiredEntity>
1597+
<requiredEntity type="product_option">ProductOptionField13</requiredEntity>
1598+
<requiredEntity type="product_option">ProductOptionField14</requiredEntity>
1599+
<requiredEntity type="product_option">ProductOptionField15</requiredEntity>
1600+
<requiredEntity type="product_option">ProductOptionField16</requiredEntity>
1601+
<requiredEntity type="product_option">ProductOptionField17</requiredEntity>
1602+
<requiredEntity type="product_option">ProductOptionField18</requiredEntity>
1603+
<requiredEntity type="product_option">ProductOptionField19</requiredEntity>
1604+
<requiredEntity type="product_option">ProductOptionField20</requiredEntity>
1605+
<requiredEntity type="product_option">ProductOptionField21</requiredEntity>
1606+
</entity>
15831607
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml

Lines changed: 233 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
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-
*/
7-
-->
8-
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
98
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
109
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1110
<entity name="ProductOptionField" type="product_option">
@@ -32,6 +31,234 @@
3231
<data key="price_type">fixed</data>
3332
<data key="max_characters">0</data>
3433
</entity>
34+
<entity name="ProductOptionField3" type="product_option">
35+
<var key="product_sku" entityType="product" entityKey="sku" />
36+
<data key="title">OptionField3</data>
37+
<data key="sku">OptionField3</data>
38+
<data key="type">field</data>
39+
<data key="is_require">true</data>
40+
<data key="sort_order">1</data>
41+
<data key="price">20</data>
42+
<data key="priceWithDecimals">20.000000</data>
43+
<data key="price_type">fixed</data>
44+
<data key="max_characters">0</data>
45+
</entity>
46+
<entity name="ProductOptionField4" type="product_option">
47+
<var key="product_sku" entityType="product" entityKey="sku" />
48+
<data key="title">OptionField4</data>
49+
<data key="sku">OptionField4</data>
50+
<data key="type">field</data>
51+
<data key="is_require">true</data>
52+
<data key="sort_order">1</data>
53+
<data key="price">20</data>
54+
<data key="priceWithDecimals">20.000000</data>
55+
<data key="price_type">fixed</data>
56+
<data key="max_characters">0</data>
57+
</entity>
58+
<entity name="ProductOptionField5" type="product_option">
59+
<var key="product_sku" entityType="product" entityKey="sku" />
60+
<data key="title">OptionField5</data>
61+
<data key="sku">OptionField5</data>
62+
<data key="type">field</data>
63+
<data key="is_require">true</data>
64+
<data key="sort_order">1</data>
65+
<data key="price">20</data>
66+
<data key="priceWithDecimals">20.000000</data>
67+
<data key="price_type">fixed</data>
68+
<data key="max_characters">0</data>
69+
</entity>
70+
<entity name="ProductOptionField6" type="product_option">
71+
<var key="product_sku" entityType="product" entityKey="sku" />
72+
<data key="title">OptionField6</data>
73+
<data key="sku">OptionField6</data>
74+
<data key="type">field</data>
75+
<data key="is_require">true</data>
76+
<data key="sort_order">1</data>
77+
<data key="price">10</data>
78+
<data key="priceWithDecimals">10.000000</data>
79+
<data key="price_type">fixed</data>
80+
<data key="max_characters">0</data>
81+
</entity>
82+
<entity name="ProductOptionField7" type="product_option">
83+
<var key="product_sku" entityType="product" entityKey="sku" />
84+
<data key="title">OptionField7</data>
85+
<data key="sku">OptionField7</data>
86+
<data key="type">field</data>
87+
<data key="is_require">true</data>
88+
<data key="sort_order">1</data>
89+
<data key="price">20</data>
90+
<data key="priceWithDecimals">20.000000</data>
91+
<data key="price_type">fixed</data>
92+
<data key="max_characters">0</data>
93+
</entity>
94+
<entity name="ProductOptionField8" type="product_option">
95+
<var key="product_sku" entityType="product" entityKey="sku" />
96+
<data key="title">OptionField8</data>
97+
<data key="sku">OptionField8</data>
98+
<data key="type">field</data>
99+
<data key="is_require">true</data>
100+
<data key="sort_order">1</data>
101+
<data key="price">20</data>
102+
<data key="priceWithDecimals">20.000000</data>
103+
<data key="price_type">fixed</data>
104+
<data key="max_characters">0</data>
105+
</entity>
106+
<entity name="ProductOptionField9" type="product_option">
107+
<var key="product_sku" entityType="product" entityKey="sku" />
108+
<data key="title">OptionField9</data>
109+
<data key="sku">OptionField9</data>
110+
<data key="type">field</data>
111+
<data key="is_require">true</data>
112+
<data key="sort_order">1</data>
113+
<data key="price">20</data>
114+
<data key="priceWithDecimals">20.000000</data>
115+
<data key="price_type">fixed</data>
116+
<data key="max_characters">0</data>
117+
</entity>
118+
<entity name="ProductOptionField10" type="product_option">
119+
<var key="product_sku" entityType="product" entityKey="sku" />
120+
<data key="title">OptionField10</data>
121+
<data key="sku">OptionField10</data>
122+
<data key="type">field</data>
123+
<data key="is_require">true</data>
124+
<data key="sort_order">1</data>
125+
<data key="price">20</data>
126+
<data key="priceWithDecimals">20.000000</data>
127+
<data key="price_type">fixed</data>
128+
<data key="max_characters">0</data>
129+
</entity>
130+
<entity name="ProductOptionField11" type="product_option">
131+
<var key="product_sku" entityType="product" entityKey="sku" />
132+
<data key="title">OptionField11</data>
133+
<data key="sku">OptionField11</data>
134+
<data key="type">field</data>
135+
<data key="is_require">true</data>
136+
<data key="sort_order">1</data>
137+
<data key="price">10</data>
138+
<data key="priceWithDecimals">10.000000</data>
139+
<data key="price_type">fixed</data>
140+
<data key="max_characters">0</data>
141+
</entity>
142+
<entity name="ProductOptionField12" type="product_option">
143+
<var key="product_sku" entityType="product" entityKey="sku" />
144+
<data key="title">OptionField12</data>
145+
<data key="sku">OptionField12</data>
146+
<data key="type">field</data>
147+
<data key="is_require">true</data>
148+
<data key="sort_order">1</data>
149+
<data key="price">20</data>
150+
<data key="priceWithDecimals">20.000000</data>
151+
<data key="price_type">fixed</data>
152+
<data key="max_characters">0</data>
153+
</entity>
154+
<entity name="ProductOptionField13" type="product_option">
155+
<var key="product_sku" entityType="product" entityKey="sku" />
156+
<data key="title">OptionField13</data>
157+
<data key="sku">OptionField13</data>
158+
<data key="type">field</data>
159+
<data key="is_require">true</data>
160+
<data key="sort_order">1</data>
161+
<data key="price">20</data>
162+
<data key="priceWithDecimals">20.000000</data>
163+
<data key="price_type">fixed</data>
164+
<data key="max_characters">0</data>
165+
</entity>
166+
<entity name="ProductOptionField14" type="product_option">
167+
<var key="product_sku" entityType="product" entityKey="sku" />
168+
<data key="title">OptionField14</data>
169+
<data key="sku">OptionField14</data>
170+
<data key="type">field</data>
171+
<data key="is_require">true</data>
172+
<data key="sort_order">1</data>
173+
<data key="price">20</data>
174+
<data key="priceWithDecimals">20.000000</data>
175+
<data key="price_type">fixed</data>
176+
<data key="max_characters">0</data>
177+
</entity>
178+
<entity name="ProductOptionField15" type="product_option">
179+
<var key="product_sku" entityType="product" entityKey="sku" />
180+
<data key="title">OptionField15</data>
181+
<data key="sku">OptionField15</data>
182+
<data key="type">field</data>
183+
<data key="is_require">true</data>
184+
<data key="sort_order">1</data>
185+
<data key="price">20</data>
186+
<data key="priceWithDecimals">20.000000</data>
187+
<data key="price_type">fixed</data>
188+
<data key="max_characters">0</data>
189+
</entity>
190+
<entity name="ProductOptionField16" type="product_option">
191+
<var key="product_sku" entityType="product" entityKey="sku" />
192+
<data key="title">OptionField16</data>
193+
<data key="sku">OptionField16</data>
194+
<data key="type">field</data>
195+
<data key="is_require">true</data>
196+
<data key="sort_order">1</data>
197+
<data key="price">10</data>
198+
<data key="priceWithDecimals">10.000000</data>
199+
<data key="price_type">fixed</data>
200+
<data key="max_characters">0</data>
201+
</entity>
202+
<entity name="ProductOptionField17" type="product_option">
203+
<var key="product_sku" entityType="product" entityKey="sku" />
204+
<data key="title">OptionField17</data>
205+
<data key="sku">OptionField17</data>
206+
<data key="type">field</data>
207+
<data key="is_require">true</data>
208+
<data key="sort_order">1</data>
209+
<data key="price">20</data>
210+
<data key="priceWithDecimals">20.000000</data>
211+
<data key="price_type">fixed</data>
212+
<data key="max_characters">0</data>
213+
</entity>
214+
<entity name="ProductOptionField18" type="product_option">
215+
<var key="product_sku" entityType="product" entityKey="sku" />
216+
<data key="title">OptionField18</data>
217+
<data key="sku">OptionField18</data>
218+
<data key="type">field</data>
219+
<data key="is_require">true</data>
220+
<data key="sort_order">1</data>
221+
<data key="price">20</data>
222+
<data key="priceWithDecimals">20.000000</data>
223+
<data key="price_type">fixed</data>
224+
<data key="max_characters">0</data>
225+
</entity>
226+
<entity name="ProductOptionField19" type="product_option">
227+
<var key="product_sku" entityType="product" entityKey="sku" />
228+
<data key="title">OptionField19</data>
229+
<data key="sku">OptionField19</data>
230+
<data key="type">field</data>
231+
<data key="is_require">true</data>
232+
<data key="sort_order">1</data>
233+
<data key="price">20</data>
234+
<data key="priceWithDecimals">20.000000</data>
235+
<data key="price_type">fixed</data>
236+
<data key="max_characters">0</data>
237+
</entity>
238+
<entity name="ProductOptionField20" type="product_option">
239+
<var key="product_sku" entityType="product" entityKey="sku" />
240+
<data key="title">OptionField20</data>
241+
<data key="sku">OptionField20</data>
242+
<data key="type">field</data>
243+
<data key="is_require">true</data>
244+
<data key="sort_order">1</data>
245+
<data key="price">20</data>
246+
<data key="priceWithDecimals">20.000000</data>
247+
<data key="price_type">fixed</data>
248+
<data key="max_characters">0</data>
249+
</entity>
250+
<entity name="ProductOptionField21" type="product_option">
251+
<var key="product_sku" entityType="product" entityKey="sku" />
252+
<data key="title">OptionField21</data>
253+
<data key="sku">OptionField21</data>
254+
<data key="type">field</data>
255+
<data key="is_require">true</data>
256+
<data key="sort_order">1</data>
257+
<data key="price">20</data>
258+
<data key="priceWithDecimals">20.000000</data>
259+
<data key="price_type">fixed</data>
260+
<data key="max_characters">0</data>
261+
</entity>
35262
<entity name="ProductOptionArea" type="product_option">
36263
<var key="product_sku" entityType="product" entityKey="sku" />
37264
<data key="title">OptionArea</data>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
<element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
2727
<element name="productTableColumnSku" type="input" selector="#catalog_category_products_filter_sku"/>
2828
<element name="categoryImageUseDefault" type="checkbox" selector="input[name='use_default[image]']"/>
29+
<element name="categoryDescriptionUseDefault" type="checkbox" selector="input[name='use_default[description]']"/>
2930
</section>
3031
</sections>

0 commit comments

Comments
 (0)