Skip to content

Commit 301e4b6

Browse files
magento-mts-svcmagento-mts-svc
authored
merge magento/2.4-develop into magento-honey-badgers/MC-31616
2 parents 1d60fa6 + 78bb169 commit 301e4b6

File tree

119 files changed

+572
-474
lines changed

Some content is hidden

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

119 files changed

+572
-474
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSortBundleProductsByPriceTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<deleteData createDataKey="createThirdBundleProduct" stepKey="deleteThirdBundleProduct"/>
112112

113113
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
114-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
114+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
115115
</after>
116116

117117
<!-- Open created category on Storefront -->

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,120 @@
127127
<entity name="SubCategoryNonAnchor" extends="SubCategoryWithParent">
128128
<requiredEntity type="custom_attribute">CustomAttributeCategoryNonAnchor</requiredEntity>
129129
</entity>
130+
<entity name="ApiCategoryA" type="category">
131+
<data key="name" unique="suffix">Category A</data>
132+
<data key="is_active">true</data>
133+
</entity>
134+
<entity name="ApiCategoryTest" type="category">
135+
<data key="name" unique="suffix">TEST</data>
136+
<data key="is_active">true</data>
137+
</entity>
138+
<entity name="ApiCategoryTest2" type="category">
139+
<data key="name" unique="suffix">_test2</data>
140+
<data key="is_active">true</data>
141+
</entity>
142+
<entity name="ApiCategoryTest3" type="category">
143+
<data key="name" unique="suffix">test 3</data>
144+
<data key="is_active">true</data>
145+
</entity>
146+
<entity name="ApiCategorySeveralProducts" type="category">
147+
<data key="name" unique="suffix">Category with several products</data>
148+
<data key="is_active">true</data>
149+
</entity>
150+
<entity name="ApiCategoryTest4" type="category">
151+
<data key="name" unique="suffix">test 4</data>
152+
<data key="is_active">true</data>
153+
</entity>
154+
<entity name="ApiCategoryTest5" type="category">
155+
<data key="name" unique="suffix">test 5</data>
156+
<data key="is_active">true</data>
157+
</entity>
158+
<entity name="ApiCategoryTest8" type="category">
159+
<data key="name" unique="suffix">test 8</data>
160+
<data key="is_active">true</data>
161+
</entity>
162+
<entity name="ApiCategoryTest6" type="category">
163+
<data key="name" unique="suffix">test 6</data>
164+
<data key="is_active">true</data>
165+
</entity>
166+
<entity name="ApiCategoryTest7" type="category">
167+
<data key="name" unique="suffix">test 7</data>
168+
<data key="is_active">true</data>
169+
</entity>
170+
<entity name="ApiCategoryLongTitle" type="category">
171+
<data key="name" unique="suffix">This is a very very very very very looong title</data>
172+
<data key="is_active">true</data>
173+
</entity>
174+
<entity name="ApiCategoryWithImage" type="category">
175+
<data key="name" unique="suffix">Category with image</data>
176+
<data key="is_active">true</data>
177+
</entity>
178+
<entity name="ApiCategoryTest0" type="category">
179+
<data key="name" unique="suffix">test 0</data>
180+
<data key="is_active">true</data>
181+
</entity>
182+
<entity name="ApiCategoryWithDescription" type="category">
183+
<data key="name" unique="suffix">Category with description &amp; custom title</data>
184+
<data key="is_active">true</data>
185+
</entity>
186+
<entity name="ApiCategoryWithChildren" type="category">
187+
<data key="name" unique="suffix">Category with children</data>
188+
<data key="is_active">true</data>
189+
</entity>
190+
<entity name="ApiSubCategoryWithParentLongName" type="category">
191+
<data key="name" unique="suffix">level 1 test category very very very long name</data>
192+
<data key="name_lwr" unique="suffix">level 1 test category very very very long name</data>
193+
<data key="is_active">true</data>
194+
<data key="include_in_menu">true</data>
195+
<var key="parent_id" entityType="category" entityKey="id"/>
196+
</entity>
197+
<entity name="ApiSubCategoryWithParentLevel1" type="category">
198+
<data key="name" unique="suffix">level 1 test category name</data>
199+
<data key="name_lwr" unique="suffix">level 1 test category name</data>
200+
<data key="is_active">true</data>
201+
<data key="include_in_menu">true</data>
202+
<var key="parent_id" entityType="category" entityKey="id"/>
203+
</entity>
204+
<entity name="ApiSubCategoryWithChildrenLevel1" type="category">
205+
<data key="name" unique="suffix">level 1 with children</data>
206+
<data key="name_lwr" unique="suffix">level 1 with children</data>
207+
<data key="is_active">true</data>
208+
<data key="include_in_menu">true</data>
209+
<var key="parent_id" entityType="category" entityKey="id"/>
210+
</entity>
211+
<entity name="ApiSubCategoryWithChildrenLevel2" type="category">
212+
<data key="name" unique="suffix">level 2 with children</data>
213+
<data key="name_lwr" unique="suffix">level 2 with children</data>
214+
<data key="is_active">true</data>
215+
<data key="include_in_menu">true</data>
216+
<var key="parent_id" entityType="category" entityKey="id"/>
217+
</entity>
218+
<entity name="ApiSubCategoryLevel3" type="category">
219+
<data key="name" unique="suffix">level 3 test</data>
220+
<data key="name_lwr" unique="suffix">level 3 test</data>
221+
<data key="is_active">true</data>
222+
<data key="include_in_menu">true</data>
223+
<var key="parent_id" entityType="category" entityKey="id"/>
224+
</entity>
225+
<entity name="ApiSubCategoryLevel4" type="category">
226+
<data key="name" unique="suffix">level 4</data>
227+
<data key="name_lwr" unique="suffix">level 4</data>
228+
<data key="is_active">true</data>
229+
<data key="include_in_menu">true</data>
230+
<var key="parent_id" entityType="category" entityKey="id"/>
231+
</entity>
232+
<entity name="ApiSubCategoryLevel4Test" type="category">
233+
<data key="name" unique="suffix">level 4 test</data>
234+
<data key="name_lwr" unique="suffix">level 4 test</data>
235+
<data key="is_active">true</data>
236+
<data key="include_in_menu">true</data>
237+
<var key="parent_id" entityType="category" entityKey="id"/>
238+
</entity>
239+
<entity name="ApiSubCategoryLevel5" type="category">
240+
<data key="name" unique="suffix">level 5</data>
241+
<data key="name_lwr" unique="suffix">level 5</data>
242+
<data key="is_active">true</data>
243+
<data key="include_in_menu">true</data>
244+
<var key="parent_id" entityType="category" entityKey="id"/>
245+
</entity>
130246
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636

