Merge branch 'MC-40167' into 2.4-develop-jet-pr1

Author: petrovsa

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml

@@ -10,7 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormConfigureProductSection">
         <element name="configure" type="button" selector="//a[@product_id='{{productId}}']" parameterized="true"/>
-        <element name="optionSelect" type="select" selector="//div[contains(@class,'product-options')]//select[//label[text() = '{{option}}']]" parameterized="true"/>
+        <element name="optionSelect" type="select" selector="//div[contains(@class,'product-options')]//select[//label[text() = '{{option}}']]" timeout="30" parameterized="true"/>
         <element name="optionSelectNew" type="select" selector="//label[text()='{{option1}}']/following-sibling::div/select" parameterized="true"/>
         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
         <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>

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

@@ -10,16 +10,13 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminSubmitConfigurableProductOrderTest">
         <annotations>
-            <title value="Create Order in Admin and update product configuration"/>
-            <stories value="MAGETWO-59632: Create Sales > Order from admin add configurable product and change options click OK does not update Items Ordered List"/>
-            <description value="Create Order in Admin and update product configuration"/>
             <features value="Sales"/>
-            <severity value="AVERAGE"/>
-            <testCaseId value="MAGETWO-59633"/>
-            <group value="Sales"/>
-            <skip>
-                <issueId value="MAGETWO-96196"/>
-            </skip>
+            <stories value="Admin create order"/>
+            <title value="Create Order in Admin and update product configuration"/>
+            <description value="Create Order as admin and update product attribute configuration during order creation"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-26545"/>
+            <group value="sales"/>
         </annotations>
 
         <before>
@@ -87,25 +84,41 @@
                 <requiredEntity createDataKey="createConfigChildProduct2"/>
             </createData>
 
+            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
 
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
+
+            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+        </after>
         <!--Create new customer order-->
         <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
-            <argument name="customer" value="$$simpleCustomer$$"/>
+            <argument name="customer" value="$simpleCustomer$"/>
         </actionGroup>
 
         <!--Add configurable product to order-->
         <actionGroup ref="AddConfigurableProductToOrderFromAdminActionGroup" stepKey="addConfigurableProductToOrder">
-            <argument name="product" value="$$createConfigProduct$$"/>
-            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
-            <argument name="option" value="$$getConfigAttributeOption1$$"/>
+            <argument name="product" value="$createConfigProduct$"/>
+            <argument name="attribute" value="$createConfigProductAttribute$"/>
+            <argument name="option" value="$getConfigAttributeOption1$"/>
         </actionGroup>
 
         <!--Configure ordered configurable product-->
         <actionGroup ref="ConfigureOrderedConfigurableProductActionGroup" stepKey="configureOrderedConfigurableProduct">
-            <argument name="attribute" value="$$createConfigProductAttribute$$"/>
-            <argument name="option" value="$$getConfigAttributeOption2$$"/>
+            <argument name="attribute" value="$createConfigProductAttribute$"/>
+            <argument name="option" value="$getConfigAttributeOption2$"/>
             <argument name="quantity" value="2"/>
         </actionGroup>
 
@@ -118,20 +131,5 @@
 
         <!--Verify order information-->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
-
-        <after>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-
-            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-
-            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
-
-            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
-            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
-        </after>
     </test>
 </tests>