Skip to content

Commit 2bee5bc

Browse files
author
Viktor Kopin
committed
MC-38113: Same shipping address is repeating multiple times in storefront checkout when Reordered
1 parent 372049a commit 2bee5bc

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
3030
<waitForLoadingMaskToDisappear stepKey="waitForShippingLoadingMask"/>
3131
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
32-
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
32+
<waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
3333
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
3434
</actionGroup>
3535
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml renamed to ‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AssertStoreFrontCustomerHasNoOtherAddressesActionGroup">
10+
<actionGroup name="AssertStorefrontCustomerHasNoOtherAddressesActionGroup">
1111
<annotations>
12-
<description>Verifies customer no additional address in address book</description>
12+
<description>Verifies customer has no additional address in address book</description>
1313
</annotations>
1414
<amOnPage url="customer/address/" stepKey="goToAddressPage"/>
1515
<waitForText userInput="You have no other address entries in your address book." selector=".block-addresses-list" stepKey="assertOtherAddresses"/>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminReorderActionGroup.xml renamed to ‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminReorderActionGroup">
10+
<actionGroup name="AdminStartReorderFromOrderPageActionGroup">
1111
<annotations>
1212
<description>Reorder existing order. Requires admin order page to be opened.</description>
1313
</annotations>
1414

1515
<click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
1616
<waitForPageLoad stepKey="waitPageLoad"/>
17-
18-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmit"/>
19-
<waitForPageLoad stepKey="waitOrderCreated"/>
20-
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeOrderCreatedMessage"/>
17+
<waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForPageTitle"/>
18+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeCreateNewOrderPageTitle"/>
2119
</actionGroup>
2220
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,37 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminReorderAddressNotSavedInAddressBookTest">
1111
<annotations>
12-
<title value="Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
13-
<stories value="MC-38113: Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
14-
<description value="Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
1512
<features value="Sales"/>
16-
<testCaseId value="MC-38113"/>
13+
<stories value="Reorder"/>
14+
<title value="Same shipping address is not repeating multiple times in storefront checkout when Reordered"/>
15+
<description value="Same shipping address is not repeating multiple times in storefront checkout when Reordered"/>
16+
<testCaseId value="MC-38412"/>
17+
<useCaseId value="MC-38113"/>
1718
<severity value="MAJOR"/>
18-
<group value="Sales"/>
19+
<group value="sales"/>
1920
</annotations>
2021
<before>
21-
<createData entity="ApiCategory" stepKey="Category"/>
22-
<createData entity="ApiSimpleProduct" stepKey="Product">
23-
<requiredEntity createDataKey="Category"/>
22+
<createData entity="ApiCategory" stepKey="category"/>
23+
<createData entity="ApiSimpleProduct" stepKey="product">
24+
<requiredEntity createDataKey="category"/>
2425
</createData>
25-
<createData entity="Simple_Customer_Without_Address" stepKey="Customer"/>
26+
<createData entity="Simple_Customer_Without_Address" stepKey="customer"/>
2627
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2728
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
28-
<argument name="Customer" value="$Customer$"/>
29+
<argument name="Customer" value="$customer$"/>
2930
</actionGroup>
3031
</before>
3132
<after>
33+
<deleteData createDataKey="product" stepKey="deleteProduct"/>
34+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
3235
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
36+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
3337
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
34-
<deleteData createDataKey="Product" stepKey="deleteProduct"/>
35-
<deleteData createDataKey="Category" stepKey="deleteCategory"/>
36-
<deleteData createDataKey="Customer" stepKey="deleteCustomer"/>
3738
</after>
3839

3940
<!-- Create order for registered customer -->
4041
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToOrder">
41-
<argument name="product" value="$Product$"/>
42+
<argument name="product" value="$product$"/>
4243
</actionGroup>
4344
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="openCheckoutPage"/>
4445
<actionGroup ref="LoggedInUserCheckoutFillingShippingSectionActionGroup" stepKey="fillAddressForm"/>
@@ -47,11 +48,12 @@
4748

4849
<!-- Reorder created order -->
4950
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderById">
50-
<argument name="orderId" value="$grabOrderNumber"/>
51+
<argument name="orderId" value="{$grabOrderNumber}"/>
5152
</actionGroup>
52-
<actionGroup ref="AdminReorderActionGroup" stepKey="reorder"/>
53+
<actionGroup ref="AdminStartReorderFromOrderPageActionGroup" stepKey="startReorder"/>
54+
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
5355

5456
<!-- Assert no additional addresses saved -->
55-
<actionGroup ref="AssertStoreFrontCustomerHasNoOtherAddressesActionGroup" stepKey="assertAddresses"/>
57+
<actionGroup ref="AssertStorefrontCustomerHasNoOtherAddressesActionGroup" stepKey="assertAddresses"/>
5658
</test>
5759
</tests>

0 commit comments

Comments
 (0)