Skip to content

Commit 1684d3b

Browse files
committed
MC-41981: [Magento Cloud] Reorder Not Working On Storefront
1 parent cf7dd78 commit 1684d3b

File tree

3 files changed

+6
-111
lines changed

3 files changed

+6
-111
lines changed

app/code/Magento/Sales/Model/Reorder/OrderInfoBuyRequestGetter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(
3939
}
4040

4141
/**
42-
* Prepare Custom Option for order Item by unserializing custom options data
42+
* Prepare Custom Option for order Item by unserializing custom options data
4343
*
4444
* @param OrderItemInterface $orderItem
4545
* @return DataObject

app/code/Magento/Sales/Test/Mftf/Test/AdminReorderProductWithCustomOptionsTest.xml

Lines changed: 4 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="AdminReorderProductWithCustomOptionsTest">
10+
<test name="AdminReorderProductWithCustomOptionsTest" extends="StorefrontCustomerReorderProductWithCustomOptionsTest">
1111
<annotations>
1212
<stories value="Admin reorder product with custom options"/>
1313
<title value="Make reorder as Admin"/>
@@ -18,116 +18,12 @@
1818
<group value="sales"/>
1919
</annotations>
2020

21-
<before>
22-
<!-- Login As Admin -->
23-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24-
<!-- Create Customer -->
25-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
26-
<!-- Create Simple Category -->
27-
<createData entity="_defaultCategory" stepKey="initialCategoryEntity"/>
28-
<!-- Create Simple Product -->
29-
<createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct"/>
30-
</before>
31-
32-
<after>
33-
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
34-
<deleteData createDataKey="initialCategoryEntity" stepKey="deleteDefaultCategory"/>
35-
<deleteData createDataKey="initialSimpleProduct" stepKey="deleteSimpleProduct"/>
36-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
37-
</after>
38-
39-
<!-- Search default simple product in the grid -->
40-
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="openProductCatalogPage"/>
41-
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickFirstRowToOpenDefaultSimpleProduct">
42-
<argument name="product" value="$$initialSimpleProduct$$"/>
43-
</actionGroup>
44-
45-
<!-- Open custom option panel -->
46-
<click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomizableOptions"/>
47-
<waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
48-
49-
<!-- Add First Drop Down Custom Options -->
50-
<actionGroup ref="AdminAddProductCustomOptionActionGroup" stepKey="addProductCustomDropDownOptionFirst">
51-
<argument name="customOptionTitle" value="{{ProductOptionDropDown.title}}"/>
52-
<argument name="customOptionType" value="Drop-down"/>
53-
</actionGroup>
54-
<actionGroup ref="AdminAddTitleAndPriceValueToCustomOptionActionGroup" stepKey="addTitleAndPriceValueToCustomDropDownOptionFirst">
55-
<argument name="optionValue" value="ProductOptionValueDropdown1"/>
56-
</actionGroup>
57-
58-
<!-- Add Custom file option -->
59-
<actionGroup ref="AddProductCustomOptionFileActionGroup" stepKey="addFileOption">
60-
<argument name="option" value="ProductOptionFile"/>
61-
</actionGroup>
62-
63-
<!-- Add Second Drop Down Custom Options -->
64-
<!-- As per issue both drop-down are fixed valued so used again ProductOptionValueDropdown1 DataEntity -->
65-
<actionGroup ref="AdminAddProductCustomOptionActionGroup" stepKey="addProductCustomDropDownOptionSecond">
66-
<argument name="customOptionTitle" value="{{ProductOptionDropDownWithLongValuesTitle.title}}"/>
67-
<argument name="customOptionType" value="Drop-down"/>
68-
</actionGroup>
69-
<actionGroup ref="AdminAddTitleAndPriceValueToCustomOptionActionGroup" stepKey="addTitleAndPriceValueToCustomDropDownOptionSecond">
70-
<argument name="optionValue" value="ProductOptionValueDropdown2"/>
71-
</actionGroup>
72-
73-
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
74-
75-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
76-
77-
<!-- Login to storefront as Customer -->
78-
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
79-
<argument name="Customer" value="$$createCustomer$$"/>
80-
</actionGroup>
81-
82-
<!-- Place Order as Customer -->
83-
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
84-
<argument name="productUrl" value="$$initialSimpleProduct.custom_attributes[url_key]$$"/>
85-
</actionGroup>
86-
87-
<!-- Select Option From First DropDown option -->
88-
<actionGroup ref="StorefrontProductPageSelectDropDownOptionValueActionGroup" stepKey="selectFirstOption">
89-
<argument name="attributeLabel" value="{{ProductOptionDropDown.title}}"/>
90-
<argument name="optionLabel" value="{{ProductOptionValueDropdown1.title}}"/>
91-
</actionGroup>
92-
93-
<!-- Attach file option -->
94-
<actionGroup ref="StorefrontAttachOptionFileActionGroup" stepKey="selectAndAttachFile"/>
95-
96-
<!-- Select Option From Second DropDown option -->
97-
<actionGroup ref="StorefrontProductPageSelectDropDownOptionValueActionGroup" stepKey="selectSecondOption">
98-
<argument name="attributeLabel" value="{{ProductOptionDropDownWithLongValuesTitle.title}}"/>
99-
<argument name="optionLabel" value="{{ProductOptionValueDropdown2.title}}"/>
100-
</actionGroup>
101-
102-
<!-- Add Product to Card -->
103-
<actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
104-
<argument name="product" value="$$initialSimpleProduct$$"/>
105-
<argument name="productCount" value="1"/>
106-
</actionGroup>
107-
108-
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openCart"/>
109-
<actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
110-
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
111-
112-
<!-- Log out from storefront as Customer -->
113-
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogOut"/>
114-
115-
<!-- Again Login As Admin -->
116-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdminForSubmitShipment"/>
117-
118-
<!-- Open order -->
119-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderForCreatingShipment">
120-
<argument name="orderId" value="{$grabOrderNumber}"/>
121-
</actionGroup>
122-
<!-- Create Shipment for the order -->
123-
<actionGroup ref="GoToShipmentIntoOrderActionGroup" stepKey="startCreateShipment"/>
124-
<actionGroup ref="SubmitShipmentIntoOrderActionGroup" stepKey="adminClickSubmitShipment"/>
12521

12622
<!-- Reorder created order -->
127-
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="adminOpenOrderById">
23+
<actionGroup ref="OpenOrderByIdActionGroup" after="placeReorder" stepKey="adminOpenOrderById">
12824
<argument name="orderId" value="{$grabOrderNumber}"/>
12925
</actionGroup>
130-
<actionGroup ref="AdminStartReorderFromOrderPageActionGroup" stepKey="adminStartReorder"/>
131-
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="adminSubmitOrder"/>
26+
<actionGroup ref="AdminStartReorderFromOrderPageActionGroup" after="adminOpenOrderById" stepKey="adminStartReorder"/>
27+
<actionGroup ref="AdminSubmitOrderActionGroup" after="adminStartReorder" stepKey="adminSubmitOrder"/>
13228
</test>
13329
</tests>

app/code/Magento/Sales/Test/Mftf/Test/StorefrontCustomerReorderProductWithCustomOptionsTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,11 @@
119119
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderForCreatingShipment">
120120
<argument name="orderId" value="{$grabOrderNumber}"/>
121121
</actionGroup>
122+
122123
<!-- Create Shipment for the order -->
123124
<actionGroup ref="GoToShipmentIntoOrderActionGroup" stepKey="startCreateShipment"/>
124125
<actionGroup ref="SubmitShipmentIntoOrderActionGroup" stepKey="submitShipment"/>
125126

126-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/>
127-
128127
<!-- Login to storefront as Customer for Reorder -->
129128
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLoginForReorder">
130129
<argument name="Customer" value="$$createCustomer$$"/>

0 commit comments

Comments
 (0)