Skip to content

Commit 84b41da

Browse files
alzotaalzota
committed
ACP2E-1673: fix ACP2E-1367 attached AC-7106 mftf test
1 parent 4a66488 commit 84b41da

File tree

1 file changed

+52
-15
lines changed

1 file changed

+52
-15
lines changed

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

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminCreateOrdersAndCheckGridsTest">
1111
<annotations>
1212
<stories value="Create orders and check grids"/>
@@ -18,7 +18,8 @@
1818
<group value="sales"/>
1919
</annotations>
2020
<before>
21-
<magentoCLI command="config:set dev/grid/async_indexing 1" stepKey="enableAsyncIndexing"/>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
22+
<magentoCLI command="config:set {{AsyncGridsIndexingConfigData.enable_option}}" stepKey="enableAsyncIndexing"/>
2223
<magentoCLI command="cache:clean" stepKey="cacheCleanBefore"/>
2324
<createData entity="ApiCategory" stepKey="createCategory"/>
2425
<createData entity="defaultSimpleProduct" stepKey="createSimpleProduct">
@@ -27,7 +28,7 @@
2728
</before>
2829

2930
<after>
30-
<magentoCLI command="config:set dev/grid/async_indexing 0" stepKey="disableAsyncIndexing"/>
31+
<magentoCLI command="config:set {{AsyncGridsIndexingConfigData.disable_option}}" stepKey="disableAsyncIndexing"/>
3132
<magentoCLI command="cache:clean" stepKey="cacheCleanAfter"/>
3233
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3334
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
@@ -46,7 +47,7 @@
4647
<requiredEntity createDataKey="createGuestCartOne"/>
4748
</updateData>
4849

49-
<magentoCLI command="cron:run" stepKey="runCronOne"/>
50+
<magentoCLI command="cron:run --group=default" stepKey="runCronOne"/>
5051

5152
<createData entity="Invoice" stepKey="invoiceOrderOne">
5253
<requiredEntity createDataKey="createGuestCartOne"/>
@@ -68,7 +69,7 @@
6869
<requiredEntity createDataKey="createGuestCartOne"/>
6970
</createData>
7071

71-
<magentoCLI command="cron:run" stepKey="runCronTwo"/>
72+
<magentoCLI command="cron:run --group=default" stepKey="runCronTwo"/>
7273

7374
<createData entity="GuestCart" stepKey="createGuestCartThree"/>
7475
<createData entity="SimpleCartItem" stepKey="addCartItemThree">
@@ -94,7 +95,7 @@
9495
<requiredEntity createDataKey="createGuestCartTwo"/>
9596
</createData>
9697

97-
<magentoCLI command="cron:run" stepKey="runCronThree"/>
98+
<magentoCLI command="cron:run --group=default" stepKey="runCronThree"/>
9899

99100
<createData entity="Invoice" stepKey="invoiceOrderTwo">
100101
<requiredEntity createDataKey="createGuestCartTwo"/>
@@ -108,30 +109,33 @@
108109
<requiredEntity createDataKey="createGuestCartTwo"/>
109110
</createData>
110111

111-
<magentoCLI command="cron:run" stepKey="runCronFour"/>
112+
<magentoCLI command="cron:run --group=default" stepKey="runCronFour"/>
112113

113114
<createData entity="CreditMemo" stepKey="refundOrderThree">
114115
<requiredEntity createDataKey="createGuestCartThree"/>
115116
</createData>
116117

117-
<magentoCLI command="cron:run" stepKey="runCronFive"/>
118-
<magentoCLI command="cron:run" stepKey="runCronSix"/>
119-
<magentoCLI command="cron:run" stepKey="runCronSeven"/>
118+
<magentoCLI command="cron:run --group=default" stepKey="runCronFive"/>
119+
<magentoCLI command="cron:run --group=default" stepKey="runCronSix"/>
120+
<magentoCLI command="cron:run --group=default" stepKey="runCronSeven"/>
121+
<magentoCLI command="cron:run --group=default" stepKey="runCronEight"/>
122+
<magentoCLI command="cron:run --group=default" stepKey="runCronNine"/>
123+
<magentoCLI command="cron:run --group=default" stepKey="runCronTen"/>
120124

