Skip to content

Commit ebea5a9

Browse files
MAGETWO-96431: Checkout Free Shipping Recalculation after Coupon Code Added
- Stabilize functional test
1 parent 0845f00 commit ebea5a9

File tree

3 files changed

+28
-3
lines changed

3 files changed

+28
-3
lines changed

app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,17 @@
1919
<selectOption selector="{{OrderReportFilterSection.orderStatus}}" userInput="Any" stepKey="selectAnyOption" />
2020
<click selector="{{OrderReportMainSection.showReport}}" stepKey="showReport" />
2121
</actionGroup>
22+
<actionGroup name="GenerateOrderReportForNotCancelActionGroup">
23+
<arguments>
24+
<argument name="orderFromDate" type="string"/>
25+
<argument name="orderToDate" type="string"/>
26+
<argument name="statuses" type="string"/>
27+
</arguments>
28+
<click selector="{{OrderReportMainSection.here}}" stepKey="clickOnHere" />
29+
<fillField selector="{{OrderReportFilterSection.dateFrom}}" userInput="{{orderFromDate}}" stepKey="fillFromDate"/>
30+
<fillField selector="{{OrderReportFilterSection.dateTo}}" userInput="{{orderToDate}}" stepKey="fillToDate"/>
31+
<selectOption selector="{{OrderReportFilterSection.orderStatus}}" userInput="Specified" stepKey="selectSpecifiedOption" />
32+
<selectOption selector="{{OrderReportFilterSection.orderStatusSpecified}}" parameterArray="{{statuses}}" stepKey="selectSpecifiedOptionStatus" />
33+
<click selector="{{OrderReportMainSection.showReport}}" stepKey="showReport" />
34+
</actionGroup>
2235
</actionGroups>

app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<element name="orderStatus" type="select" selector="#sales_report_show_order_statuses"/>
2020
<element name="optionAny" type="option" selector="//select[@id='sales_report_show_order_statuses']/option[contains(text(), 'Any')]"/>
2121
<element name="optionSpecified" type="option" selector="//select[@id='sales_report_show_order_statuses']/option[contains(text(), 'Specified')]"/>
22+
<element name="orderStatusSpecified" type="select" selector="#sales_report_order_statuses"/>
2223
</section>
2324

2425
<section name="GeneratedReportSection">

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<actionGroup ref="logout" stepKey="logout"/>
4141
</after>
4242

43+
4344
<!-- Create completed order -->
4445
<actionGroup ref="CreateOrderActionGroup" stepKey="createOrderd">
4546
<argument name="product" value="$$createSimpleProduct$$"/>
@@ -63,19 +64,29 @@
6364
<!-- Cancel order -->
6465
<actionGroup ref="cancelPendingOrder" stepKey="cancelOrder"/>
6566

66-
<!-- Generate Order report -->
67+
<!-- Generate Order report for statuses -->
6768
<amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage1"/>
6869
<!-- Get date -->
6970
<generateDate stepKey="generateEndDate" date="+0 day" format="m/d/Y"/>
7071
<generateDate stepKey="generateStartDate" date="-1 day" format="m/d/Y"/>
72+
<actionGroup ref="GenerateOrderReportForNotCancelActionGroup" stepKey="generateReportAfterCancelOrderBefore">
73+
<argument name="orderFromDate" value="$generateStartDate"/>
74+
<argument name="orderToDate" value="$generateEndDate"/>
75+
<argument name="statuses" value="['closed', 'complete', 'fraud', 'holded', 'payment_review', 'paypal_canceled_reversal', 'paypal_reversed', 'processing']"/>
76+
</actionGroup>
77+
<waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCountBefore"/>
78+
<grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersSpecified"/>
79+
<!-- Generate Order report -->
80+
<amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage2"/>
81+
<!-- Get date -->
7182
<actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportAfterCancelOrder">
7283
<argument name="orderFromDate" value="$generateStartDate"/>
7384
<argument name="orderToDate" value="$generateEndDate"/>
7485
</actionGroup>
7586
<waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCount"/>
76-
<grabTextFrom selector="{{GeneratedReportSection.canceledOrders}}" stepKey="grabCanceledOrdersPrice"/>
87+
<grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersAny"/>
7788

7889
<!-- Compare canceled orders price -->
79-
<assertEquals expected="$0.00" expectedType="string" actual="{$grabCanceledOrdersPrice}" actualType="string" stepKey="assertEquals"/>
90+
<assertEquals expected="{$grabCanceledOrdersSpecified}" expectedType="string" actual="{$grabCanceledOrdersAny}" actualType="string" stepKey="assertEquals"/>
8091
</test>
8192
</tests>

0 commit comments

Comments
 (0)