Skip to content

Commit 02cf4c1

Browse files
ACQE-6372: Multishipping checkout flow with online shipping methods
removed section file causing issue to select value from drop down and added region, address
1 parent b392a1b commit 02cf4c1

File tree

6 files changed

+35
-25
lines changed

6 files changed

+35
-25
lines changed

app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,4 +528,17 @@
528528
<data key="default_shipping">Yes</data>
529529
<requiredEntity type="region">RegionCA</requiredEntity>
530530
</entity>
531+
<entity name="DE_Berlin_State" type="address" extends="DE_Address_Berlin_Not_Default_Address">
532+
<requiredEntity type="region">RegionBER</requiredEntity>
533+
</entity>
534+
<entity name="UK_State_Address" type="address" extends="UK_Not_Default_Address">
535+
<array key="street">
536+
<item>172, Westminster</item>
537+
</array>
538+
<data key="state">California</data>
539+
<requiredEntity type="region">RegionUKGL</requiredEntity>
540+
</entity>
541+
<entity name="US_California_State" type="address" extends="US_Address_California">
542+
<requiredEntity type="region">RegionCA</requiredEntity>
543+
</entity>
531544
</entities>

app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,9 @@
514514
<data key="password">pwdTest123!</data>
515515
<data key="store_id">0</data>
516516
<data key="website_id">0</data>
517-
<requiredEntity type="address">DE_Address_Berlin_Not_Default_Address</requiredEntity>
518-
<requiredEntity type="address">UK_Simple_Address</requiredEntity>
517+
<requiredEntity type="address">DE_Berlin_State</requiredEntity>
518+
<requiredEntity type="address">UK_State_Address</requiredEntity>
519519
<requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
520-
<requiredEntity type="address">US_Address_California</requiredEntity>
520+
<requiredEntity type="address">US_California_State</requiredEntity>
521521
</entity>
522522
</entities>

app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,9 @@
4040
<entity name="RegionUKGL" type="region">
4141
<data key="region">Greater London</data>
4242
</entity>
43+
<entity name="RegionBER" type="region">
44+
<data key="region">Berlin</data>
45+
<data key="region_code">BER</data>
46+
<data key="region_id">82</data>
47+
</entity>
4348
</entities>

app/code/Magento/Shipping/Test/Mftf/ActionGroup/CheckingWithMultipleAddressesActionGroup.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
<element name="orderShippingMethod" type="text" selector="//div[contains(@class, 'box-order-shipping-method')]//div[contains(., '{{method}}')]" parameterized="true"/>
2828
<element name="adminOrderShippingAddress" type="text" selector="//div[contains(@class, 'order-shipping-address')]//address[contains(., '{{city}}')]" parameterized="true"/>
2929
<element name="adminShippingMethod" type="text" selector="//div[contains(@class, 'order-shipping-method')]//div[contains(@class, 'admin__page-section-item-content')]//strong[contains(., '{{method}}')]" parameterized="true"/>
30+
<element name="shippingAddressSelector" type="select" selector="//tr[position()={{addressPosition}}]//td[@data-th='Send To']//select" parameterized="true"/>
31+
<element name="shippingAddressOptions" type="select" selector="#multiship-addresses-table tbody tr:nth-of-type({{addressPosition}}) .col.address select option:nth-of-type({{optionIndex}})" parameterized="true"/>
3032
</section>
3133
</sections>

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,18 @@
5858
<!-- Click 'Check Out with Multiple Addresses' -->
5959
<waitForElementClickable selector="{{AdminShipmentAddressInformationSection.checkoutWithMultipleAddresses}}" stepKey="waitForCheckoutWithMultipleAddressesLink"/>
6060
<click selector="{{AdminShipmentAddressInformationSection.checkoutWithMultipleAddresses}}" stepKey="clickOnCheckoutWithMultipleAddressesLink"/>
61-
<actionGroup ref="CheckingWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
62-
<actionGroup ref="CheckingWithMultipleAddressesActionGroup" stepKey="checkoutWithOtherAddresses">
63-
<argument name="addressOption1" value="3"/>
64-
<argument name="addressOption2" value="4"/>
65-
</actionGroup>
61+
<waitForPageLoad stepKey="waitForMultipleAddressPageLoad"/>
62+
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddressOptions('1','1')}}" after="waitForMultipleAddressPageLoad" stepKey="firstShippingAddressValue"/>
63+
<selectOption selector="{{AdminShipmentAddressInformationSection.shippingAddressSelector('1')}}" userInput="{$firstShippingAddressValue}" after="firstShippingAddressValue" stepKey="selectFirstShippingMethod"/>
64+
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.shippingAddressOptions('2','2')}}" stepKey="waitForSecondShippingAddress"/>
65+
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddressOptions('2','2')}}" after="selectFirstShippingMethod" stepKey="secondShippingAddressValue"/>
66+
<selectOption selector="{{AdminShipmentAddressInformationSection.shippingAddressSelector('2')}}" userInput="{$secondShippingAddressValue}" after="secondShippingAddressValue" stepKey="selectSecondShippingMethod"/>
67+
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.shippingAddressOptions('3','3')}}" stepKey="waitForThirdShippingAddress"/>
68+
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddressOptions('3','3')}}" after="selectSecondShippingMethod" stepKey="thirdShippingAddressValue"/>
69+
<selectOption selector="{{AdminShipmentAddressInformationSection.shippingAddressSelector('3')}}" userInput="{$thirdShippingAddressValue}" after="thirdShippingAddressValue" stepKey="selectThirdShippingMethod"/>
70+
<waitForElementVisible selector="{{AdminShipmentAddressInformationSection.shippingAddressOptions('4','4')}}" stepKey="waitForFourthShippingAddress"/>
71+
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddressOptions('4','4')}}" after="selectThirdShippingMethod" stepKey="fourthShippingAddressValue"/>
72+
<selectOption selector="{{AdminShipmentAddressInformationSection.shippingAddressSelector('4')}}" userInput="{$fourthShippingAddressValue}" after="fourthShippingAddressValue" stepKey="selectFourthShippingMethod"/>
6673
<!-- Updating the address for shipping section -->
6774
<waitForElementClickable selector="{{SingleShippingSection.updateAddress}}" stepKey="waitForUpdateAddress"/>
6875
<click selector="{{SingleShippingSection.updateAddress}}" after="waitForUpdateAddress" stepKey="clickUpdateAddress"/>

0 commit comments

Comments
 (0)