Merge remote-tracking branch 'origin/MC-41981' into MC-41981

Author: amitjoc

app/code/Magento/Catalog/Test/Mftf/Data/SimpleProductOptionData.xml

@@ -17,37 +17,4 @@
         <data key="option_0_price_type">Percent</data>
         <data key="option_0_sku" unique="suffix">sku_drop_down_row_1</data>
     </entity>
-
-    <!-- Simple product option one    -->
-    <entity name="simpleProductCustomizableOptionOne">
-        <data key="title">Test 1</data>
-        <data key="type">Drop-down</data>
-        <data key="is_required">1</data>
-        <data key="option_1_title">X</data>
-        <data key="option_1_price">10.00</data>
-        <data key="option_1_price_type">fixed</data>
-    </entity>
-
-    <!-- Simple product file option two   -->
-    <entity name="simpleProductCustomizableOptionTwo">
-        <data key="title">File</data>
-        <data key="type">file</data>
-        <data key="is_require">true</data>
-        <data key="sort_order">2</data>
-        <data key="option_2_price">0.00</data>
-        <data key="option_2_price_type">fixed</data>
-        <data key="option_2_file_extension">imed</data>
-        <data key="option_2_image_size_x">0</data>
-        <data key="option_2_image_size_y">0</data>
-    </entity>
-
-    <!-- Simple product Option three   -->
-    <entity name="simpleProductCustomizableOptionThree">
-        <data key="title">Test 2</data>
-        <data key="type">Drop-down</data>
-        <data key="is_required">1</data>
-        <data key="option_3_title">D</data>
-        <data key="option_3_price">10.00</data>
-        <data key="option_3_price_type">fixed</data>
-    </entity>
 </entities>

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

@@ -13,13 +13,13 @@
             <title value="Make reorder as customer on frontend"/>
             <description value="Make reorder as customer on Frontend with simple product custom options"/>
             <severity value="CRITICAL"/>
-            <testCaseId value=""/>
+            <testCaseId value="MC-42899"/>
             <useCaseId value="MC-41981" />
             <group value="sales"/>
         </annotations>
 
         <before>
-            <!-- Login As Admin  -->
+            <!-- Login As Admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <!-- Create Customer -->
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
@@ -31,8 +31,8 @@
 
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <deleteData stepKey="deleteDefaultCategory" createDataKey="initialCategoryEntity"/>
-            <deleteData stepKey="deleteSimpleProduct" createDataKey="initialSimpleProduct"/>
+            <deleteData createDataKey="initialCategoryEntity" stepKey="deleteDefaultCategory"/>
+            <deleteData createDataKey="initialSimpleProduct" stepKey="deleteSimpleProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
@@ -55,7 +55,7 @@
             <argument name="optionValue" value="ProductOptionValueDropdown1"/>
         </actionGroup>
 
-        <!-- Add Custom file option  -->
+        <!-- Add Custom file option -->
         <actionGroup ref="AddProductCustomOptionFileActionGroup" stepKey="addFileOption">
             <argument name="option" value="ProductOptionFile"/>
         </actionGroup>
@@ -84,22 +84,22 @@
             <argument name="productUrl" value="$$initialSimpleProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
 
-        <!--Select Option From First DropDown option -->
+        <!-- Select Option From First DropDown option -->
         <actionGroup ref="StorefrontProductPageSelectDropDownOptionValueActionGroup" stepKey="selectFirstOption">
             <argument name="attributeLabel" value="{{ProductOptionDropDown.title}}"/>
             <argument name="optionLabel" value="{{ProductOptionValueDropdown1.title}}"/>
         </actionGroup>
 
-        <!-- Attach file option-->
+        <!-- Attach file option -->
         <actionGroup ref="StorefrontAttachOptionFileActionGroup" stepKey="selectAndAttachFile"/>
 
-        <!--Select Option From Second DropDown option -->
+        <!-- Select Option From Second DropDown option -->
         <actionGroup ref="StorefrontProductPageSelectDropDownOptionValueActionGroup" stepKey="selectSecondOption">
             <argument name="attributeLabel" value="{{ProductOptionDropDownWithLongValuesTitle.title}}"/>
             <argument name="optionLabel" value="{{ProductOptionValueDropdown2.title}}"/>
         </actionGroup>
 
-        <!-- Add Product to Card      -->
+        <!-- Add Product to Card -->
         <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
             <argument name="product" value="$$initialSimpleProduct$$"/>
             <argument name="productCount" value="1"/>
@@ -112,20 +112,20 @@
         <!-- Log out from storefront as Customer -->
         <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogOut"/>
 
-        <!-- Again Login As Admin  -->
+        <!-- Again Login As Admin -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdminForSubmitShipment"/>
 
         <!-- Open order -->
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderForCreatingShipment">
             <argument name="orderId" value="{$grabOrderNumber}"/>
         </actionGroup>
-        <!--Create Shipment for the order-->
+        <!-- Create Shipment for the order -->
         <actionGroup ref="GoToShipmentIntoOrderActionGroup" stepKey="startCreateShipment"/>
         <actionGroup ref="SubmitShipmentIntoOrderActionGroup" stepKey="submitShipment"/>
 
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/>
 
-        <!-- Login to storefront as Customer for Reorder-->
+        <!-- Login to storefront as Customer for Reorder -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLoginForReorder">
             <argument name="Customer" value="$$createCustomer$$"/>
         </actionGroup>