Merge branch 'MC-21430' into MC-21994

Author: Joan He

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml

@@ -18,4 +18,15 @@
         <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
         <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
     </actionGroup>
+
+    <!-- ActionGroup click on Advanced Inventory Button in product form;
+         You must already be on the product form page -->
+    <actionGroup name="AdminClickOnAdvancedInventoryButtonActionGroup">
+        <annotations>
+            <description>Clicks on the 'Advanced Inventory' link on the Admin Product creation/edit page.</description>
+        </annotations>
+
+        <click selector="{{AdminProductFormSection.advancedInventoryButton}}" stepKey="clickOnAdvancedInventoryLink"/>
+        <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
+    </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

@@ -38,7 +38,7 @@
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']" timeout="30"/>
         <element name="unselectCategories" type="button" selector="//span[@class='admin__action-multiselect-crumb']/span[contains(.,'{{category}}')]/../button[@data-action='remove-selected-item']" parameterized="true" timeout="30"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
-        <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]" timeout="30"/>
+        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button'].action-additional" timeout="30"/>
         <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']" timeout="30"/>
         <element name="productStockStatusDisabled" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]'][disabled=true]"/>
         <element name="stockStatus" type="select" selector="[data-index='product-details'] select[name='product[quantity_and_stock_status][is_in_stock]']"/>

app/code/Magento/CatalogInventory/Test/Mftf/Section/AdminProductFormSection.xml

@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormSection">
-        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button']" timeout="30"/>
+        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button'].action-additional" timeout="30"/>
+        <element name="advancedInventoryButton" type="button" selector="button[data-index='advanced_inventory_button'].action-basic" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml

@@ -12,7 +12,7 @@
         <element name="updateChangesBtn" type="button" selector=".order-sidebar .actions .action-default.scalable" timeout="30"/>
         <element name="productName" type="text" selector="#order-items_grid  span[id*=order_item]"/>
         <element name="productPrice" type="text" selector=".even td[class=col-price] span[class=price]"/>
-        <element name="productQty" type="input" selector="td[class=col-qty] input"/>
+        <element name="productQty" type="input" selector="td[class=col-qty] .input-text.item-qty.admin__control-text"/>
         <element name="gridCell" type="text" selector="//div[contains(@id, 'order-items_grid')]//tbody[{{row}}]//td[count(//table[contains(@class, 'order-tables')]//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true" timeout="30"/>
     </section>
 </sections>