#25037: MFTF tests fix.

Author: engcom-Foxtrot

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php

@@ -9,7 +9,6 @@
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Store\Model\ScopeInterface;
 
 /**
  * Adminhtml sales order create sidebar block
@@ -136,20 +135,7 @@ public function getItemCount()
     {
         $count = $this->getData('item_count');
         if ($count === null) {
-            $useQty = $this->_scopeConfig->getValue(
-                'checkout/cart_link/use_qty',
-                ScopeInterface::SCOPE_STORE
-            );
-            $allItems = $this->getItems();
-            if ($useQty) {
-                $count = 0;
-                foreach ($allItems as $item) {
-                    $count += $item->getQty();
-                }
-            } else {
-                $count = count($allItems);
-            }
-
+            $count = count($this->getItems());
             $this->setData('item_count', $count);
         }
         return $count;

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Adminhtml sales order create sidebar cart block
@@ -146,4 +147,30 @@ private function getCartItemCustomPrice(Product $product): ?float
 
         return null;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItemCount()
+    {
+        $count = $this->getData('item_count');
+        if ($count === null) {
+            $useQty = $this->_scopeConfig->getValue(
+                'checkout/cart_link/use_qty',
+                ScopeInterface::SCOPE_STORE
+            );
+            $allItems = $this->getItems();
+            if ($useQty) {
+                $count = 0;
+                foreach ($allItems as $item) {
+                    $count += $item->getQty();
+                }
+            } else {
+                $count = count($allItems);
+            }
+            $this->setData('item_count', $count);
+        }
+
+        return $count;
+    }
 }

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

@@ -46,8 +46,9 @@
         </actionGroup>
 
         <!-- Add product to cart -->
-        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+        <actionGroup ref="StorefrontAddSimpleProductWithQtyActionGroup" stepKey="addSimpleProductToCart">
             <argument name="product" value="$$createProduct$$"/>
+            <argument name="quantity" value="2"/>
         </actionGroup>
 
         <!-- Login as admin -->
@@ -64,6 +65,7 @@
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
 
         <!-- Check product in customer's activities in shopping cart section -->
+        <see selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="Shopping Cart (2)" stepKey="seeCorrectNumberInCart"/>
         <see selector="{{AdminCustomerActivitiesShoppingCartSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductNameInShoppingCartSection"/>
         <see selector="{{AdminCustomerActivitiesShoppingCartSection.productPrice}}" userInput="$$createProduct.price$$" stepKey="seeProductPriceInShoppingCartSection"/>
 
@@ -75,6 +77,6 @@
         <!-- Assert product in items ordered grid -->
         <see selector="{{AdminCustomerCreateNewOrderSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductName"/>
         <see selector="{{AdminCustomerCreateNewOrderSection.productPrice}}" userInput="$$createProduct.price$$" stepKey="seeProductPrice"/>
-        <seeInField selector="{{AdminCustomerCreateNewOrderSection.productQty}}" userInput="{{ApiSimpleSingleQty.quantity}}" stepKey="seeProductQty"/>
+        <seeInField selector="{{AdminCustomerCreateNewOrderSection.productQty}}" userInput="2" stepKey="seeProductQty"/>
     </test>
 </tests>