Skip to content

Commit 2565687

Browse files
committed
ACQE-6926 : Multi shipping checkout flow with online shipping methods
added fix
1 parent aa2e449 commit 2565687

File tree

3 files changed

+43
-4
lines changed

3 files changed

+43
-4
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup">
12+
<annotations>
13+
<description>Clicks the top "View Order" link on the My Account->My Orders page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="orderID" type="string" defaultValue="1"/>
17+
</arguments>
18+
<waitForElementClickable selector="{{StorefrontCustomerOrderSection.viewOrderByOrderID(orderID)}}" stepKey="waitForViewOrderElementToBeClickable"/>
19+
<click selector="{{StorefrontCustomerOrderSection.viewOrderByOrderID(orderID)}}" stepKey="clickViewOrder"/>
20+
<waitForPageLoad stepKey="waitForPageLoaded"/>
21+
</actionGroup>
22+
</actionGroups>

app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
<element name="pageNumber" type="text" selector="//*[@class='order-products-toolbar toolbar bottom']//a[contains(@class, 'page')]//span[2][contains(text() ,'{{var1}}')]" parameterized="true"/>
2424
<element name="perPage" type="select" selector="//*[@class='order-products-toolbar toolbar bottom']//select[@id='limiter']"/>
2525
<element name="rowsInColumn" type="text" selector="//tbody/tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
26+
<element name="viewOrderByOrderID" type="button" selector="//td[@data-th='Order #' and contains(text(), '{{orderID}}')]/following-sibling::td[@data-th='Actions']//a[contains(@class, 'action view')]//span" parameterized="true"/>
2627
</section>
2728
</sections>

app/code/Magento/Shipping/Test/Mftf/Test/StorefrontMultishippingCheckoutWithOnlineShippingMethodTest.xml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,38 @@
9999
<executeJS function="var orderID = '{$grabOrderIdForThirdOrder}'.replace(/\D|^0+/g, ''); return (orderID);" stepKey="thirdOrderID"/>
100100
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.multiCheckoutOrderId('4')}}" stepKey="grabOrderIdForFourthOrder"/>
101101
<executeJS function="var orderID = '{$grabOrderIdForFourthOrder}'.replace(/\D|^0+/g, ''); return (orderID);" stepKey="fourthOrderID"/>
102-
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openFirstOrder">
102+
<actionGroup ref="StorefrontOpenMyOrdersPageActionGroup" stepKey="goToMyOrdersForFirstOrder"/>
103+
<actionGroup ref="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup" stepKey="openFirstOrder">
104+
<argument name="orderID" value="{$firstOrderID}"/>
105+
</actionGroup>
106+
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="againOpenFirstOrder">
103107
<argument name="orderId" value="$firstOrderID"/>
104108
</actionGroup>
105109
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderInformationAddress('Berlin')}}" stepKey="waitForOrderInformationForBerlin"/>
106110
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderShippingMethod('DHL - Express easy')}}" stepKey="waitForShippingMethodForDHL"/>
107-
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openSecondOrder">
111+
<actionGroup ref="StorefrontOpenMyOrdersPageActionGroup" stepKey="goToMyOrdersForSecondOrder"/>
112+
<actionGroup ref="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup" stepKey="openSecondOrder">
113+
<argument name="orderID" value="{$secondOrderID}"/>
114+
</actionGroup>
115+
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="againOpenSecondOrder">
108116
<argument name="orderId" value="$secondOrderID"/>
109117
</actionGroup>
110118
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderInformationAddress('London')}}" stepKey="waitForOrderInformationForLondon"/>
111119
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderShippingMethod('United Parcel Service - UPS Worldwide Expedited')}}" stepKey="waitForShippingMethodForUPS"/>
112-
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openThirdOrder">
120+
<actionGroup ref="StorefrontOpenMyOrdersPageActionGroup" stepKey="goToMyOrdersForThirdOrder"/>
121+
<actionGroup ref="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup" stepKey="openThirdOrder">
122+
<argument name="orderID" value="{$thirdOrderID}"/>
123+
</actionGroup>
124+
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="againOpenThirdOrder">
113125
<argument name="orderId" value="$thirdOrderID"/>
114126
</actionGroup>
115127
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderInformationAddress('New York')}}" stepKey="waitForOrderInformationForNY"/>
116128
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderShippingMethod('United States Postal Service - Library Mail Parcel')}}" stepKey="waitForShippingMethodForUSPS"/>
117-
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openFourthOrder">
129+
<actionGroup ref="StorefrontOpenMyOrdersPageActionGroup" stepKey="goToMyOrdersForFourthOrder"/>
130+
<actionGroup ref="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup" stepKey="openFourthOrder">
131+
<argument name="orderID" value="{$fourthOrderID}"/>
132+
</actionGroup>
133+
<actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="againOpenFourthOrder">
118134
<argument name="orderId" value="$fourthOrderID"/>
119135
</actionGroup>
120136
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderInformationAddress('Culver City')}}" stepKey="waitForOrderInformationForCulverCity"/>

0 commit comments

Comments
 (0)