Skip to content

Commit ef8eea9

Browse files
loginestaloginesta
committed
Fix cancel order in processing status MFTF test
1 parent 21610e4 commit ef8eea9

5 files changed

+52
-46
lines changed

‎app/code/Magento/OrderCancellationUi/Test/Mftf/Section/AdminSalesOrderViewSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="AdminSalesOrderViewSection">
10-
<element name="orderHistoryNoteListFirstComment" type="text" selector="#order_history_block .note-list-item:first-child .note-list-comment"/>
11-
<element name="orderHistoryNoteListLastComment" type="text" selector="#order_history_block .note-list-item:last-child .note-list-comment"/>
10+
<element name="orderHistoryNoteListFirstComment" type="text" selector="#order_history_block .note-list-item:nth-child(1) .note-list-comment"/>
11+
<element name="orderHistoryNoteListLastComment" type="text" selector="#order_history_block .note-list-item:nth-child(2) .note-list-comment"/>
1212
</section>
1313
</sections>

‎app/code/Magento/OrderCancellationUi/Test/Mftf/Test/CustomerAttemptToCancelOrderCanceledInAnotherTabTest.xml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,19 @@
3636
<requiredEntity createDataKey="createCategory"/>
3737
</createData>
3838
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
39+
<createData entity="CustomerCart" stepKey="createCustomerCart">
40+
<requiredEntity createDataKey="createCustomer"/>
41+
</createData>
42+
<createData entity="CustomerCartItem" stepKey="addCartItemOne">
43+
<requiredEntity createDataKey="createCustomerCart"/>
44+
<requiredEntity createDataKey="createSimpleProduct"/>
45+
</createData>
46+
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
47+
<requiredEntity createDataKey="createCustomerCart"/>
48+
</createData>
49+
<updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformationOne">
50+
<requiredEntity createDataKey="createCustomerCart"/>
51+
</updateData>
3952
</before>
4053
<after>
4154
<!-- Disable configuration -->
@@ -52,17 +65,6 @@
5265
<argument name="Customer" value="$$createCustomer$$"/>
5366
</actionGroup>
5467

55-
<!--Open the details page of Simple Product and add to cart-->
56-
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductProductToCart">
57-
<argument name="product" value="$$createSimpleProduct$$"/>
58-
</actionGroup>
59-
60-
<!--Place the order-->
61-
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage"/>
62-
<actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder">
63-
<argument name="shippingMethod" value="Flat Rate"/>
64-
</actionGroup>
65-
6668
<!--Go to Recent Orders page-->
6769
<amOnPage url="{{CustomerOrderCancellationFromRecentOrdersPage.url}}" stepKey="navigateToRecentOrdersPage"/>
6870
<waitForPageLoad stepKey="waitForRecentOrdersPageLoad"/>

‎app/code/Magento/OrderCancellationUi/Test/Mftf/Test/CustomerOrderCancellationFromOrderHistoryTest.xml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,19 @@
3535
<requiredEntity createDataKey="createCategory"/>
3636
</createData>
3737
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
38+
<createData entity="CustomerCart" stepKey="createCustomerCart">
39+
<requiredEntity createDataKey="createCustomer"/>
40+
</createData>
41+
<createData entity="CustomerCartItem" stepKey="addCartItemOne">
42+
<requiredEntity createDataKey="createCustomerCart"/>
43+
<requiredEntity createDataKey="createSimpleProduct"/>
44+
</createData>
45+
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
46+
<requiredEntity createDataKey="createCustomerCart"/>
47+
</createData>
48+
<updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformationOne">
49+
<requiredEntity createDataKey="createCustomerCart"/>
50+
</updateData>
3851
</before>
3952
<after>
4053
<!-- Disable configuration -->
@@ -51,20 +64,6 @@
5164
<argument name="Customer" value="$$createCustomer$$"/>
5265
</actionGroup>
5366

54-
<!--Open the details page of Simple Product and add to cart-->
55-
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductProductToCart">
56-
<argument name="product" value="$$createSimpleProduct$$"/>
57-
</actionGroup>
58-
59-
<!--Place the order-->
60-
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage"/>
61-
<actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder">
62-
<argument name="shippingMethod" value="Flat Rate"/>
63-
</actionGroup>
64-
65-
<!--Grab Order Id for later usage-->
66-
<grabTextFrom selector="{{CustomerOrderCancellationSection.linkToOrder}}" stepKey="getOrderNumber"/>
67-
6867
<!--Go to Order History page-->
6968
<amOnPage url="{{CustomerOrderCancellationFromOrderHistoryPage.url}}" stepKey="navigateToOrderHistoryPage"/>
7069
<waitForPageLoad stepKey="waitForOrderHistoryPageLoad"/>
@@ -84,8 +83,11 @@
8483
<actualResult type="variable">$getLatestOrderStatus</actualResult>
8584
</assertEquals>
8685

