Skip to content

Commit e2f906e

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8538: [MFTF] Refactoring of AdminMassOrdersCancelCompleteAndClosedTest #31123
- Merge Pull Request #31123 from AnnaAPak/magento2:ref-AdminMassOrdersCancelCompleteAndClosedAPITest - Merged commits: 1. 9847f03 2. e34fc78 3. beb0fda 4. 320748f 5. d2ab2f3 6. 7dcd88b 7. 732c6ff 8. a70dfc9 9. a5dd5e9 10. 424754f 11. 035442d 12. aaea37c 13. bc231ce 14. de26bef
2 parents ad29452 + de26bef commit e2f906e

9 files changed

+215
-2
lines changed

‎app/code/Magento/Sales/Test/Mftf/Data/CreditMemoData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
/**
5+
* Copyright © Magento, Inc. All rights reserved.
6+
* See COPYING.txt for license details.
7+
*/
8+
-->
9+
10+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
12+
13+
<entity name="CreditMemo" type="CreditMemo">
14+
<var key="quote_id" entityKey="return" entityType="CustomerCart"/>
15+
</entity>
16+
17+
</entities>

‎app/code/Magento/Sales/Test/Mftf/Data/InvoiceData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
/**
5+
* Copyright © Magento, Inc. All rights reserved.
6+
* See COPYING.txt for license details.
7+
*/
8+
-->
9+
10+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
12+
13+
<entity name="Invoice" type="Invoice">
14+
<var key="quote_id" entityKey="return" entityType="CustomerCart"/>
15+
</entity>
16+
17+
</entities>

‎app/code/Magento/Sales/Test/Mftf/Data/ShipmentData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
/**
5+
* Copyright © Magento, Inc. All rights reserved.
6+
* See COPYING.txt for license details.
7+
*/
8+
-->
9+
10+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
12+
13+
<entity name="Shipment" type="Shipment">
14+
<var key="quote_id" entityKey="return" entityType="CustomerCart"/>
15+
</entity>
16+
17+
</entities>

‎app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
11+
<operation name="CreateCreditMemo" dataType="CreditMemo" type="create" auth="adminOauth" url="V1/order/{return}/refund" method="POST">
12+
<contentType>application/json</contentType>
13+
<object key="cartItem" dataType="CartItem">
14+
<field key="quote_id">string</field>
15+
</object>
16+
</operation>
17+
</operations>

‎app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
11+
<operation name="CreateInvoice" dataType="Invoice" type="create" auth="adminOauth" url="V1/order/{return}/invoice" method="POST">
12+
<contentType>application/json</contentType>
13+
<object key="cartItem" dataType="CartItem">
14+
<field key="quote_id">string</field>
15+
</object>
16+
</operation>
17+
</operations>

