🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes

Accepted Community Pull Requests:
 - #31123: [MFTF] Refactoring of AdminMassOrdersCancelCompleteAndClosedTest (by @AnnaAPak)
 - #31021: Fix wrong format error DHL shipping label (by @vpsnak)
 - #31243: [MFTF] Updating with OpenEditProductOnBackendActionGroup (by @AnnaAPak)
 - #31241: [MFTF] Adding AssertAdminProductIsAssignedToCategoryActionGroup (by @AnnaAPak)
 - #31221: [MFTF] Refactoring of AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest (by @AnnaAPak)
 - #31053:  remove clearing cache for integration tests (by @Usik2203)
 - #31165: Invalid combination of tabs and spaces in phpstan.neon (by @DmitryFurs)
 - #31128: Removed usage of CliIndexerReindexActionGroup action group (by @sergiy-v)
 - #31147: [MFTF] Refactoring of AdminApplyTierPriceToProductWithPercentageDiscountTest (by @AnnaAPak)
 - #31097: [MFTF] Refactoring of ProductsQtyReturnAfterOrderCancelTest (by @AnnaAPak)
 - #30634: Fix minisearch not appear when disable suggestions search (by @mrtuvn)
 - #30837: [MFTF] create AssertLinkActionGroup (by @Usik2203)
 - #28007: Cron cleanup repeatedly hits deadlocks on large environments where groups can overlap (by @driskell)


