Skip to content

[MFTF] Refactoring CancelOrdersInOrderSalesReportTest #31458

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

Merged
merged 2 commits into from
Jan 23, 2021
Merged

[MFTF] Refactoring CancelOrdersInOrderSalesReportTest #31458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bc048d
refactored CancelOrdersInOrderSalesReportTest
AnnaAPak Jan 4, 2021
5488c9d
Merge branch '2.4-develop' into ref-CancelOrdersInOrderSalesReportTest
AnnaAPak Jan 4, 2021
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
18 changes: 18 additions & 0 deletions app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminGoToOrdersReportPageActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?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="AdminGoToOrdersReportPageActionGroup">
<annotations>
<description>Redirects to the Orders Report page</description>
</annotations>

<amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage"/>
<waitForPageLoad stepKey="waitForOrdersReportPageLoad"/>
</actionGroup>
</actionGroups>
101 changes: 101 additions & 0 deletions app/code/Magento/Reports/Test/Mftf/Test/AdminCanceledOrdersInOrderSalesReportTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?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="AdminCanceledOrdersInOrderSalesReportTest">
<annotations>
<features value="Reports"/>
<stories value="Order Sales Report includes canceled orders"/>
<group value="reports"/>
<title value="Canceled orders in order sales report"/>
<description value="Verify canceling of orders in order sales report"/>
<severity value="MAJOR"/>
<testCaseId value="MAGETWO-95960"/>
<useCaseId value="MAGETWO-95823"/>
</annotations>

<before>
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

<createData entity="_defaultCategory" stepKey="createCategory"/>
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
<requiredEntity createDataKey="createCategory"/>
</createData>
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>

<createData entity="CustomerCart" stepKey="createCustomerCartOne">
<requiredEntity createDataKey="createCustomer"/>
</createData>
<createData entity="CustomerCartItem" stepKey="addCartItemOne">
<requiredEntity createDataKey="createCustomerCartOne"/>
<requiredEntity createDataKey="createSimpleProduct"/>
</createData>
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
<requiredEntity createDataKey="createCustomerCartOne"/>
</createData>
<updateData createDataKey="createCustomerCartOne" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformationOne">
<requiredEntity createDataKey="createCustomerCartOne"/>
</updateData>
<createData entity="Invoice" stepKey="invoiceOrderOne">
<requiredEntity createDataKey="createCustomerCartOne"/>
</createData>
<createData entity="Shipment" stepKey="shipOrderOne">
<requiredEntity createDataKey="createCustomerCartOne"/>
</createData>

<createData entity="CustomerCart" stepKey="createCustomerCartTwo">
<requiredEntity createDataKey="createCustomer"/>
</createData>
<createData entity="CustomerCartItem" stepKey="addCartItemTwo">
<requiredEntity createDataKey="createCustomerCartTwo"/>
<requiredEntity createDataKey="createSimpleProduct"/>
</createData>
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddressTwo">
<requiredEntity createDataKey="createCustomerCartTwo"/>
</createData>
<updateData createDataKey="createCustomerCartTwo" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformationTwo">
<requiredEntity createDataKey="createCustomerCartTwo"/>
</updateData>
<createData entity="CancelOrder" stepKey="cancelOrderTwo">
<requiredEntity createDataKey="createCustomerCartTwo"/>
</createData>
</before>

<after>
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>

<actionGroup ref="AdminGoToOrdersReportPageActionGroup" stepKey="goToOrdersReportPage1"/>
<generateDate stepKey="generateEndDate" date="+0 day" format="m/d/Y"/>
<generateDate stepKey="generateStartDate" date="-1 day" format="m/d/Y"/>
<actionGroup ref="GenerateOrderReportForNotCancelActionGroup" stepKey="generateReportAfterCancelOrderBefore">
<argument name="orderFromDate" value="$generateStartDate"/>
<argument name="orderToDate" value="$generateEndDate"/>
<argument name="statuses" value="['closed', 'complete', 'fraud', 'holded', 'payment_review', 'paypal_canceled_reversal', 'paypal_reversed', 'processing']"/>
</actionGroup>
<waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCountBefore"/>
<grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersSpecified"/>

<actionGroup ref="AdminGoToOrdersReportPageActionGroup" stepKey="goToOrdersReportPage2"/>
<actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportAfterCancelOrder">
<argument name="orderFromDate" value="$generateStartDate"/>
<argument name="orderToDate" value="$generateEndDate"/>
</actionGroup>
<waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCount"/>
<grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersAny"/>

<assertEquals stepKey="assertEquals">
<actualResult type="string">{$grabCanceledOrdersAny}</actualResult>
<expectedResult type="string">{$grabCanceledOrdersSpecified}</expectedResult>
</assertEquals>
</test>
</tests>
7 changes: 5 additions & 2 deletions app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="CancelOrdersInOrderSalesReportTest">
<test name="CancelOrdersInOrderSalesReportTest" deprecated="Use AdminCanceledOrdersInOrderSalesReportTest instead">
<annotations>
<features value="Reports"/>
<stories value="Order Sales Report includes canceled orders"/>
<group value="reports"/>
<title value="Canceled orders in order sales report"/>
<title value="DEPRECATED. Canceled orders in order sales report"/>
<description value="Verify canceling of orders in order sales report"/>
<severity value="MAJOR"/>
<testCaseId value="MAGETWO-95960"/>
<useCaseId value="MAGETWO-95823"/>
<skip>
<issueId value="DEPRECATED">Use AdminCanceledOrdersInOrderSalesReportTest instead</issueId>
</skip>
</annotations>

<before>
Expand Down
17 changes: 17 additions & 0 deletions app/code/Magento/Sales/Test/Mftf/Data/CancelOrderData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">

<entity name="CancelOrder" type="CancelOrder">
<var key="quote_id" entityKey="return" entityType="CustomerCart"/>
</entity>

</entities>
17 changes: 17 additions & 0 deletions app/code/Magento/Sales/Test/Mftf/Metadata/CancelOrderMeta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
<operation name="CreateCancelOrder" dataType="CancelOrder" type="create" auth="adminOauth" url="V1/orders/{return}/cancel" method="POST">
<contentType>application/json</contentType>
<object key="cartItem" dataType="CartItem">
<field key="quote_id">string</field>
</object>
</operation>
</operations>