Skip to content

Commit d2ab2f3

Browse files
AnnaAPakAnnaAPak
committed
AdminCancelTheOrderWithCashOnDeliveryPaymentMethodTest refactoring (in progress)
1 parent 320748f commit d2ab2f3

File tree

3 files changed

+146
-2
lines changed

3 files changed

+146
-2
lines changed

‎app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,11 @@
2424
<requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity>
2525
<requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
2626
</entity>
27+
28+
<entity name="CustomerOrderPaymentMethod" type="CustomerPaymentInformation">
29+
<var key="cart_id" entityKey="return" entityType="CustomerCart"/>
30+
<requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity>
31+
<requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
32+
</entity>
33+
2734
</entities>

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

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminMassOrdersCancelCompleteAndClosedAPITest">
12+
<annotations>
13+
<stories value="Mass Update Orders"/>
14+
<title value="Mass cancel orders in status Complete, Closed"/>
15+
<description value="Try to cancel orders in status Complete, Closed"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="MC-16183"/>
18+
<group value="sales"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
23+
24+
<createData entity="ApiCategory" stepKey="createCategory"/>
25+
26+
<createData entity="defaultSimpleProduct" stepKey="createSimpleProduct">
27+
<requiredEntity createDataKey="createCategory"/>
28+
</createData>
29+
30+
<createData entity="GuestCart" stepKey="createGuestCartOne"/>
31+
<createData entity="SimpleCartItem" stepKey="addCartItemOne">
32+
<requiredEntity createDataKey="createGuestCartOne"/>
33+
<requiredEntity createDataKey="createSimpleProduct"/>
34+
</createData>
35+
<createData entity="GuestAddressInformation" stepKey="addGuestOrderAddressOne">
36+
<requiredEntity createDataKey="createGuestCartOne"/>
37+
</createData>
38+
<updateData createDataKey="createGuestCartOne" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformationOne">
39+
<requiredEntity createDataKey="createGuestCartOne"/>
40+
</updateData>
41+
42+
<createData entity="Invoice" stepKey="invoiceOrderOne">
43+
<requiredEntity createDataKey="createGuestCartOne"/>
44+
</createData>
45+
46+
<createData entity="Shipment" stepKey="shipOrderOne">
47+
<requiredEntity createDataKey="createGuestCartOne"/>
48+
</createData>
49+
50+
51+
<createData entity="GuestCart" stepKey="createGuestCartTwo"/>
52+
<createData entity="SimpleCartItem" stepKey="addCartItemTwo">
53+
<requiredEntity createDataKey="createGuestCartTow"/>
54+
<requiredEntity createDataKey="createSimpleProduct"/>
55+
</createData>
56+
<createData entity="GuestAddressInformation" stepKey="addGuestOrderAddressTwo">
57+
<requiredEntity createDataKey="createGuestCartTwo"/>
58+
</createData>
59+
<updateData createDataKey="createGuestCartTwo" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformationTwo">
60+
<requiredEntity createDataKey="createGuestCartTwo"/>
61+
</updateData>
62+
63+
<createData entity="Invoice" stepKey="invoiceOrderTwo">
64+
<requiredEntity createDataKey="createGuestCartTwo"/>
65+
</createData>
66+
67+
<createData entity="CreditMemo" stepKey="refundOrderTwo">
68+
<requiredEntity createDataKey="createGuestCartTwo"/>
69+
</createData>
70+
71+
</before>
72+
<after>
73+
<!-- Delete data -->
74+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
75+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
76+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
77+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
78+
</after>
79+
80+
<!-- Create first order -->
81+
<!-- <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder">
82+
<argument name="product" value="$$createProduct$$"/>
83+
<argument name="customer" value="$$createCustomer$$"/>
84+
</actionGroup>
85+
<grabTextFrom selector="|Order # (\d+)|" stepKey="getFirstOrderId"/>
86+
<assertNotEmpty stepKey="assertOrderIdIsNotEmpty" after="getFirstOrderId">
87+
<actualResult type="const">$getFirstOrderId</actualResult>
88+
</assertNotEmpty> -->
89+
90+
<!-- Create Shipment for first Order -->
91+
<!-- <actionGroup ref="AdminCreateInvoiceAndShipmentActionGroup" stepKey="createShipmentForFirstOrder"/> -->
92+
93+
<!-- Create second order -->
94+
<!-- <actionGroup ref="CreateOrderActionGroup" stepKey="createSecondOrder">
95+
<argument name="product" value="$$createProduct$$"/>
96+
<argument name="customer" value="$$createCustomer$$"/>
97+
</actionGroup>
98+
<grabTextFrom selector="|Order # (\d+)|" stepKey="getSecondOrderId"/>
99+
<assertNotEmpty stepKey="assertSecondOrderIdIsNotEmpty" after="getSecondOrderId">
100+
<actualResult type="const">$getSecondOrderId</actualResult>
101+
</assertNotEmpty> -->
102+
103+
<!-- Create CreditMemo for second Order -->
104+
<!-- <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/> -->
105+
106+
<!-- Navigate to backend: Go to Sales > Orders -->
107+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
108+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
109+
110+
<!-- Select Mass Action according to dataset: Cancel -->
111+
<actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionCancel">
112+
<argument name="action" value="Cancel"/>
113+
<argument name="orderId" value="$createGuestCartOne.return$"/>
114+
<argument name="secondOrderId" value="$createGuestCartTwo.return$"/>
115+
</actionGroup>
116+
<see userInput="You cannot cancel the order(s)." stepKey="assertOrderCancelMassActionFailMessage"/>
117+
118+
<!--Assert first order in orders grid -->
119+
<actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
120+
<argument name="orderId" value="$createGuestCartOne.return$"/>
121+
<argument name="orderStatus" value="Complete"/>
122+
</actionGroup>
123+
<see userInput="$createGuestCartOne.return$" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertFirstOrderID"/>
124+
<see userInput="Complete" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertFirstOrderStatus"/>
125+
126+
<!--Assert second order in orders grid -->
127+
<actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeSecondOrder">
128+
<argument name="orderId" value="$createGuestCartTwo.return$"/>
129+
<argument name="orderStatus" value="Closed"/>
130+
</actionGroup>
131+
<see userInput="$createGuestCartTwo.return$" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertSecondOrderID"/>
132+
<see userInput="Closed" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertSecondStatus"/>
133+
</test>
134+
</tests>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="AdminMassOrdersCancelCompleteAndClosedTest">
11+
<test name="AdminMassOrdersCancelCompleteAndClosedTest" deprecated="Use AdminMassOrdersCancelCompleteAndClosedAPITest instead">
1212
<annotations>
1313
<stories value="Mass Update Orders"/>
14-
<title value="Mass cancel orders in status Complete, Closed"/>
14+
<title value="DEPRECATED. Mass cancel orders in status Complete, Closed"/>
1515
<description value="Try to cancel orders in status Complete, Closed"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-16183"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20+
<skip>
21+
<issueId value="DEPRECATED">Use AdminMassOrdersCancelCompleteAndClosedAPITest instead</issueId>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

0 commit comments

Comments
 (0)