Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MFTF] Refactoring of ProductsQtyReturnAfterOrderCancelTest #31097

Merged
merged 11 commits into from
Dec 22, 2020
Merged

[MFTF] Refactoring of ProductsQtyReturnAfterOrderCancelTest #31097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f36929a
initial commit
AnnaAPak Nov 30, 2020
94cdcf1
Refactored ProductsQtyReturnAfterOrderCancelTest
AnnaAPak Nov 30, 2020
0d32349
refactored
AnnaAPak Nov 30, 2020
9bffc08
refactored
AnnaAPak Nov 30, 2020
ad511d6
refactored stepKeys
AnnaAPak Nov 30, 2020
234c784
refactoring
AnnaAPak Nov 30, 2020
56e2026
add "DEPRECATED" to title
AnnaAPak Nov 30, 2020
0d93b24
refactored
AnnaAPak Nov 30, 2020
04bd4bd
Rename AdminInvoiceWIthUpdatedProductQtyActionGroup.xml to AdminInvoi…
AnnaAPak Nov 30, 2020
a4403e9
Rename AdminCheckProductQtyAfterOrderCancelling.xml to AdminCheckProd…
engcom-Charlie Dec 7, 2020
ce31180
Merge branch '2.4-develop' into ref-ProductsQtyReturnAfterOrderCancel…
engcom-Charlie Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 89 additions & 0 deletions ...gento/ConfigurableProduct/Test/Mftf/Test/AdminCheckProductQtyAfterOrderCancellingTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminCheckProductQtyAfterOrderCancellingTest">

<annotations>
<features value="ConfigurableProduct"/>
<stories value="Cancel order"/>
<title value="Product quantity return after order cancel"/>
<description value="Check Product quantity return after order cancel"/>
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-97228"/>
<useCaseId value="MAGETWO-82221"/>
<group value="ConfigurableProduct"/>
</annotations>

<before>
<createData entity="ApiCategory" stepKey="createCategory"/>

<createData entity="defaultSimpleProduct" stepKey="createConfigProduct">
<requiredEntity createDataKey="createCategory"/>
</createData>

<createData entity="GuestCart" stepKey="createGuestCart"/>
<createData entity="FourCartItems" stepKey="addCartItem">
<requiredEntity createDataKey="createGuestCart"/>
<requiredEntity createDataKey="createConfigProduct"/>
</createData>
<createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress">
<requiredEntity createDataKey="createGuestCart"/>
</createData>
<updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
<requiredEntity createDataKey="createGuestCart"/>
</updateData>

<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>

</before>

<after>
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
</after>

<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
<argument name="orderId" value="$createGuestCart.return$"/>
</actionGroup>

<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="openOrder"/>

<actionGroup ref="AdminInvoiceWithUpdatedProductQtyActionGroup" stepKey="createPartialInvoice">
<argument name="qty" value="1"/>
</actionGroup>

<actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createShipment">
<argument name="Qty" value="1"/>
<argument name="Number" value="111"/>
</actionGroup>

<actionGroup ref="CancelPendingOrderActionGroup" stepKey="cancelOrder">
<argument name="orderStatus" value="Complete"/>
</actionGroup>

<see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Canceled 3" stepKey="seeCanceledQty"/>

<actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage"/>

<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySku">
<argument name="sku" value="$$createConfigProduct.sku$$"/>
</actionGroup>

<actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="assertProductDataInGrid">
<argument name="row" value="1"/>
<argument name="column" value="Quantity"/>
<argument name="value" value="99"/>
</actionGroup>

<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>

</test>
</tests>
7 changes: 5 additions & 2 deletions ...code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,20 @@

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="ProductsQtyReturnAfterOrderCancelTest">
<test name="ProductsQtyReturnAfterOrderCancelTest" deprecated="Use AdminCheckProductQtyAfterOrderCancellingTest instead">

<annotations>
<features value="ConfigurableProduct"/>
<stories value="Cancel order"/>
<title value="Product quantity return after order cancel"/>
<title value="DEPRECATED. Product quantity return after order cancel"/>
<description value="Check Product quantity return after order cancel"/>
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-97228"/>
<useCaseId value="MAGETWO-82221"/>
<group value="ConfigurableProduct"/>
<skip>
<issueId value="DEPRECATED">Use AdminCheckProductQtyAfterOrderCancellingTest instead</issueId>
</skip>
</annotations>

<before>
Expand Down
5 changes: 5 additions & 0 deletions app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@
<var key="quote_id" entityKey="return" entityType="GuestCart"/>
<var key="sku" entityKey="sku" entityType="product"/>
</entity>
<entity name="FourCartItems" type="CartItem">
<data key="qty">4</data>
<var key="quote_id" entityKey="return" entityType="GuestCart"/>
<var key="sku" entityKey="sku" entityType="product"/>
</entity>
</entities>
26 changes: 26 additions & 0 deletions ...code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceWithUpdatedProductQtyActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminInvoiceWithUpdatedProductQtyActionGroup" extends="AdminCreateInvoiceActionGroup">
<annotations>
<description>Start order Invoicing.
Update product qty to invoice (there is one product in the Order).
Submit the invoice.
</description>
</annotations>
<arguments>
<argument name="qty" type="string"/>
</arguments>

<fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="{{qty}}" stepKey="fillQtyField" after="waitForInvoicePage"/>
<click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="clickUpdateQuantityButton" after="fillQtyField"/>
<waitForPageLoad stepKey="waitForPageRefreshed" after="clickUpdateQuantityButton"/>
</actionGroup>
</actionGroups>