‎app/code/Magento/Sales/Test/Mftf/Metadata/ShipmentMeta.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
11+
<operation name="CreateShipment" dataType="Shipment" type="create" auth="adminOauth" url="V1/order/{return}/ship" method="POST">
12+
<contentType>application/json</contentType>
13+
<object key="cartItem" dataType="CartItem">
14+
<field key="quote_id">string</field>
15+
</object>
16+
</operation>
17+
</operations>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@
4141
<element name="viewLink" type="text" selector="//td/div[contains(.,'{{orderID}}')]/../..//a[@class='action-menu-item']" parameterized="true"/>
4242
<element name="selectOrderID" type="checkbox" selector="//td/div[text()='{{orderId}}']/../preceding-sibling::td//input" parameterized="true" timeout="60"/>
4343
<element name="orderId" type="text" selector="//table[contains(@class, 'data-grid')]//div[contains(text(), '{{orderId}}')]" parameterized="true"/>
44+
<element name="orderIdByIncrementId" type="text" selector="//input[@class='admin__control-checkbox' and @value={{incrId}}]/parent::label/parent::td/following-sibling::td" parameterized="true"/>
4445
</section>
4546
</sections>

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

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
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="AdminMassOrdersCancelClosedAndCompleteTest">
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-39905"/>
18+
<group value="sales"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
22+
<before>
23+
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
25+
26+
<createData entity="ApiCategory" stepKey="createCategory"/>
27+
28+
<createData entity="defaultSimpleProduct" stepKey="createSimpleProduct">
29+
<requiredEntity createDataKey="createCategory"/>
30+
</createData>
31+
32+
<createData entity="GuestCart" stepKey="createGuestCartOne"/>
33+
<createData entity="SimpleCartItem" stepKey="addCartItemOne">
34+
<requiredEntity createDataKey="createGuestCartOne"/>
35+
<requiredEntity createDataKey="createSimpleProduct"/>
36+
</createData>
37+
<createData entity="GuestAddressInformation" stepKey="addGuestOrderAddressOne">
38+
<requiredEntity createDataKey="createGuestCartOne"/>
39+
</createData>
40+
<updateData createDataKey="createGuestCartOne" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformationOne">
41+
<requiredEntity createDataKey="createGuestCartOne"/>
42+
</updateData>
43+
44+
<createData entity="Invoice" stepKey="invoiceOrderOne">
45+
<requiredEntity createDataKey="createGuestCartOne"/>
46+
</createData>
47+
48+
<createData entity="Shipment" stepKey="shipOrderOne">
49+
<requiredEntity createDataKey="createGuestCartOne"/>
50+
</createData>
51+
52+
<createData entity="GuestCart" stepKey="createGuestCartTwo"/>
53+
<createData entity="SimpleCartItem" stepKey="addCartItemTwo">
54+
<requiredEntity createDataKey="createGuestCartTwo"/>
55+
<requiredEntity createDataKey="createSimpleProduct"/>
56+
</createData>
57+
<createData entity="GuestAddressInformation" stepKey="addGuestOrderAddressTwo">
58+
<requiredEntity createDataKey="createGuestCartTwo"/>
59+
</createData>
60+
<updateData createDataKey="createGuestCartTwo" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformationTwo">
61+
<requiredEntity createDataKey="createGuestCartTwo"/>
62+
</updateData>
63+
64+
<createData entity="Invoice" stepKey="invoiceOrderTwo">
65+
<requiredEntity createDataKey="createGuestCartTwo"/>
66+
</createData>
67+
68+
<createData entity="CreditMemo" stepKey="refundOrderTwo">
69+
<requiredEntity createDataKey="createGuestCartTwo"/>
70+
</createData>
71+
72+
</before>
73+
74+
<after>
75+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
76+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
77+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
78+
</after>
79+
80+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
81+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
82+
83+
<grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createGuestCartOne.return$)}}" stepKey="getOrderOneId"/>
84+
<grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createGuestCartTwo.return$)}}" stepKey="getOrderTwoId"/>
85+
86+
<actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionCancel">
87+
<argument name="action" value="Cancel"/>
88+
<argument name="orderId" value="$getOrderOneId"/>
89+
<argument name="secondOrderId" value="$getOrderTwoId"/>
90+
</actionGroup>
91+
<see userInput="You cannot cancel the order(s)." stepKey="assertOrderCancelMassActionFailMessage"/>
92+
93+
<actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
94+
<argument name="orderId" value="$getOrderOneId"/>
95+
<argument name="orderStatus" value="Complete"/>
96+
</actionGroup>
97+
<see userInput="$getOrderOneId" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertFirstOrderID"/>
98+
<see userInput="Complete" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertFirstOrderStatus"/>
99+
100+
<actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeSecondOrder">
101+
<argument name="orderId" value="$getOrderTwoId"/>
102+
<argument name="orderStatus" value="Closed"/>
103+
</actionGroup>
104+
<see userInput="$getOrderTwoId" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertSecondOrderID"/>
105+
<see userInput="Closed" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertSecondStatus"/>
106+
</test>
107+
</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 AdminMassOrdersCancelClosedAndCompleteTest 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 AdminMassOrdersCancelClosedAndCompleteTest instead</issueId>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

0 commit comments

Comments
 (0)