Skip to content

Commit 6153cf3

Browse files
vital-pantsialeyeuvital-pantsialeyeu
committed
MAGETWO-99490: gift messaging options are not saved with multi-address checkout
- Updated functional test.
1 parent fcb6c20 commit 6153cf3

File tree

5 files changed

+47
-19
lines changed

5 files changed

+47
-19
lines changed

‎app/code/Magento/GiftMessage/Test/Mftf/Section/StorefrontOrderGiftSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontOrderGiftSection">
12-
<element name="giftMessageLink" type="button" selector="//div[contains(@class, 'table-wrapper order-items')]//a[contains(@id, 'order-item-gift-message-link')]"/>
12+
<element name="giftMessageLink" type="button" selector=".table-wrapper.order-items .options .action.show"/>
1313
<element name="giftMessage" type="text" selector=".order-gift-message .item-message" />
1414
</section>
1515
</sections>

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMultipleAddressesActionGroup.xml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,22 @@
2323
<click stepKey="clickOnUpdateAddress" selector="{{SingleShippingSection.updateAddress}}" after="selectSecondShippingMethod" />
2424
<waitForPageLoad stepKey="waitForShippingInformation" after="clickOnUpdateAddress" />
2525
</actionGroup>
26-
<actionGroup name="CheckingWithThreeDifferentAddressesActionGroup" extends="CheckingWithSingleAddressActionGroup">
27-
<grabTextFrom stepKey="firstShippingAddressValue" selector="{{MultishippingSection.firstShippingAddressValue}}" after="waitForMultipleAddressPageLoad" />
28-
<selectOption selector="{{MultishippingSection.firstShippingAddressOption}}" userInput="{$firstShippingAddressValue}" stepKey="selectFirstShippingMethod" after="firstShippingAddressValue" />
29-
<waitForPageLoad stepKey="waitForSecondShippingAddresses" after="selectFirstShippingMethod" />
30-
<grabTextFrom stepKey="secondShippingAddressValue" selector="{{MultishippingSection.secondShippingAddressValue}}" after="waitForSecondShippingAddresses" />
31-
<selectOption selector="{{MultishippingSection.secondShippingAddressOption}}" userInput="{$secondShippingAddressValue}" stepKey="selectSecondShippingMethod" after="secondShippingAddressValue" />
32-
<waitForPageLoad stepKey="waitForLastShippingAddressValue" after="selectSecondShippingMethod" />
33-
<grabTextFrom stepKey="lastShippingAddressValue" selector="{{MultishippingSection.lastShippingAddressValue}}" after="waitForLastShippingAddressValue"/>
34-
<selectOption selector="{{MultishippingSection.lastShippingAddressOption}}" userInput="{$lastShippingAddressValue}" stepKey="selectLastShippingMethod" after="lastShippingAddressValue"/>
35-
<click stepKey="clickOnUpdateAddress" selector="{{SingleShippingSection.updateAddress}}" after="selectLastShippingMethod"/>
36-
<waitForPageLoad stepKey="waitForShippingInformationAfterUpdated" after="clickOnUpdateAddress"/>
26+
<actionGroup name="StorefrontCheckoutWithMultipleAddressesActionGroup">
27+
<click selector="{{SingleShippingSection.checkoutWithMultipleAddresses}}" stepKey="clickOnCheckoutWithMultipleAddresses"/>
28+
<waitForPageLoad stepKey="waitForMultipleAddressPageLoad"/>
29+
</actionGroup>
30+
<actionGroup name="StorefrontSelectAddressActionGroup">
31+
<arguments>
32+
<argument name="sequenceNumber" type="string" defaultValue="1"/>
33+
<argument name="option" type="string" defaultValue="1"/>
34+
</arguments>
35+
<selectOption selector="{{MultishippingSection.selectShippingAddress(sequenceNumber)}}" userInput="{{option}}" stepKey="selectShippingAddress"/>
36+
</actionGroup>
37+
<actionGroup name="StorefrontSaveAddressActionGroup">
38+
<click stepKey="clickOnUpdateAddress" selector="{{SingleShippingSection.updateAddress}}"/>
39+
<waitForPageLoad stepKey="waitForShippingInformationAfterUpdated" time="90"/>
40+
<click stepKey="goToShippingInformation" selector="{{SingleShippingSection.goToShippingInfo}}"/>
41+
<waitForPageLoad stepKey="waitForShippingPageLoad"/>
3742
</actionGroup>
3843
</actionGroups>
3944

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectShippingInfoActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<waitForPageLoad stepKey="waitForRadioOptions"/>
3030
<click stepKey="goToBillingInformation" selector="{{ShippingMethodSection.goToBillingInfo}}"/>
3131
</actionGroup>
32-
<actionGroup name="defaultShippingInfoActionGroup">
32+
<actionGroup name="StorefrontLeaveDefaultShippingMethodsAndGoToBillingInfoActionGroup">
3333
<waitForPageLoad stepKey="waitForShippingInfo"/>
3434
<click stepKey="goToBillingInformation" selector="{{ShippingMethodSection.goToBillingInfo}}"/>
3535
</actionGroup>

