Merge branch 'stability_control' of github.com:magento-pangolin/magento2ce into stability_control

Author: okolesnyk

app/code/Magento/AsyncConfig/Test/Mftf/Suite/AsyncOperationsSuite.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
+    <suite name="AsyncOperationsSuite">
+        <include>
+            <group name="async_operations"/>
+        </include>
+    </suite>
+</suites>

app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

@@ -16,6 +16,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="ACPT-885"/>
             <group value="configuration"/>
+            <group value="async_operations" />
         </annotations>
         <before>
             <!--Enable Async Configuration-->

app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrdersAndCheckGridsTest.xml

@@ -16,6 +16,7 @@
             <useCaseId value="ACP2E-1367" />
             <testCaseId value="AC-7106" />
             <group value="sales"/>
+            <group value="async_operations" />
         </annotations>
         <before>
             <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
@@ -47,7 +48,7 @@
             <requiredEntity createDataKey="createGuestCartOne"/>
         </updateData>
 
-        <magentoCLI command="cron:run --group=default" stepKey="runCronOne"/>
+        <magentoCron groups="default" stepKey="runCronOne"/>
 
         <createData entity="Invoice" stepKey="invoiceOrderOne">
             <requiredEntity createDataKey="createGuestCartOne"/>
@@ -69,7 +70,7 @@
             <requiredEntity createDataKey="createGuestCartOne"/>
         </createData>
 
-        <magentoCLI command="cron:run --group=default" stepKey="runCronTwo"/>
+        <magentoCron groups="default" stepKey="runCronTwo"/>
 
         <createData entity="GuestCart" stepKey="createGuestCartThree"/>
         <createData entity="SimpleCartItem" stepKey="addCartItemThree">
@@ -95,7 +96,7 @@
             <requiredEntity createDataKey="createGuestCartTwo"/>
         </createData>
 
-        <magentoCLI command="cron:run --group=default" stepKey="runCronThree"/>
+        <magentoCron groups="default" stepKey="runCronThree"/>
 
         <createData entity="Invoice" stepKey="invoiceOrderTwo">
             <requiredEntity createDataKey="createGuestCartTwo"/>
@@ -109,17 +110,18 @@
             <requiredEntity createDataKey="createGuestCartTwo"/>
         </createData>
 
-        <magentoCLI command="cron:run --group=default" stepKey="runCronFour"/>
+        <magentoCron groups="default" stepKey="runCronFour"/>
 
         <createData entity="CreditMemo" stepKey="refundOrderThree">
             <requiredEntity createDataKey="createGuestCartThree"/>
         </createData>
 
-        <magentoCLI command="cron:run --group=default" stepKey="runCronFive"/>
-        <magentoCLI command="cron:run --group=default" stepKey="runCronSix"/>
-        <magentoCLI command="cron:run --group=default" stepKey="runCronSeven"/>
-        <magentoCLI command="cron:run --group=default" stepKey="runCronEight"/>
-        <magentoCLI command="cron:run --group=default" stepKey="runCronNine"/>
+        <magentoCron groups="default" stepKey="runCronFive"/>
+        <comment userInput="Preserve BIC" stepKey="runCronSix"/>
+        <comment userInput="Preserve BIC" stepKey="runCronSeven"/>
+        <comment userInput="Preserve BIC" stepKey="runCronEight"/>
+        <comment userInput="Preserve BIC" stepKey="runCronNine"/>
+
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
 
@@ -135,7 +137,7 @@
             <argument name="entityId" value="$createGuestCartOne.return$"/>
         </actionGroup>
 
-        <waitForPageLoad time="30" stepKey="waitForPageLoadOne"/>
+        <wait time="30" stepKey="waitForPageLoadOne"/>
 
         <actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageOne"/>
         <waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask1" after="openInvoicesTabOrdersPageOne"/>
@@ -150,7 +152,7 @@
             <argument name="entityId" value="$createGuestCartTwo.return$"/>
         </actionGroup>
 
-        <waitForPageLoad time="30" stepKey="waitForPageLoadTwo"/>
+        <wait time="30" stepKey="waitForPageLoadTwo"/>
 
         <actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageTwo"/>
         <waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask2" after="openInvoicesTabOrdersPageTwo"/>
@@ -165,7 +167,7 @@
             <argument name="entityId" value="$createGuestCartThree.return$"/>
         </actionGroup>
 
-        <waitForPageLoad time="30" stepKey="waitForPageLoadThree"/>
+        <wait time="30" stepKey="waitForPageLoadThree"/>
 
         <actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageThree"/>
         <waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask3" after="openInvoicesTabOrdersPageThree"/>

app/code/Magento/Search/Test/Mftf/Test/AutoCompleteSearchTermsAndPhrasesWhileUserIsTypingTest.xml

@@ -8,7 +8,6 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AutoCompleteSearchTermsAndPhrasesWhileUserIsTypingTest">
-
         <annotations>
             <stories value="Search Terms"/>
             <title value="In this test-case we need to verify that previously used earlier search terms are auto-complete"/>
@@ -22,7 +21,9 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <!--Create Simple Product -->
             <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
-            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
         </before>
         <after>
@@ -68,6 +69,5 @@
         <actionGroup ref="StorefrontAssertProductNameOnProductMainPageActionGroup" stepKey="seeProductNameSku">
             <argument name="productName" value="$$simpleProduct.name$$"/>
         </actionGroup>
-
     </test>
 </tests>