Skip to content

Commit 2e1df4e

Browse files
pmzandbergenpmzandbergen
authored
Merge branch '2.4-develop' into patch-11
2 parents f3352f4 + f76f2ec commit 2e1df4e

File tree

450 files changed

+115
-3420
lines changed

Some content is hidden

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

450 files changed

+115
-3420
lines changed

‎app/code/Magento/Backend/Block/Media/Uploader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function getImageUploadMaxHeight()
145145
*/
146146
protected function _prepareLayout()
147147
{
148-
$this->pageConfig->addPageAsset('jquery/fileUploader/css/jquery.fileupload-ui.css');
148+
$this->pageConfig->addPageAsset('jquery/uppy/dist/uppy.fileupload-ui.css');
149149
return parent::_prepareLayout();
150150
}
151151

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<description value="Login as admin and check the configurable product price when one child product child product price is updated"/>
1515
<severity value="CRITICAL"/>
1616
<group value="product"/>
17+
<group value="indexers_by_schedule_mode_only"/>
1718
</annotations>
1819
<before>
1920
<!-- Login as Admin -->
@@ -86,17 +87,17 @@
8687
</createData>
8788

8889
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
89-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
9090
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
9191
<argument name="indices" value=""/>
9292
</actionGroup>
93+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
9394
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
9495

9596
<!-- Wait till cron job runs for schedule updates -->
9697
<wait time="60" stepKey="waitForUpdateStarts"/>
9798
</before>
9899
<after>
99-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
100+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
100101
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindex"/>
101102

102103
<!-- Delete Created Data -->
@@ -108,9 +109,7 @@
108109
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
109110

110111
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
111-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
112-
<argument name="indices" value=""/>
113-
</actionGroup>
112+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindexInvalidatedIndices"/>
114113
</after>
115114

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MC-11009"/>
1818
<group value="mtf_migrated"/>
19+
<group value="indexers_by_schedule_mode_only"/>
1920
</annotations>
2021
<before>
2122
<!--Login as admin -->
@@ -35,14 +36,14 @@
3536
<!--Enable Flat Catalog Category -->
3637
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
3738
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
38-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
39+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
3940
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
4041
<argument name="indices" value=""/>
4142
</actionGroup>
4243
</before>
4344
<after>
4445
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
45-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
46+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
4647
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindex"/>
4748
<deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
4849
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MC-11007"/>
1818
<group value="mtf_migrated"/>
19+
<group value="indexers_by_schedule_mode_only"/>
1920
</annotations>
2021
<before>
2122
<!--Login as admin -->
@@ -35,14 +36,14 @@
3536
<!--Enable Flat Catalog Category -->
3637
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
3738
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
38-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
39+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
3940
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
4041
<argument name="indices" value=""/>
4142
</actionGroup>
4243
</before>
4344
<after>
4445
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
45-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
46+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
4647
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindex"/>
4748
<deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
4849
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MC-11008"/>
1818
<group value="mtf_migrated"/>
19+
<group value="indexers_by_schedule_mode_only"/>
1920
</annotations>
2021
<before>
2122
<!--Login as admin -->
@@ -35,15 +36,15 @@
3536
<!--Enable Flat Catalog Category -->
3637
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
3738
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
38-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
39+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
3940
<!-- Run cron -->
4041
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
4142
<argument name="indices" value=""/>
4243
</actionGroup>
4344
</before>
4445
<after>
4546
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
46-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
47+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
4748
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindex"/>
4849
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
4950
<argument name="customStore" value="customStoreEN"/>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MC-11296"/>
1818
<group value="catalog"/>
19+
<group value="indexers_by_schedule_mode_only"/>
1920
</annotations>
2021

2122
<before>
@@ -30,19 +31,15 @@
3031
<comment userInput="BIC workaround" stepKey="switchCatalogSearch"/>
3132

3233
<!-- Switch "Category Product", "Product Category" and "Catalog Search" indexers to "Update by Schedule" mode -->
33-
<actionGroup ref="CliIndexerSetScheduleModeActionGroup" stepKey="setScheduleIndexerMode">
34-
<argument name="indices" value="catalog_category_product catalog_product_category catalogsearch_fulltext"/>
35-
</actionGroup>
34+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setScheduleIndexerMode"/>
3635
</before>
3736

