Skip to content

Commit 483ff09

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8591: [MFTF] Refactoring CancelOrdersInOrderSalesReportTest #31458
- Merge Pull Request #31458 from AnnaAPak/magento2:ref-CancelOrdersInOrderSalesReportTest - Merged commits: 1. 3bc048d 2. 5488c9d
2 parents 6f79389 + 5488c9d commit 483ff09

File tree

5 files changed

+158
-2
lines changed

5 files changed

+158
-2
lines changed

‎app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminGoToOrdersReportPageActionGroup.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminGoToOrdersReportPageActionGroup">
11+
<annotations>
12+
<description>Redirects to the Orders Report page</description>
13+
</annotations>
14+
15+
<amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage"/>
16+
<waitForPageLoad stepKey="waitForOrdersReportPageLoad"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Reports/Test/Mftf/Test/AdminCanceledOrdersInOrderSalesReportTest.xml

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
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="AdminCanceledOrdersInOrderSalesReportTest">
12+
<annotations>
13+
<features value="Reports"/>
14+
<stories value="Order Sales Report includes canceled orders"/>
15+
<group value="reports"/>
16+
<title value="Canceled orders in order sales report"/>
17+
<description value="Verify canceling of orders in order sales report"/>
18+
<severity value="MAJOR"/>
19+
<testCaseId value="MAGETWO-95960"/>
20+
<useCaseId value="MAGETWO-95823"/>
21+
</annotations>
22+
23+
<before>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
26+
<createData entity="_defaultCategory" stepKey="createCategory"/>
27+
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
28+
<requiredEntity createDataKey="createCategory"/>
29+
</createData>
30+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
31+
32+
<createData entity="CustomerCart" stepKey="createCustomerCartOne">
33+
<requiredEntity createDataKey="createCustomer"/>
34+
</createData>
35+
<createData entity="CustomerCartItem" stepKey="addCartItemOne">
36+
<requiredEntity createDataKey="createCustomerCartOne"/>
37+
<requiredEntity createDataKey="createSimpleProduct"/>
38+
</createData>
39+
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
40+
<requiredEntity createDataKey="createCustomerCartOne"/>
41+
</createData>
42+
<updateData createDataKey="createCustomerCartOne" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformationOne">
43+
<requiredEntity createDataKey="createCustomerCartOne"/>
44+
</updateData>
45+
<createData entity="Invoice" stepKey="invoiceOrderOne">
46+
<requiredEntity createDataKey="createCustomerCartOne"/>
47+
</createData>
48+
<createData entity="Shipment" stepKey="shipOrderOne">
49+
<requiredEntity createDataKey="createCustomerCartOne"/>
50+
</createData>
51+
52+
<createData entity="CustomerCart" stepKey="createCustomerCartTwo">
53+
<requiredEntity createDataKey="createCustomer"/>
54+
</createData>
55+
<createData entity="CustomerCartItem" stepKey="addCartItemTwo">
56+
<requiredEntity createDataKey="createCustomerCartTwo"/>
57+
<requiredEntity createDataKey="createSimpleProduct"/>
58+
</createData>
59+
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddressTwo">
60+
<requiredEntity createDataKey="createCustomerCartTwo"/>
61+
</createData>
62+
<updateData createDataKey="createCustomerCartTwo" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformationTwo">
63+
<requiredEntity createDataKey="createCustomerCartTwo"/>
64+
</updateData>
65+
<createData entity="CancelOrder" stepKey="cancelOrderTwo">
66+
<requiredEntity createDataKey="createCustomerCartTwo"/>
67+
</createData>
68+
</before>
69+
70+
<after>
71+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
72+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
73+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
74+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
75+
</after>
76+
77+
<actionGroup ref="AdminGoToOrdersReportPageActionGroup" stepKey="goToOrdersReportPage1"/>
78+
<generateDate stepKey="generateEndDate" date="+0 day" format="m/d/Y"/>
79+
<generateDate stepKey="generateStartDate" date="-1 day" format="m/d/Y"/>
80+
<actionGroup ref="GenerateOrderReportForNotCancelActionGroup" stepKey="generateReportAfterCancelOrderBefore">
81+
<argument name="orderFromDate" value="$generateStartDate"/>
82+
<argument name="orderToDate" value="$generateEndDate"/>
83+
<argument name="statuses" value="['closed', 'complete', 'fraud', 'holded', 'payment_review', 'paypal_canceled_reversal', 'paypal_reversed', 'processing']"/>
84+
</actionGroup>
85+
<waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCountBefore"/>
86+
<grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersSpecified"/>
87+
88+
<actionGroup ref="AdminGoToOrdersReportPageActionGroup" stepKey="goToOrdersReportPage2"/>
89+
<actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportAfterCancelOrder">
90+
<argument name="orderFromDate" value="$generateStartDate"/>
91+
<argument name="orderToDate" value="$generateEndDate"/>
92+
</actionGroup>
93+
<waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCount"/>
94+
<grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersAny"/>
95+
96+
<assertEquals stepKey="assertEquals">
97+
<actualResult type="string">{$grabCanceledOrdersAny}</actualResult>
98+
<expectedResult type="string">{$grabCanceledOrdersSpecified}</expectedResult>
99+
</assertEquals>
100+
</test>
101+
</tests>

‎app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="CancelOrdersInOrderSalesReportTest">
10+
<test name="CancelOrdersInOrderSalesReportTest" deprecated="Use AdminCanceledOrdersInOrderSalesReportTest instead">
1111
<annotations>
1212
<features value="Reports"/>
1313
<stories value="Order Sales Report includes canceled orders"/>
1414
<group value="reports"/>
15-
<title value="Canceled orders in order sales report"/>
15+
<title value="DEPRECATED. Canceled orders in order sales report"/>
1616
<description value="Verify canceling of orders in order sales report"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-95960"/>
1919
<useCaseId value="MAGETWO-95823"/>
20+
<skip>
21+
<issueId value="DEPRECATED">Use AdminCanceledOrdersInOrderSalesReportTest instead</issueId>
22+
</skip>
2023
</annotations>
2124

2225
<before>

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

+17
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="CancelOrder" type="CancelOrder">
14+
<var key="quote_id" entityKey="return" entityType="CustomerCart"/>
15+
</entity>
16+
17+
</entities>

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

+17
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="CreateCancelOrder" dataType="CancelOrder" type="create" auth="adminOauth" url="V1/orders/{return}/cancel" 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>

0 commit comments

Comments
 (0)