86+
<!--Grab Order Id for later usage-->
87+
<grabTextFrom selector="{{CustomerOrderCancellationSection.referenceToLatestOrderId}}" stepKey="getOrderId"/>
88+
8789
<!--Go to Admin Sales Order View Page-->
88-
<amOnPage url="{{AdminSalesOrderViewPage.url({$getOrderNumber})}}" stepKey="navigateToSalesOrderViewPage"/>
90+
<amOnPage url="{{AdminSalesOrderViewPage.url({$getOrderId})}}" stepKey="navigateToSalesOrderViewPage"/>
8991
<waitForPageLoad stepKey="waitForAdminSalesOrderViewPageLoad"/>
9092

9193
<!--Check Order History block-->

‎app/code/Magento/OrderCancellationUi/Test/Mftf/Test/CustomerOrderCancellationFromRecentOrdersTest.xml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,19 @@
3636
<requiredEntity createDataKey="createCategory"/>
3737
</createData>
3838
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
39+
<createData entity="CustomerCart" stepKey="createCustomerCart">
40+
<requiredEntity createDataKey="createCustomer"/>
41+
</createData>
42+
<createData entity="CustomerCartItem" stepKey="addCartItemOne">
43+
<requiredEntity createDataKey="createCustomerCart"/>
44+
<requiredEntity createDataKey="createSimpleProduct"/>
45+
</createData>
46+
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
47+
<requiredEntity createDataKey="createCustomerCart"/>
48+
</createData>
49+
<updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformationOne">
50+
<requiredEntity createDataKey="createCustomerCart"/>
51+
</updateData>
3952
</before>
4053
<after>
4154
<!-- Disable configuration -->
@@ -52,20 +65,6 @@
5265
<argument name="Customer" value="$$createCustomer$$"/>
5366
</actionGroup>
5467

55-
<!--Open the details page of Simple Product and add to cart-->
56-
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductProductToCart">
57-
<argument name="product" value="$$createSimpleProduct$$"/>
58-
</actionGroup>
59-
60-
<!--Place the order-->
61-
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage"/>
62-
<actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder">
63-
<argument name="shippingMethod" value="Flat Rate"/>
64-
</actionGroup>
65-
66-
<!--Grab Order Id for later usage-->
67-
<grabTextFrom selector="{{CustomerOrderCancellationSection.linkToOrder}}" stepKey="getOrderNumber"/>
68-
6968
<!--Go to Recent Orders page-->
7069
<amOnPage url="{{CustomerOrderCancellationFromRecentOrdersPage.url}}" stepKey="navigateToRecentOrdersPage"/>
7170
<waitForPageLoad stepKey="waitForRecentOrdersPageLoad"/>
@@ -85,8 +84,11 @@
8584
<actualResult type="variable">$getLatestOrderStatus</actualResult>
8685
</assertEquals>
8786

87+
<!--Grab Order Id for later usage-->
88+
<grabTextFrom selector="{{CustomerOrderCancellationSection.referenceToLatestOrderId}}" stepKey="getOrderId"/>
89+
8890
<!--Go to Admin Sales Order View Page-->
89-
<amOnPage url="{{AdminSalesOrderViewPage.url({$getOrderNumber})}}" stepKey="navigateToSalesOrderViewPage"/>
91+
<amOnPage url="{{AdminSalesOrderViewPage.url({$getOrderId})}}" stepKey="navigateToSalesOrderViewPage"/>
9092
<waitForPageLoad stepKey="waitForAdminSalesOrderViewPageLoad"/>
9193

9294
<!--Check Order History block-->

‎app/code/Magento/OrderCancellationUi/Test/Mftf/Test/CustomerOrderCancellationInStatusProcessingTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformationOne">
4949
<requiredEntity createDataKey="createCustomerCart"/>
5050
</updateData>
51-
<createData entity="Shipment" stepKey="shipOrder">
51+
<createData entity="Invoice" stepKey="invoiceOrder">
5252
<requiredEntity createDataKey="createCustomerCart"/>
5353
</createData>
5454
</before>
@@ -84,8 +84,8 @@
8484
<waitForPageLoad stepKey="waitForOrderHistoryPageReload"/>
8585
<dontSee selector="{{CustomerOrderCancellationSection.linkToOpenModal}}" stepKey="dontSeeLinkToModal"/>
8686
<grabTextFrom selector="{{CustomerOrderCancellationSection.referenceToLatestOrderStatus}}" stepKey="getLatestOrderStatus"/>
87-
<assertEquals message="Order should have status Canceled" stepKey="assertOrderStatusIsCanceled" after="getLatestOrderStatus">
88-
<expectedResult type="string">Canceled</expectedResult>
87+
<assertEquals message="Order should have status Closed" stepKey="assertOrderStatusIsCanceled" after="getLatestOrderStatus">
88+
<expectedResult type="string">Closed</expectedResult>
8989
<actualResult type="variable">$getLatestOrderStatus</actualResult>
9090
</assertEquals>
9191

0 commit comments

Comments
 (0)