Fixed GitHub Issues:
 - #31129: [Issue] [MFTF] Refactoring of AdminMassOrdersCancelCompleteAndClosedTest (reported by @m2-assistant[bot]) has been fixed in #31123 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 9847f03
     2. e34fc78
     3. beb0fda
     4. 320748f
     5. d2ab2f3
     6. 7dcd88b
     7. 732c6ff
     8. a70dfc9
     9. a5dd5e9
     10. 424754f
     11. 035442d
     12. aaea37c
     13. bc231ce
     14. de26bef

 - #31032: [Issue] Fix wrong format error DHL shipping label (reported by @m2-assistant[bot]) has been fixed in #31021 by @vpsnak in 2.4-develop branch
   Related commits:
     1. ba1a339
     2. a8c72b0
     3. 0bdf6ab
     4. 93c09b3
     5. 923091e
     6. 72574a8
     7. a3536cb
     8. f5ed249
     9. ca76fdb
     10. b0e5d5a
     11. 22f4f8e
     12. f20cf58
     13. cff6a6f
     14. ff97950
     15. 8749553
     16. 673bd22

 - #31249: [Issue] [MFTF] Updating with OpenEditProductOnBackendActionGroup (reported by @m2-assistant[bot]) has been fixed in #31243 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 2587e32
     2. 36a3a33

 - #31250: [Issue] [MFTF] Adding AssertAdminProductIsAssignedToCategoryActionGroup (reported by @m2-assistant[bot]) has been fixed in #31241 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. e85f913
     2. 03bcb4c

 - #31234: [Issue] [MFTF] Refactoring of AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest (reported by @m2-assistant[bot]) has been fixed in #31221 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. fe6298b
     2. e4fde6b
     3. 1dd1046
     4. 706e63d
     5. f6db4a7

 - #31074: [Issue] [WIP] remove clearing cache for integration tests (reported by @m2-assistant[bot]) has been fixed in #31053 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. be7872a
     2. f13157d
     3. 6c2d07c
     4. 23ddcfc
     5. 275ca3e
     6. 76adba3
     7. 62f2e60
     8. b85ba43
     9. 32b93de
     10. 9ec34d8

 - #31239: [Issue] Invalid combination of tabs and spaces in phpstan.neon (reported by @m2-assistant[bot]) has been fixed in #31165 by @DmitryFurs in 2.4-develop branch
   Related commits:
     1. a119cbe

 - #31130: [Issue] Removed usage of CliIndexerReindexActionGroup action group (reported by @m2-assistant[bot]) has been fixed in #31128 by @sergiy-v in 2.4-develop branch
   Related commits:
     1. 8e1a0ae
     2. 00fa246
     3. ffa36a2
     4. c431ea4

 - #31153: [Issue] [MFTF] Refactoring of AdminApplyTierPriceToProductWithPercentageDiscountTest (reported by @m2-assistant[bot]) has been fixed in #31147 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. d4e1641
     2. fe39fba
     3. f964c24
     4. 7804196
     5. 0a2a174
     6. f9445cc
     7. 08a6edc

 - #31132: [Issue] [MFTF] Refactoring of ProductsQtyReturnAfterOrderCancelTest (reported by @m2-assistant[bot]) has been fixed in #31097 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. f36929a
     2. 94cdcf1
     3. 0d32349
     4. 9bffc08
     5. ad511d6
     6. 234c784
     7. 56e2026
     8. 0d93b24
     9. 04bd4bd
     10. a4403e9
     11. ce31180

 - #30584: mini search field head does not appear if suggestions and recommendations are disabled. Luma Theme and mobile navigation. (reported by @redati) has been fixed in #30634 by @mrtuvn in 2.4-develop branch
   Related commits:
     1. e567fd6
     2. dd044a0

 - #30858: [Issue] [MFTF] create AssertLinkActionGroup (reported by @m2-assistant[bot]) has been fixed in #30837 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. 9bea792
     2. 57c62ea
     3. 8eac299

 - #8933: 1213 Deadlock found when trying to get lock (reported by @w130pmpo) has been fixed in #28007 by @driskell in 2.4-develop branch
   Related commits:
     1. aa12503
     2. b0b72b0
     3. 315bd3a
     4. 96029b5
     5. 7df183b
     6. 68d679b
     7. a901619
     8. dda5c72
     9. 4d4fa68
     10. e95d2fe
     11. 916bc93
     12. edd7753
     13. e70027f
     14. 92dc764
     15. d1b22ff
     16. a76482c

 - #18409: Magento 2.2.5 - Cron Job Error. Sqlstate[40001]: Serialization failure: 1213 Deadlock (reported by @sourav88) has been fixed in #28007 by @driskell in 2.4-develop branch
   Related commits:
     1. aa12503
     2. b0b72b0
     3. 315bd3a
     4. 96029b5
     5. 7df183b
     6. 68d679b
     7. a901619
     8. dda5c72
     9. 4d4fa68
     10. e95d2fe
     11. 916bc93
     12. edd7753
     13. e70027f
     14. 92dc764
     15. d1b22ff
     16. a76482c

 - #22438: Magento 2.3.1 Cron Deadlocks for cron_schedule (reported by @seansan) has been fixed in #28007 by @driskell in 2.4-develop branch
   Related commits:
     1. aa12503
     2. b0b72b0
     3. 315bd3a
     4. 96029b5
     5. 7df183b
     6. 68d679b
     7. a901619
     8. dda5c72
     9. 4d4fa68
     10. e95d2fe
     11. 916bc93
     12. edd7753
     13. e70027f
     14. 92dc764
     15. d1b22ff
     16. a76482c

 - #23054: Cron job not running after crashed once (reported by @QuentinFarizon) has been fixed in #28007 by @driskell in 2.4-develop branch
   Related commits:
     1. aa12503
     2. b0b72b0
     3. 315bd3a
     4. 96029b5
     5. 7df183b
     6. 68d679b
     7. a901619
     8. dda5c72
     9. 4d4fa68
     10. e95d2fe
     11. 916bc93
     12. edd7753
     13. e70027f
     14. 92dc764
     15. d1b22ff
     16. a76482c

 - #25634: Magento 2.3.3 Cronjob use too much CPU source (reported by @Yuwei9291) has been fixed in #28007 by @driskell in 2.4-develop branch
   Related commits:
     1. aa12503
     2. b0b72b0
     3. 315bd3a
     4. 96029b5
     5. 7df183b
     6. 68d679b
     7. a901619
     8. dda5c72
     9. 4d4fa68
     10. e95d2fe
     11. 916bc93
     12. edd7753
     13. e70027f
     14. 92dc764
     15. d1b22ff
     16. a76482c

 - #26507: Cronjobs increasing CPU usage and slow queries (reported by @Zyles) has been fixed in #28007 by @driskell in 2.4-develop branch
   Related commits:
     1. aa12503
     2. b0b72b0
     3. 315bd3a
     4. 96029b5
     5. 7df183b
     6. 68d679b
     7. a901619
     8. dda5c72
     9. 4d4fa68
     10. e95d2fe
     11. 916bc93
     12. edd7753
     13. e70027f
     14. 92dc764
     15. d1b22ff
     16. a76482c

 - #26809: Cron using too many resources. (reported by @bobemoe) has been fixed in #28007 by @driskell in 2.4-develop branch
   Related commits:
     1. aa12503
     2. b0b72b0
     3. 315bd3a
     4. 96029b5
     5. 7df183b
     6. 68d679b
     7. a901619
     8. dda5c72
     9. 4d4fa68
     10. e95d2fe
     11. 916bc93
     12. edd7753
     13. e70027f
     14. 92dc764
     15. d1b22ff
     16. a76482c

