Merge remote-tracking branch 'origin/MC-40028' into 2.4-develop-pr142

Author: zakdma

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

@@ -452,6 +452,13 @@ define([
             }
         },
 
+        /**
+         * Helper to find select element of currently confirmed item
+         */
+        getCurrentConfirmedSelectElement: function () {
+            return $(this.confirmedCurrentId).getElementsByTagName('select');
+        },
+
         /**
          * Helper to find qty of active form
          */

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

@@ -11,13 +11,14 @@
     <section name="AdminOrderFormItemsOrderedSection">
         <element name="addProductsBySku" type="button" selector="//section[@id='order-items']//span[contains(text(),'Add Products By SKU')]"/>
         <element name="configureButtonBySku" type="button" selector="//div[@class='sku-configure-button']//span[contains(text(),'Configure')]"/>
-        <element name="configureProductOk" type="button" selector="//div[@class='page-main-actions']//span[contains(text(),'OK')]"/>
+        <element name="configureProductOk" type="button" selector="//div[@class='page-main-actions']//span[contains(text(),'OK')]" timeout="30"/>
         <element name="configureProductQtyField" type="input" selector="//*[@id='super-product-table']/tbody/tr[{{arg}}]/td[5]/input[1]" parameterized="true"/>
         <element name="addProductToOrder" type="input" selector="//*[@title='Add Products to Order']" timeout="30"/>
         <element name="itemsOrderedSummaryText" type="textarea" selector="//table[@class='data-table admin__table-primary order-tables']/tfoot/tr"/>
         <element name="configureSelectAttribute" type="select" selector="select[id*=attribute]"/>
         <element name="itemsSKU" type="text" selector="(//div[contains(@class, 'product-sku-block')])[{{productNumber}}]" parameterized="true"/>
         <element name="moveProduct" type="select" selector="//td[contains(.,'{{productName}}')]/../..//td//select" parameterized="true"/>
         <element name="productMessage" type="text" selector="//section[@id = 'order-items']//span[text()='{{productName}}']/ancestor::tr/..//div[contains(@class, 'message-{{messageType}}')]" parameterized="true"/>
+        <element name="productPrice" type="text" selector="//div[@id = 'order-errors']//strong[text()='{{productName}}']/ancestor::tr/td[@data-column='price']" timeout="30" parameterized="true"/>
     </section>
 </sections>