3737
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
38-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
38+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
3939
</after>
4040

4141
<!-- Go to default attribute set edit page -->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
121121

122122
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
123-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
123+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
124124
</after>
125125

126126
<!-- Open Product in Store Front Page -->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckCustomAttributeValuesAfterProductSaveTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
4646

4747
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
48-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
48+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
4949
</after>
5050

5151
<!-- Open created product for edit -->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
2929

3030
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
31-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
31+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
3232
</after>
3333

3434
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4040

4141
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
42-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
42+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
4343
</after>
4444

4545
<!-- Filter product attribute set by attribute set name -->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4444

4545
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
46-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
46+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
4747
</after>
4848

4949
<!-- Filter product attribute set by attribute set name -->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewGroupForAttributeSetTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3232

3333
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
34-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
34+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
3535
</after>
3636

3737
<!-- Navigate to Stores > Attributes > Attribute Set -->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteConfigurableChildProductsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
8585

8686
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
87-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
87+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
8888
</after>
8989
<!--Open Product in Store Front Page -->
9090
<amOnPage url="$$createConfigProduct.sku$$.html" stepKey="openProductInStoreFront"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteDropdownProductAttributeFromAttributeSetTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3232

3333
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
34-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
34+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
3535
</after>
3636
<!-- Open Product Attribute Set Page -->
3737
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2626

2727
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
28-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
28+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
2929
</after>
3030
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
3131
<argument name="productAttributeCode" value="$$createProductAttribute.attribute_code$$"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteTextFieldProductAttributeFromAttributeSetTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3535

3636
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
37-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
37+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
3838
</after>
3939
<!-- Open Product Attribute Set Page -->
4040
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
9393

9494
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
95-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
95+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
9696
</after>
9797

9898
<!--Open Product Index Page-->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
9393

9494
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
95-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
95+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
9696
</after>
9797
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
9898
<waitForPageLoad stepKey="waitForProductGridPageLoad"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,15 @@
8484
<argument name="option" value="ProductOptionFieldSecond"/>
8585
</actionGroup>
8686
<!-- Delete All options and See no more options present on the page -->
87-
<actionGroup ref="AdminDeleteAllProductCustomOptionsActionGroup" stepKey="deleteAllCustomOptions"/>
87+
<actionGroup ref="AdminDeleteProductCustomOptionActionGroup" stepKey="deleteCustomOptionField">
88+
<argument name="option" value="ProductOptionField"/>
89+
</actionGroup>
90+
<actionGroup ref="AdminDeleteProductCustomOptionActionGroup" stepKey="deleteCustomOptionFile2">
91+
<argument name="option" value="ProductOptionFileSecond"/>
92+
</actionGroup>
93+
<actionGroup ref="AdminDeleteProductCustomOptionActionGroup" stepKey="deleteCustomOptionFieldSecond">
94+
<argument name="option" value="ProductOptionFieldSecond"/>
95+
</actionGroup>
8896
<!-- Product successfully saved and it has no options -->
8997
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductWithoutCustomOptions"/>
9098
<actionGroup ref="AdminAssertProductHasNoCustomOptionsActionGroup" stepKey="assertNoCustomOptions"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
8686

8787
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
88-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
88+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
8989
</after>
9090

9191
<!--Go to storefront product page an check price box css-->

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4040

4141
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
42-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
42+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
4343
</after>
4444
<!-- Assert attribute presence in storefront product additional information -->
4545
<amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/DeleteUsedInConfigurableProductAttributeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
7676

7777
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
78-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
78+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
7979
</after>
8080
<!-- Go to Stores > Attributes > Products. Search and select the product attribute that was used to create the configurable product-->
8181
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">

‎app/code/Magento/Catalog/Test/Mftf/Test/ProductAttributeWithoutValueInCompareListTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4747

4848
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
49-
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
49+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
5050
</after>
5151
<!--Open product page-->
5252
<amOnPage url="{{StorefrontProductPage.url($$createProductDefault.name$$)}}" stepKey="goToProductDefaultPage"/>

0 commit comments

Comments
 (0)