Merge branch 'ACP2E-1367' of https://github.com/magento-l3/magento2ce into PR-02142023

Author: chittima

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

@@ -18,7 +18,8 @@
             <group value="sales"/>
         </annotations>
         <before>
-            <magentoCLI command="config:set dev/grid/async_indexing 1" stepKey="enableAsyncIndexing"/>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <magentoCLI command="config:set {{AsyncGridsIndexingConfigData.enable_option}}" stepKey="enableAsyncIndexing"/>
             <magentoCLI command="cache:clean" stepKey="cacheCleanBefore"/>
             <createData entity="ApiCategory" stepKey="createCategory"/>
             <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct">
@@ -27,7 +28,7 @@
         </before>
 
         <after>
-            <magentoCLI command="config:set dev/grid/async_indexing 0" stepKey="disableAsyncIndexing"/>
+            <magentoCLI command="config:set {{AsyncGridsIndexingConfigData.disable_option}}" stepKey="disableAsyncIndexing"/>
             <magentoCLI command="cache:clean" stepKey="cacheCleanAfter"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
@@ -46,7 +47,7 @@
             <requiredEntity createDataKey="createGuestCartOne"/>
         </updateData>
 
-        <magentoCLI command="cron:run" stepKey="runCronOne"/>
+        <magentoCLI command="cron:run --group=default" stepKey="runCronOne"/>
 
         <createData entity="Invoice" stepKey="invoiceOrderOne">
             <requiredEntity createDataKey="createGuestCartOne"/>
@@ -68,7 +69,7 @@
             <requiredEntity createDataKey="createGuestCartOne"/>
         </createData>
 
-        <magentoCLI command="cron:run" stepKey="runCronTwo"/>
+        <magentoCLI command="cron:run --group=default" stepKey="runCronTwo"/>
 
         <createData entity="GuestCart" stepKey="createGuestCartThree"/>
         <createData entity="SimpleCartItem" stepKey="addCartItemThree">
@@ -94,7 +95,7 @@
             <requiredEntity createDataKey="createGuestCartTwo"/>
         </createData>
 
-        <magentoCLI command="cron:run" stepKey="runCronThree"/>
+        <magentoCLI command="cron:run --group=default" stepKey="runCronThree"/>
 
         <createData entity="Invoice" stepKey="invoiceOrderTwo">
             <requiredEntity createDataKey="createGuestCartTwo"/>
@@ -108,15 +109,17 @@
             <requiredEntity createDataKey="createGuestCartTwo"/>
         </createData>
 
-        <magentoCLI command="cron:run" stepKey="runCronFour"/>
+        <magentoCLI command="cron:run --group=default" stepKey="runCronFour"/>
 
         <createData entity="CreditMemo" stepKey="refundOrderThree">
             <requiredEntity createDataKey="createGuestCartThree"/>
         </createData>
 
-        <magentoCLI command="cron:run" stepKey="runCronFive"/>
-        <magentoCLI command="cron:run" stepKey="runCronSix"/>
-        <magentoCLI command="cron:run" stepKey="runCronSeven"/>
+        <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"/>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
 
@@ -132,6 +135,8 @@
             <argument name="entityId" value="$createGuestCartOne.return$"/>
         </actionGroup>
 
+        <waitForPageLoad time="30" stepKey="waitForPageLoadOne"/>
+
         <actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageOne"/>
         <waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask1" after="openInvoicesTabOrdersPageOne"/>
         <waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedOne"/>
@@ -145,6 +150,8 @@
             <argument name="entityId" value="$createGuestCartTwo.return$"/>
         </actionGroup>
 
+        <waitForPageLoad time="30" stepKey="waitForPageLoadTwo"/>
+
         <actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageTwo"/>
         <waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask2" after="openInvoicesTabOrdersPageTwo"/>
         <waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedTwo"/>
@@ -158,6 +165,8 @@
             <argument name="entityId" value="$createGuestCartThree.return$"/>
         </actionGroup>
 
+        <waitForPageLoad time="30" stepKey="waitForPageLoadThree"/>
+
         <actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageThree"/>
         <waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask3" after="openInvoicesTabOrdersPageThree"/>
         <waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedThree"/>