‎app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<element name="firstShippingAddressOption" type="select" selector="//table//tbody//tr[position()=1]//td[position()=3]//div//select"/>
2121
<element name="secondShippingAddressValue" type="select" selector="//table//tbody//tr[position()=2]//td[position()=3]//div//select//option[1]"/>
2222
<element name="secondShippingAddressOption" type="select" selector="//table//tbody//tr[position()=2]//td[position()=3]//div//select"/>
23-
<element name="lastShippingAddressValue" type="select" selector="//table//tbody//tr[position()=2]//td[position()=3]//div//select//option[last()]"/>
24-
<element name="lastShippingAddressOption" type="select" selector="//table//tbody//tr[position()=2]//td[position()=3]//div//select"/>
23+
<element name="selectShippingAddress" type="select" selector="(//table[@id='multiship-addresses-table'] //div[@class='field address'] //select)[{{sequenceNumber}}]" parameterized="true"/>
2524
</section>
2625
</sections>

‎app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithMultipleAddressesTest.xml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,20 @@
6666
</actionGroup>
6767
<!--Go to Cart -->
6868
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
69+
<!--Check Out with Multiple Addresses -->
70+
<actionGroup ref="StorefrontCheckoutWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
6971
<!-- Select different addresses and click 'Go to Shipping Information' -->
70-
<actionGroup ref="CheckingWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
72+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectFirstAddress">
73+
<argument name="sequenceNumber" value="1"/>
74+
<argument name="option" value="John Doe, 368 Broadway St. 113, New York, New York 10001, United States"/>
75+
</actionGroup>
76+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectSecondAddress">
77+
<argument name="sequenceNumber" value="2"/>
78+
<argument name="option" value="John Doe, Augsburger Strabe 41, Berlin, 10789, Germany"/>
79+
</actionGroup>
80+
<actionGroup ref="StorefrontSaveAddressActionGroup" stepKey="saveAddresses"/>
7181
<!-- Click 'Continue to Billing Information' -->
72-
<actionGroup ref="defaultShippingInfoActionGroup" stepKey="useDefaultShippingMethod"/>
82+
<actionGroup ref="StorefrontLeaveDefaultShippingMethodsAndGoToBillingInfoActionGroup" stepKey="useDefaultShippingMethod"/>
7383
<!-- Click 'Go to Review Your Order' -->
7484
<actionGroup ref="SelectBillingInfoActionGroup" stepKey="useDefaultBillingMethod"/>
7585
<!-- Click 'Place Order' -->
@@ -85,10 +95,24 @@
8595
</actionGroup>
8696
<!--Go to Cart -->
8797
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCartWithIdenticalProducts"/>
98+
<!--Check Out with Multiple Addresses -->
99+
<actionGroup ref="StorefrontCheckoutWithMultipleAddressesActionGroup" stepKey="checkoutWithThreeDifferentAddresses"/>
88100
<!-- Select different addresses and click 'Go to Shipping Information' -->
89-
<actionGroup ref="CheckingWithThreeDifferentAddressesActionGroup" stepKey="checkoutThreeDifferentAddresses"/>
101+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectFirstAddressFromThree">
102+
<argument name="sequenceNumber" value="1"/>
103+
<argument name="option" value="John Doe, 368 Broadway St. 113, New York, New York 10001, United States"/>
104+
</actionGroup>
105+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectSecondAddressFromThree">
106+
<argument name="sequenceNumber" value="2"/>
107+
<argument name="option" value="John Doe, Augsburger Strabe 41, Berlin, 10789, Germany"/>
108+
</actionGroup>
109+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectThirdAddressFromThree">
110+
<argument name="sequenceNumber" value="3"/>
111+
<argument name="option" value="Jane Doe, 172, Westminster Bridge Rd, London, SE1 7RW, United Kingdom"/>
112+
</actionGroup>
113+
<actionGroup ref="StorefrontSaveAddressActionGroup" stepKey="saveThreeDifferentAddresses"/>
90114
<!-- Click 'Continue to Billing Information' -->
91-
<actionGroup ref="defaultShippingInfoActionGroup" stepKey="useDefaultShippingMethodForIdenticalProducts"/>
115+
<actionGroup ref="StorefrontLeaveDefaultShippingMethodsAndGoToBillingInfoActionGroup" stepKey="useDefaultShippingMethodForIdenticalProducts"/>
92116
<!-- Click 'Go to Review Your Order' -->
93117
<actionGroup ref="SelectBillingInfoActionGroup" stepKey="UseDefaultBillingMethodForIdenticalProducts"/>
94118
<!-- Click 'Place Order' -->

0 commit comments

Comments
 (0)