Merge branch '2.4-develop' into 2.4-develop-temporary-three-prs

sergiy-v · Jan 17, 2020 · 5014fee · 5014fee
2 parents fca6256 + c2e2646
commit 5014fee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/...code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml b/...code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
@@ -33,8 +33,9 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Assert attribute presence in storefront product additional information -->

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
@@ -148,6 +148,7 @@
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetSearch"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
             <deleteData stepKey="deleteAttribute" createDataKey="createConfigProductAttribute"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Create configurable product from downloadable product page-->

diff --git a/.../Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml b/.../Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
@@ -72,6 +72,8 @@
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
+            <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
+
             <!-- Log out -->
             <actionGroup ref="logout" stepKey="logout"/>
         </after>