Skip to content

Commit 2b7ab01

Browse files
alzotaalzota
committed
ACP2E-1367: add missing entities to grid in async mode; added mftf
1 parent fb95390 commit 2b7ab01

File tree

2 files changed

+35
-23
lines changed

2 files changed

+35
-23
lines changed

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

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -132,40 +132,37 @@
132132

133133
<actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageOne"/>
134134
<waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask1" after="openInvoicesTabOrdersPageOne"/>
135-
<see selector="{{AdminOrderInvoicesTabSection.gridRow('1')}}" stepKey="seeOrderInvoiceInTabGridOne" />
136-
<actionGroup ref="AdminOpenShipmentFromOrderPageActionGroup" stepKey="openShipmentsTabOrdersPageOne"/>
137-
<waitForLoadingMaskToDisappear stepKey="waitForShipmentGridLoadingMask2" after="openShipmentsTabOrdersPageOne"/>
138-
<see selector="{{AdminOrderShipmentsTabSection.gridRow('1')}}" stepKey="seeOrderShipmentInTabGridOne" />
139-
<actionGroup ref="AdminOpenCreditMemoFromOrderPageActionGroup" stepKey="openCreditMemosTabOrdersPageOne"/>
140-
<waitForLoadingMaskToDisappear stepKey="waitForCreditMemoGridLoadingMask3" after="openCreditMemosTabOrdersPageOne"/>
141-
<see selector="{{AdminOrderCreditMemosTabSection.gridRow('1')}}" stepKey="seeOrderCreditMemoInTabGridOne" />
135+
<waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedOne"/>
136+
<seeElement selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="seeForInvoicesTabOpenedOne"/>
137+
<actionGroup ref="AdminGoToShipmentTabActionGroup" stepKey="goToShipmentTabOne"/>
138+
<seeElement selector="{{AdminOrderShipmentsTabSection.viewShipment}}" stepKey="seeForShipmentTabOpenedOne"/>
139+
<actionGroup ref="AdminGoToCreditMemoTabActionGroup" stepKey="goToCreditMemoTabOne"/>
140+
<see selector="{{AdminOrderCreditMemosTabSection.gridRowCell('1', 'Status')}}" userInput="Refunded" stepKey="seeCreditMemoStatusInGridOne"/>
142141

143142
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openOrderTwo">
144143
<argument name="entityId" value="$createGuestCartTwo.return$"/>
145144
</actionGroup>
146145

147146
<actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageTwo"/>
148-
<waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask4" after="openInvoicesTabOrdersPageTwo"/>
149-
<see selector="{{AdminOrderInvoicesTabSection.gridRow('1')}}" stepKey="seeOrderInvoiceInTabGridTwo" />
150-
<actionGroup ref="AdminOpenShipmentFromOrderPageActionGroup" stepKey="openShipmentsTabOrdersPageTwo"/>
151-
<waitForLoadingMaskToDisappear stepKey="waitForShipmentGridLoadingMask5" after="openShipmentsTabOrdersPageTwo"/>
152-
<see selector="{{AdminOrderShipmentsTabSection.gridRow('1')}}" stepKey="seeOrderShipmentInTabGridTwo" />
153-
<actionGroup ref="AdminOpenCreditMemoFromOrderPageActionGroup" stepKey="openCreditMemosTabOrdersPageTwo"/>
154-
<waitForLoadingMaskToDisappear stepKey="waitForCreditMemoGridLoadingMask6" after="openCreditMemosTabOrdersPageTwo"/>
155-
<see selector="{{AdminOrderCreditMemosTabSection.gridRow('1')}}" stepKey="seeOrderCreditMemoInTabGridTwo" />
147+
<waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask2" after="openInvoicesTabOrdersPageTwo"/>
148+
<waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedTwo"/>
149+
<seeElement selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="seeForInvoicesTabOpenedTwo"/>
150+
<actionGroup ref="AdminGoToShipmentTabActionGroup" stepKey="goToShipmentTabTwo"/>
151+
<seeElement selector="{{AdminOrderShipmentsTabSection.viewShipment}}" stepKey="seeForShipmentTabOpenedTwo"/>
152+
<actionGroup ref="AdminGoToCreditMemoTabActionGroup" stepKey="goToCreditMemoTabTwo"/>
153+
<see selector="{{AdminOrderCreditMemosTabSection.gridRowCell('1', 'Status')}}" userInput="Refunded" stepKey="seeCreditMemoStatusInGridTwo"/>
156154

157155
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openOrderThree">
158156
<argument name="entityId" value="$createGuestCartThree.return$"/>
159157
</actionGroup>
160158

161159
<actionGroup ref="AdminOpenInvoiceTabFromOrderPageActionGroup" stepKey="openInvoicesTabOrdersPageThree"/>
162-
<waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask7" after="openInvoicesTabOrdersPageThree"/>
163-
<see selector="{{AdminOrderInvoicesTabSection.gridRow('1')}}" stepKey="seeOrderInvoiceInTabGridThree" />
164-
<actionGroup ref="AdminOpenShipmentFromOrderPageActionGroup" stepKey="openShipmentsTabOrdersPageThree"/>
165-
<waitForLoadingMaskToDisappear stepKey="waitForShipmentGridLoadingMask8" after="openShipmentsTabOrdersPageThree"/>
166-
<see selector="{{AdminOrderShipmentsTabSection.gridRow('1')}}" stepKey="seeOrderShipmentInTabGridThree" />
167-
<actionGroup ref="AdminOpenCreditMemoFromOrderPageActionGroup" stepKey="openCreditMemosTabOrdersPageThree"/>
168-
<waitForLoadingMaskToDisappear stepKey="waitForCreditMemoGridLoadingMask9" after="openCreditMemosTabOrdersPageThree"/>
169-
<see selector="{{AdminOrderCreditMemosTabSection.gridRow('1')}}" stepKey="seeOrderCreditMemoInTabGridThree" />
160+
<waitForLoadingMaskToDisappear stepKey="waitForInvoiceGridLoadingMask3" after="openInvoicesTabOrdersPageThree"/>
161+
<waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvoicesTabOpenedThree"/>
162+
<seeElement selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="seeForInvoicesTabOpenedThree"/>
163+
<actionGroup ref="AdminGoToShipmentTabActionGroup" stepKey="goToShipmentTabThree"/>
164+
<seeElement selector="{{AdminOrderShipmentsTabSection.viewShipment}}" stepKey="seeForShipmentTabOpenedThree"/>
165+
<actionGroup ref="AdminGoToCreditMemoTabActionGroup" stepKey="goToCreditMemoTabThree"/>
166+
<see selector="{{AdminOrderCreditMemosTabSection.gridRowCell('1', 'Status')}}" userInput="Refunded" stepKey="seeCreditMemoStatusInGridThree"/>
170167
</test>
171168
</tests>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminGoToCreditMemoTabActionGroup.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminGoToCreditMemoTabActionGroup">
12+
<click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickOrderCreditMemosTab"/>
13+
<waitForLoadingMaskToDisappear stepKey="waitForCreditMemoTabLoad" after="clickOrderCreditMemosTab"/>
14+
</actionGroup>
15+
</actionGroups>

0 commit comments

Comments
 (0)