Author: magento-engcom-team

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertLinkActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertLinkActionGroup">
+        <annotations>
+            <description>Assert text and url of the links.</description>
+        </annotations>
+        <arguments>
+            <argument name="text" type="string"/>
+            <argument name="url" type="string"/>
+        </arguments>
+
+        <seeLink userInput="{{text}}" url="{{url}}" stepKey="assertLinks"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/Test/AdminPrivacyPolicyTest.xml

@@ -23,70 +23,91 @@
         <!-- Logging in Magento admin and checking for Privacy policy footer in dashboard -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <closeAdminNotification stepKey="closeAdminNotification"/>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkDashboard"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkDashboard">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in salesOrderPage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesOrder">
             <argument name="menuUiId" value="magento-sales-sales"/>
             <argument name="submenuUiId" value="magento-sales-sales-order"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkSalesOrder"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkSalesOrder">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in catalogProductsPage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogProducts">
             <argument name="menuUiId" value="magento-catalog-catalog"/>
             <argument name="submenuUiId" value="magento-catalog-catalog-products"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkCatalogProducts"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkCatalogProducts">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in customersAllCustomersPage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCustomersAllCustomers">
             <argument name="menuUiId" value="magento-customer-customer"/>
             <argument name="submenuUiId" value="magento-customer-customer-manage"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkCustomersAllCustomers"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkCustomersAllCustomers">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in marketingCatalogPriceRulePage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingCatalogPriceRule">
             <argument name="menuUiId" value="magento-backend-marketing"/>
             <argument name="submenuUiId" value="magento-catalogrule-promo-catalog"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkMarketingCatalogPriceRule"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkMarketingCatalogPriceRule">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in contentBlocksPage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentBlocks">
             <argument name="menuUiId" value="magento-backend-content"/>
             <argument name="submenuUiId" value="magento-cms-cms-block"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkContentBlocks"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkContentBlocks">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in reportSearcbTermsPage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsSearchTerms">
             <argument name="menuUiId" value="magento-reports-report"/>
             <argument name="submenuUiId" value="magento-search-report-search-term"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkReportsSearchTerms"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkReportsSearchTerms">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in storesAllStoresPage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresAllStores">
             <argument name="menuUiId" value="magento-backend-stores"/>
             <argument name="submenuUiId" value="magento-backend-system-store"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkStoresAllStores"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkStoresAllStores">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in systemImportPage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemImport">
             <argument name="menuUiId" value="magento-backend-system"/>
             <argument name="submenuUiId" value="magento-importexport-system-convert-import"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkSystemImport"/>
-
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkSystemImport">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
         <!-- Checking for Privacy policy footer in findPartnersAndExtensionsPage -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToFindPartnersAndExtensions">
             <argument name="menuUiId" value="magento-marketplace-partners"/>
             <argument name="submenuUiId" value="magento-marketplace-partners"/>
         </actionGroup>
-        <seeLink userInput="Privacy Policy" url="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf" stepKey="seePrivacyPolicyLinkFindPartnersAndExtensions"/>
+        <actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkFindPartnersAndExtensions">
+            <argument name="text" value="Privacy Policy"/>
+            <argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
+        </actionGroup>
     </test>
 </tests>
 

app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml

@@ -42,10 +42,7 @@
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
 
-            <!-- Reindex -->
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value=""/>
-            </actionGroup>
+            <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
 
             <!-- Login as admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicPriceProductTest.xml

@@ -36,9 +36,7 @@
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
             <!-- TODO: Remove this action when MC-37719 will be fixed -->
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
-                <argument name="indices" value="cataloginventory_stock"/>
-            </actionGroup>
+            <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindexInvalidatedIndices"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>

app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml

@@ -133,9 +133,7 @@
         <click selector="{{AdminProductFiltersSection.enable}}" stepKey="ClickOnEnable"/>
 
         <!--Clear Cache - reindex - resets products according to enabled/disabled view-->
