Skip to content

Commit 621ca07

Browse files
arnobsharnobsh
committed
Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-3063-updated
2 parents 846b20c + d290f35 commit 621ca07

File tree

477 files changed

+823
-3480
lines changed

Some content is hidden

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

477 files changed

+823
-3480
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/Bundle/Test/Mftf/Test/StorefrontBundlePlaceOrderWithVirtualAndSimpleChildrenTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
8080
<!--Click next button to open payment section-->
8181
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
82+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectDefaultPaymentMethod"/>
8283
<!--Click place order-->
8384
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
8485
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="clickOrderLink"/>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,14 @@
7979
<data key="filename">png</data>
8080
<data key="file_extension">png</data>
8181
</entity>
82+
<entity name="placeholderDummyBaseImage" type="imageFile">
83+
<data key="file">Dummy(3).jpg</data>
84+
<data key="name">Dummy(3)</data>
85+
<data key="extension">jpg</data>
86+
</entity>
87+
<entity name="PageBuilderBackgroundImage_LargerThan2MB" type="imageFile">
88+
<data key="file">LargerThan2MB.jpg</data>
89+
<data key="name">LargerThan2MB</data>
90+
<data key="extension">jpg</data>
91+
</entity>
8292
</entities>

‎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/AdminSeeFolderInContentSectionOfProductTest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
</annotations>
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
22+
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
2223
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2324
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2425
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
@@ -27,11 +28,12 @@
2728
</before>
2829
<after>
2930
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
30-
<actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
31+
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
3132
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
3233
<argument name="enabled" value="0"/>
3334
</actionGroup>
3435
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
36+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
3537
</after>
3638

3739
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="navigateToNewProduct"/>

‎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"/>

0 commit comments

Comments
 (0)