3837
<after>
3938
<comment userInput="BIC workaround" stepKey="onIndexManagement"/>
4039
<comment userInput="BIC workaround" stepKey="switchCategoryProduct"/>
4140
<comment userInput="BIC workaround" stepKey="switchProductCategory"/>
4241
<!-- Switch "Category Product", "Product Category" and "Catalog Search" indexers to "Update by Save" mode -->
43-
<actionGroup ref="CliIndexerSetRealtimeModeActionGroup" stepKey="setRealtimeIndexerMode">
44-
<argument name="indices" value="catalog_category_product catalog_product_category catalogsearch_fulltext"/>
45-
</actionGroup>
42+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setRealtimeIndexerMode"/>
4643

4744
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
4845
<deleteData createDataKey="createSecondCategory" stepKey="deleteSecondCategory"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<group value="Catalog"/>
1818
<group value="mtf_migrated"/>
1919
<group value="pr_exclude"/>
20+
<group value="indexers_by_schedule_mode_only"/>
2021
</annotations>
2122
<before>
2223
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
@@ -37,13 +38,13 @@
3738
<!--Enable Flat Catalog Category -->
3839
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
3940
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
40-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
41+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
4142
<!-- Run cron -->
4243
<magentoCron stepKey="runAllCronJobs"/>
4344
</before>
4445
<after>
4546
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
46-
<magentoCLI stepKey="setIndexersMode" command="indexer:set-mode" arguments="realtime" />
47+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setIndexersMode"/>
4748
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindex"/>
4849
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
4950
<argument name="customStore" value="customStoreEN"/>

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<severity value="CRITICAL"/>
1717
<group value="Catalog"/>
1818
<group value="mtf_migrated"/>
19+
<group value="indexers_by_schedule_mode_only"/>
1920
</annotations>
2021
<before>
2122
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
@@ -32,11 +33,9 @@
3233
<!--Enable Flat Catalog Category -->
3334
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
3435
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
35-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
36+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
3637
<!-- Reindex invalidated indices -->
37-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
38-
<argument name="indices" value=""/>
39-
</actionGroup>
38+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindexInvalidatedIndices"/>
4039
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
4140
</before>
4241
<after>
@@ -49,10 +48,8 @@
4948
</actionGroup>
5049
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5150
<magentoCLI command="config:set catalog/frontend/flat_catalog_category 0 " stepKey="setFlatCatalogCategory"/>
52-
<magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setIndexersMode"/>
53-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndicesAgain">
54-
<argument name="indices" value=""/>
55-
</actionGroup>
51+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setIndexersMode"/>
52+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindexInvalidatedIndicesAgain"/>
5653
</after>
5754
<!--Verify Category is not listed in navigation menu-->
5855
<amOnPage url="/{{CatNotIncludeInMenu.urlKey}}.html" stepKey="openCategoryPage"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<severity value="BLOCKER"/>
1717
<group value="Catalog"/>
1818
<group value="mtf_migrated"/>
19-
<group value="WYSIWYGDisabled"/>
19+
<group value="indexers_by_schedule_mode_only_wysiwyg_disabled"/>
2020
</annotations>
2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
@@ -33,13 +33,13 @@
3333
<!--Enable Flat Catalog Category -->
3434
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
3535
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
36-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
36+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
3737
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
3838
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
3939
</before>
4040
<after>
4141
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
42-
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
42+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
4343
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindex"/>
4444
<deleteData stepKey="deleteCategory" createDataKey="createCategory" />
4545
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
<group value="catalog"/>
2121
<group value="indexer"/>
2222
<group value="pr_exclude"/>
23+
<group value="indexers_by_schedule_mode_only"/>
2324
</annotations>
2425
<before>
2526
<!-- Change "Category Products", "Product Categories" and "Catalog Search" indexers to "Update by Schedule" mode -->
26-
<magentoCLI command="indexer:set-mode" arguments="schedule catalog_category_product catalog_product_category catalogsearch_fulltext" stepKey="setIndexerMode"/>
27+
<comment userInput="Adding the comment to replace 'indexer:set-mode schedule' command for preserving Backward Compatibility" stepKey="setIndexerMode"/>
2728

2829
<!-- Create categories K, L, M, N with different nesting in the tree and Anchor = Yes/No-->
2930
<!-- Category K is an anchor category -->
@@ -64,7 +65,7 @@
6465
</before>
6566
<after>
6667
<!-- Change indexers to "Update on Save" mode -->
67-
<magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setRealtimeMode"/>
68+
<comment userInput="Adding the comment to replace 'indexer:set-mode realtime' command for preserving Backward Compatibility" stepKey="setRealtimeMode"/>
6869

6970
<!-- Delete data -->
7071
<deleteData createDataKey="productA" stepKey="deleteProductA"/>

0 commit comments

Comments
 (0)