-        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-            <argument name="indices" value=""/>
-        </actionGroup>
+        <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
             <argument name="tags" value=""/>
         </actionGroup>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml

@@ -41,7 +41,7 @@
                 <requiredEntity createDataKey="apiSimple"/>
             </createData>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value=""/>
+                <argument name="indices" value="cataloginventory_stock catalog_product_price"/>
             </actionGroup>
         </before>
         <after>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml

@@ -39,8 +39,9 @@
                 <requiredEntity createDataKey="fixedBundleOption"/>
                 <requiredEntity createDataKey="createSimpleProductTwo"/>
             </createData>
+
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value=""/>
+                <argument name="indices" value="cataloginventory_stock catalog_product_price"/>
             </actionGroup>
         </before>
         <after>

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

@@ -96,7 +96,7 @@
 
             <!-- Perform CLI reindex -->
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value=""/>
+                <argument name="indices" value="cataloginventory_stock catalog_product_price"/>
             </actionGroup>
         </before>
         <after>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml

@@ -168,7 +168,7 @@
             <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
 
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value=""/>
+                <argument name="indices" value="cataloginventory_stock catalog_product_price"/>
             </actionGroup>
         </before>
         <after>

app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml

@@ -42,7 +42,7 @@
             <argument name="tags" value="full_page"/>
         </actionGroup>
         <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindexAfterCreate">
-            <argument name="indices" value=""/>
+            <argument name="indices" value="catalog_product_price"/>
         </actionGroup>
 
         <!-- Check Bundle product is visible on the storefront-->
@@ -63,9 +63,7 @@
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterUpdate">
             <argument name="tags" value="full_page"/>
         </actionGroup>
-        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindexAfterUpdate">
-            <argument name="indices" value=""/>
-        </actionGroup>
+        <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindexAfterUpdate"/>
 
         <!-- Check Bundle product is still visible on the storefront-->
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPageAfterUpdate">

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignTwoCategoriesToProductActionGroup.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAssignTwoCategoriesToProductActionGroup" extends="AdminAssignCategoryToProductAndSaveActionGroup">
+        <annotations>
+            <description>Extends AdminAssignCategoryToProductAndSaveActionGroup + assigns the second category and prevents product saving (the Product Edit page should be opened in Admin prior this check).</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryTwoName" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown2" after="waitForApplyCategory"/>
+        <checkOption selector="{{AdminProductFormSection.selectCategory(categoryTwoName)}}" stepKey="selectCategoryTwo"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickDone2"/>
+        <waitForPageLoad stepKey="waitForApplyCategoryTwo"/>
+        <remove keyForRemoval="clickSave"/>
+        <remove keyForRemoval="waitForSavingProduct"/>
+        <remove keyForRemoval="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillMainProductFormActionGroup.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFillMainProductFormActionGroup" extends="FillMainProductFormActionGroup">
+        <annotations>
+            <description>Extends FillMainProductFormActionGroup with filling the next fields: Tax Class, Visibility, SEO->URL </description>
+        </annotations>
+
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{product.productTaxClass}}" stepKey="selectProductTaxClass"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{product.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{product.urlKey}}" stepKey="fillUrlKey"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminManageStockOnEditPageActionGroup.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAdminManageStockOnEditPageActionGroup">
+        <annotations>
+            <description>Check if manageStock value is correct
+                        (the Product Edit page->Advanced Inventory section should be opened in Admin prior this check).</description>
+        </annotations>
+        <arguments>
+            <argument name="manageStock" type="string"/>
+        </arguments>
+
+        <see selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" userInput="{{manageStock}}" stepKey="seeManageStock"/>
+         
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductInfoOnEditPageActionGroup.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAdminProductInfoOnEditPageActionGroup">
+        <annotations>
+            <description>Validates next fields on the Product Edit Page: 
+                        name, sku, price, quantity, stock status, tax class, weight, weigh select, visibility, url key</description>
+        </annotations>
+        <arguments>
+            <argument name="product" type="entity"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="seeProductStockStatus"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{product.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="seeSimpleProductWeight"/>
+        <seeInField selector="{{AdminProductFormSection.productWeightSelect}}" userInput="{{product.weightSelect}}" stepKey="seeSimpleProductWeightSelect"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{product.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{product.urlKey}}" stepKey="seeUrlKey"/>
+    </actionGroup>
+</actionGroups>