121125
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
122126

123127
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
124-
<waitForPageLoad time="60" stepKey="waitForGrid"/>
128+
<waitForPageLoad time="30" stepKey="waitForGrid"/>
125129
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
126130

127-
<grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createGuestCartOne.return$)}}" stepKey="getOrderOneId"/>
128-
<grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createGuestCartTwo.return$)}}" stepKey="getOrderTwoId"/>
129-
<grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createGuestCartThree.return$)}}" stepKey="getOrderThreeId"/>
130-
131131
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openOrderOne">
132132
<argument name="entityId" value="$createGuestCartOne.return$"/>
133133
</actionGroup>
134134

135+
<waitForPageLoad time="30" stepKey="waitForPageLoadOne"/>
136+
137+
<grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderIdOne"/>
138+
135139
<actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageOne"/>
136140
<waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask1" after="openInvoicesTabOrdersPageOne"/>
137141
<waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedOne"/>
@@ -145,6 +149,10 @@
145149
<argument name="entityId" value="$createGuestCartTwo.return$"/>
146150
</actionGroup>
147151

152+
<waitForPageLoad time="30" stepKey="waitForPageLoadTwo"/>
153+
154+
<grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderIdTwo"/>
155+
148156
<actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageTwo"/>
149157
<waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask2" after="openInvoicesTabOrdersPageTwo"/>
150158
<waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedTwo"/>
@@ -158,6 +166,10 @@
158166
<argument name="entityId" value="$createGuestCartThree.return$"/>
159167
</actionGroup>
160168

169+
<waitForPageLoad time="30" stepKey="waitForPageLoadThree"/>
170+
171+
<grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderIdThree"/>
172+
161173
<actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageThree"/>
162174
<waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask3" after="openInvoicesTabOrdersPageThree"/>
163175
<waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedThree"/>
@@ -166,5 +178,30 @@
166178
<seeElement selector="{{AdminOrderShipmentsTabSection.viewShipment}}" stepKey="seeForShipmentTabOpenedThree"/>
167179
<actionGroup ref="AdminGoToCreditMemoTabActionGroup" stepKey="goToCreditMemoTabThree"/>
168180
<see selector="{{AdminOrderCreditMemosTabSection.gridRowCell('1', 'Status')}}" userInput="Refunded" stepKey="seeCreditMemoStatusInGridThree"/>
181+
182+
183+
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdOne">
184+
<argument name="orderId" value="{$grabOrderIdOne}"/>
185+
</actionGroup>
186+
187+
<waitForPageLoad time="30" stepKey="waitForGridOne"/>
188+
189+
<see selector="{{AdminDataGridTableSection.gridCell('1', 'Status')}}" userInput="Closed" stepKey="seeOrderClosedInGridOne"/>
190+
191+
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdTwo">
192+
<argument name="orderId" value="{$grabOrderIdTwo}"/>
193+
</actionGroup>
194+
195+
<waitForPageLoad time="30" stepKey="waitForGridTwo"/>
196+
197+
<see selector="{{AdminDataGridTableSection.gridCell('1', 'Status')}}" userInput="Closed" stepKey="seeOrderClosedInGridTwo"/>
198+
199+
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdThree">
200+
<argument name="orderId" value="{$grabOrderIdThree}"/>
201+
</actionGroup>
202+
203+
<waitForPageLoad time="30" stepKey="waitForGridThree"/>
204+
205+
<see selector="{{AdminDataGridTableSection.gridCell('1', 'Status')}}" userInput="Closed" stepKey="seeOrderClosedInGridThree"/>
169206
</test>
170207
</tests>

0 commit comments

Comments
 (0)