ENGCOM-6837: Fix failure for missing product on Storefront #26779

Author: slavvka

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml

@@ -30,6 +30,7 @@
             <argument name="category" value="$$createPreReqCategory$$"/>
             <argument name="simpleProduct" value="_defaultProduct"/>
         </actionGroup>
+        <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
             <argument name="category" value="$$createPreReqCategory$$"/>
             <argument name="product" value="_defaultProduct"/>

app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml

@@ -55,8 +55,8 @@
                 <argument name="categoryName" value="$$categoryN.name$$, $$categoryM.name$$"/>
             </actionGroup>
 
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" arguments="full_page" stepKey="flushCache"/>
+            <wait stepKey="waitBeforeRunCronIndex" time="30"/>
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <!-- Change "Category Products" and "Product Categories" indexers to "Update on Save" mode -->
@@ -138,9 +138,9 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$categoryK.custom_attributes[url_key]$$/$$categoryN.custom_attributes[url_key]$$)}}" stepKey="amOnCategoryN"/>
         <see userInput="$$productC.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductInCategoryN"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCron"/>
-        <magentoCLI command="cron:run" stepKey="runCronAgain"/>
+        <!-- Run cron -->
+        <wait stepKey="waitBeforeRunMagentoCron" time="30"/>
+        <magentoCLI stepKey="runMagentoCron" command="cron:run --group=index"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are applied -->
         <!-- Category K contains only Products A, C -->
@@ -199,9 +199,9 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$categoryK.custom_attributes[url_key]$$/$$categoryN.custom_attributes[url_key]$$)}}" stepKey="onStorefrontCategoryN"/>
         <see userInput="$$productC.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="productCOnCategoryN"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="firstCronRun"/>
-        <magentoCLI command="cron:run" stepKey="secondCronRun"/>
+        <!-- Run Cron once to reindex product changes -->
+        <wait stepKey="waitBeforeRunCronIndexAfterProductAssignToCategory" time="30"/>
+        <magentoCLI stepKey="runCronIndexAfterProductAssignToCategory" command="cron:run --group=index"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are applied -->