Merge pull request #550 from magento-gl/ACQE-4Version-functional-mainline-deployment

Bengals ACQE functional deployment

Author: internal-magento-queue-manager[bot]

InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialInvoiceForOrderWithVirtualProductOnCustomStockTest.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
+  * Copyright 2025 Adobe
+  * All rights reserved.
   * See COPYING.txt for license details.
   */
 -->
@@ -48,13 +49,6 @@
             <comment userInput="BIC workaround" stepKey="saveCustomStock"/>
             <comment userInput="BIC workaround" stepKey="reindexCacheFlushAfterAssignDefaultStockToMainWebsite"/>
 
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
-                <argument name="indices" value=""/>
-            </actionGroup>
-            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
-                <argument name="tags" value="full_page"/>
-            </actionGroup>
-
             <createData entity="VirtualProduct" stepKey="virtualProduct">
                 <requiredEntity createDataKey="category"/>
             </createData>
@@ -69,6 +63,12 @@
             </actionGroup>
             <fillField selector="{{AdminProductSourcesGrid.rowQty('2')}}" userInput="100" stepKey="setCustomSourceQuantity2"/>
             <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveEditedVirtualProduct"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
 
         <after>
@@ -146,8 +146,8 @@
             <argument name="selector" value="AdminProductGridFilterSection.skuFilter"/>
             <argument name="value" value="$$virtualProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource.source[name]$$)}}" userInput="99" stepKey="checkProductSourceQtyAfterInvoiceCreated"/>
-        <see selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource2.source[name]$$)}}" userInput="100" stepKey="checkProductSource2QtyAfterInvoiceCreated"/>
-        <see selector="{{AdminProductGridSection.productSalableQty('1',$$customStock.stock[name]$$)}}" userInput="197" stepKey="checkSalableQtyAfterInvoiceCreated"/>
+        <waitForText selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource.source[name]$$)}}" userInput="99" stepKey="checkProductSourceQtyAfterInvoiceCreated"/>
+        <waitForText selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource2.source[name]$$)}}" userInput="100" stepKey="checkProductSource2QtyAfterInvoiceCreated"/>
+        <waitForText selector="{{AdminProductGridSection.productSalableQty('1',$$customStock.stock[name]$$)}}" userInput="197" stepKey="checkSalableQtyAfterInvoiceCreated"/>
     </test>
 </tests>

InventoryInStorePickupAdminUi/Test/Mftf/Test/StorePickupDeliveryMethodHiddenInOrderCreatedFromAdminWhenNotAllProductsAvailableForPickupTest.xml

@@ -139,7 +139,7 @@
         <actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="CreateNewOrder">
             <argument name="customer" value="Simple_US_Customer"/>
         </actionGroup>
-
+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" visible="true" stepKey="selectStoreOption"/>
         <!--Add product to order-->
         <actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSimpleProductToOrder">
             <argument name="product" value="$createSimpleProduct$"/>