Merge remote-tracking branch 'origin/MC-34251' into 2.4-develop-pr39

Author: zakdma

app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml

@@ -17,6 +17,7 @@
             <testCaseId value="MC-71"/>
             <group value="CatalogRule"/>
         </annotations>
+
         <before>
             <!-- Create a simple product and a category-->
             <createData entity="ApiCategory" stepKey="createCategory"/>
@@ -26,14 +27,15 @@
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteAllCatalogPriceRule"/>
-            <magentoCLI command="indexer:reindex" arguments="catalogsearch_fulltext" stepKey="reindexFulltextSearch"/>
         </before>
+
         <after>
             <!-- Delete the simple product and category -->
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteAllCatalogPriceRule"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
         <!-- Create a catalog rule for the NOT LOGGED IN customer group -->
@@ -43,8 +45,8 @@
         </actionGroup>
         <actionGroup ref="AdminCatalogPriceRuleFillActionsActionGroup" stepKey="fillActionsPriceRule"/>
         <actionGroup ref="AdminCatalogPriceRuleSaveAndApplyActionGroup" stepKey="saveAndApplyFPriceRule"/>
-        <!-- Perform reindex -->
-        <magentoCLI command="indexer:reindex" arguments="catalogrule_rule" stepKey="reindexPriceRuleIndex"/>
+        <!-- Perform reindex and flush cache -->
+        <actionGroup ref="AdminReindexAndFlushCache" stepKey="reindexAndFlushCache"/>
 
         <!-- As a NOT LOGGED IN user, go to the storefront category page and should see the discount -->
         <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToCategory1">