Skip to content

Commit 7ffd42a

Browse files
ENGCOM-8506: [MFTF] Refactoring of ProductsQtyReturnAfterOrderCancelTest #31097
2 parents c61ce63 + 99712c0 commit 7ffd42a

File tree

4 files changed

+125
-2
lines changed

4 files changed

+125
-2
lines changed
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
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="AdminCheckProductQtyAfterOrderCancellingTest">
12+
13+
<annotations>
14+
<features value="ConfigurableProduct"/>
15+
<stories value="Cancel order"/>
16+
<title value="Product quantity return after order cancel"/>
17+
<description value="Check Product quantity return after order cancel"/>
18+
<severity value="CRITICAL"/>
19+
<testCaseId value="MAGETWO-97228"/>
20+
<useCaseId value="MAGETWO-82221"/>
21+
<group value="ConfigurableProduct"/>
22+
</annotations>
23+
24+
<before>
25+
<createData entity="ApiCategory" stepKey="createCategory"/>
26+
27+
<createData entity="defaultSimpleProduct" stepKey="createConfigProduct">
28+
<requiredEntity createDataKey="createCategory"/>
29+
</createData>
30+
31+
<createData entity="GuestCart" stepKey="createGuestCart"/>
32+
<createData entity="FourCartItems" stepKey="addCartItem">
33+
<requiredEntity createDataKey="createGuestCart"/>
34+
<requiredEntity createDataKey="createConfigProduct"/>
35+
</createData>
36+
<createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress">
37+
<requiredEntity createDataKey="createGuestCart"/>
38+
</createData>
39+
<updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
40+
<requiredEntity createDataKey="createGuestCart"/>
41+
</updateData>
42+
43+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
44+
45+
</before>
46+
47+
<after>
48+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
49+
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
50+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
51+
</after>
52+
53+
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
54+
<argument name="orderId" value="$createGuestCart.return$"/>
55+
</actionGroup>
56+
57+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="openOrder"/>
58+
59+
<actionGroup ref="AdminInvoiceWithUpdatedProductQtyActionGroup" stepKey="createPartialInvoice">
60+
<argument name="qty" value="1"/>
61+
</actionGroup>
62+
63+
<actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createShipment">
64+
<argument name="Qty" value="1"/>
65+
<argument name="Number" value="111"/>
66+
</actionGroup>
67+
68+
<actionGroup ref="CancelPendingOrderActionGroup" stepKey="cancelOrder">
69+
<argument name="orderStatus" value="Complete"/>
70+
</actionGroup>
71+
72+
<see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Canceled 3" stepKey="seeCanceledQty"/>
73+
74+
<actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage"/>
75+
76+
<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySku">
77+
<argument name="sku" value="$$createConfigProduct.sku$$"/>
78+
</actionGroup>
79+
80+
<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="assertProductDataInGrid">
81+
<argument name="row" value="1"/>
82+
<argument name="column" value="Quantity"/>
83+
<argument name="value" value="99"/>
84+
</actionGroup>
85+
86+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
87+
88+
</test>
89+
</tests>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@
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="ProductsQtyReturnAfterOrderCancelTest">
11+
<test name="ProductsQtyReturnAfterOrderCancelTest" deprecated="Use AdminCheckProductQtyAfterOrderCancellingTest instead">
1212

1313
<annotations>
1414
<features value="ConfigurableProduct"/>
1515
<stories value="Cancel order"/>
16-
<title value="Product quantity return after order cancel"/>
16+
<title value="DEPRECATED. Product quantity return after order cancel"/>
1717
<description value="Check Product quantity return after order cancel"/>
1818
<severity value="CRITICAL"/>
1919
<testCaseId value="MAGETWO-97228"/>
2020
<useCaseId value="MAGETWO-82221"/>
2121
<group value="ConfigurableProduct"/>
22+
<skip>
23+
<issueId value="DEPRECATED">Use AdminCheckProductQtyAfterOrderCancellingTest instead</issueId>
24+
</skip>
2225
</annotations>
2326

2427
<before>

app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,9 @@
2323
<var key="quote_id" entityKey="return" entityType="GuestCart"/>
2424
<var key="sku" entityKey="sku" entityType="product"/>
2525
</entity>
26+
<entity name="FourCartItems" type="CartItem">
27+
<data key="qty">4</data>
28+
<var key="quote_id" entityKey="return" entityType="GuestCart"/>
29+
<var key="sku" entityKey="sku" entityType="product"/>
30+
</entity>
2631
</entities>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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="AdminInvoiceWithUpdatedProductQtyActionGroup" extends="AdminCreateInvoiceActionGroup">
12+
<annotations>
13+
<description>Start order Invoicing.
14+
Update product qty to invoice (there is one product in the Order).
15+
Submit the invoice.
16+
</description>
17+
</annotations>
18+
<arguments>
19+
<argument name="qty" type="string"/>
20+
</arguments>
21+
22+
<fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="{{qty}}" stepKey="fillQtyField" after="waitForInvoicePage"/>
23+
<click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="clickUpdateQuantityButton" after="fillQtyField"/>
24+
<waitForPageLoad stepKey="waitForPageRefreshed" after="clickUpdateQuantityButton"/>
25+
</actionGroup>
26+
</actionGroups>

0 commit comments

Comments
 (0)