Merge branch '2.4-develop' into commpr-21755-2209

Author: harshityadav90

app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleRegularPriceTest.php

@@ -98,7 +98,7 @@ public function testGetAmount()
             ->willReturn($expectedResult);
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('convertAndRound')
+            ->method('convert')
             ->willReturnArgument(0);
 
         $result = $this->regularPrice->getAmount();
@@ -123,7 +123,7 @@ public function testGetMaximalPrice()
             ->willReturn($expectedResult);
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('convertAndRound')
+            ->method('convert')
             ->willReturnArgument(0);
 
         $result = $this->regularPrice->getMaximalPrice();
@@ -165,7 +165,7 @@ public function testGetMaximalPriceForFixedPriceBundleWithOption()
             ->willReturn($expectedPrice);
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('convertAndRound')
+            ->method('convert')
             ->willReturnArgument(0);
 
         $result = $this->regularPrice->getMaximalPrice();
@@ -185,7 +185,7 @@ public function testGetMinimalPrice()
             ->willReturn($expectedResult);
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('convertAndRound')
+            ->method('convert')
             ->willReturnArgument(0);
 
         $this->bundleCalculatorMock->expects($this->once())
@@ -226,7 +226,7 @@ public function testGetMinimalPriceForFixedPricedBundleWithOptions()
             ->willReturn($minOptionPrice);
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('convertAndRound')
+            ->method('convert')
             ->willReturnArgument(0);
 
         $this->bundleCalculatorMock->expects($this->once())

app/code/Magento/Catalog/Pricing/Price/RegularPrice.php

@@ -10,14 +10,14 @@
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 
 /**
- * Class RegularPrice
+ * Regular Price model
  */
 class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
 {
     /**
      * Price type
      */
-    const PRICE_CODE = 'regular_price';
+    public const PRICE_CODE = 'regular_price';
 
     /**
      * Get price value
@@ -28,7 +28,7 @@ public function getValue()
     {
         if ($this->value === null) {
             $price = $this->product->getPrice();
-            $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
+            $priceInCurrentCurrency = $this->priceCurrency->convert($price);
             $this->value = $priceInCurrentCurrency ? (float)$priceInCurrentCurrency : 0;
         }
         return $this->value;

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

@@ -36,7 +36,7 @@
         <element name="asLowAsLabel" type="input" selector="//strong[@id='block-related-heading']/following::span[@class='price-label'][1]"/>
         <element name="asLowAsLabelAgain" type="input" selector="//strong[@id='block-related-heading']/following::span[@class='price-label'][2]"/>
         <element name="specialPriceValue" type="text" selector="//span[@class='special-price']//span[@class='price']"/>
-        <element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]"/>
+        <element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]//span"/>
         <element name="clickForPriceLink" type="text" selector="//div[@class='price-box price-final_price']//a[contains(text(), 'Click for price')]"/>
         <element name="addReviewLink" type="text" selector="//div[@class='reviews-actions']//a[@class='action add']"/>
         <element name="fptPrice" type="text" selector=".//*[@class='weee']/span"/>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAssertsCustomerBehaviourForProductTest.xml

@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontAssertsCustomerBehaviourForProductTest">
+    <test name="StorefrontAssertsCustomerBehaviourForProductTest"  deprecated="Use StorefrontSearchToolbarTest instead">
         <annotations>
             <features value="Catalog"/>
             <stories value="Product Sorting for guest/customer in storefront"/>
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="AC-8905"/>
             <group value="catalog"/>
+            <skip>
+                <issueId value="DEPRECATED">Use StorefrontSearchToolbarTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <!-- Precondition Step.1: Magento should be installed.with Sample Data -->

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckCustomOptionPriceDifferentCurrencyTest.xml

@@ -61,7 +61,7 @@
             <argument name="currency" value="EUR"/>
         </actionGroup>
         <actionGroup ref="AssertStorefrontCustomOptionCheckboxByPriceActionGroup" stepKey="checkPriceProductOptionEUR">
-            <argument name="price" value="8.7"/>
+            <argument name="price" value="8.69"/>
         </actionGroup>
     </test>
 </tests>

app/code/Magento/Catalog/Test/Unit/Pricing/Price/RegularPriceTest.php

@@ -80,7 +80,7 @@ public function testGetValue($price)
             ->method('getPrice')
             ->willReturn($price);
         $this->priceCurrencyMock->expects($this->any())
-            ->method('convertAndRound')
+            ->method('convert')
             ->with($price)
             ->willReturn($convertedPrice);
         $this->assertEquals($convertedPrice, $this->regularPrice->getValue());
@@ -114,7 +114,7 @@ public function testGetAmount()
             ->method('getPrice')
             ->willReturn($priceValue);
         $this->priceCurrencyMock->expects($this->any())
-            ->method('convertAndRound')
+            ->method('convert')
             ->with($priceValue)
             ->willReturn($convertedPrice);
         $this->calculatorMock->expects($this->once())

app/code/Magento/CatalogSearch/Controller/Result/Index.php

@@ -13,6 +13,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\PopularSearchTerms;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
 
 /**
  * Search result.
@@ -22,10 +24,10 @@ class Index extends \Magento\Framework\App\Action\Action implements HttpGetActio
     /**
      * No results default handle.
      */
-    const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_result_index_noresults';
+    public const DEFAULT_NO_RESULT_HANDLE = 'catalogsearch_result_index_noresults';
 
     /**
-     * Catalog session
+     * Catalog session for storing catalog-related data
      *
      * @var Session
      */
@@ -48,25 +50,34 @@ class Index extends \Magento\Framework\App\Action\Action implements HttpGetActio
      */
     private $layerResolver;
 
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
     /**
      * @param Context $context
      * @param Session $catalogSession
      * @param StoreManagerInterface $storeManager
      * @param QueryFactory $queryFactory
      * @param Resolver $layerResolver
+     * @param ToolbarMemorizer|null $toolbarMemorizer
      */
     public function __construct(
         Context $context,
         Session $catalogSession,
         StoreManagerInterface $storeManager,
         QueryFactory $queryFactory,
-        Resolver $layerResolver
+        Resolver $layerResolver,
+        ?ToolbarMemorizer $toolbarMemorizer = null
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
         $this->_catalogSession = $catalogSession;
         $this->_queryFactory = $queryFactory;
         $this->layerResolver = $layerResolver;
+        $this->toolbarMemorizer = $toolbarMemorizer ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ToolbarMemorizer::class);
     }
 
     /**
@@ -101,6 +112,11 @@ public function execute()
                 $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
             }
 
+            if ($this->shouldRedirectOnToolbarAction()) {
+                $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+                return;
+            }
+
             if (empty($getAdditionalRequestParameters) &&
                 $this->_objectManager->get(PopularSearchTerms::class)->isCacheable($queryText, $storeId)
             ) {
@@ -166,4 +182,21 @@ private function getNotCacheableResult($catalogSearchHelper, $query, $handles)
         $this->getResponse()->setNoCacheHeaders();
         $this->_view->renderLayout();
     }
+
+    /**
+     * Checks for toolbar actions
+     *
+     * @return bool
+     */
+    private function shouldRedirectOnToolbarAction(): bool
+    {
+        $params = $this->getRequest()->getParams();
+
+        return $this->toolbarMemorizer->isMemorizingAllowed() && empty(array_intersect([
+                Toolbar::ORDER_PARAM_NAME,
+                Toolbar::DIRECTION_PARAM_NAME,
+                Toolbar::MODE_PARAM_NAME,
+                Toolbar::LIMIT_PARAM_NAME
+            ], array_keys($params))) === false;
+    }
 }

app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontSearchSetDefaultDisplaySettingsActionGroup.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontSearchSetDefaultDisplaySettingsActionGroup">
+        <annotations>
+            <description>Sets search display to default settings: grid mode, relevance descending, 12 items per page. Fails if not on search results page.</description>
+        </annotations>
+
+        <!-- Check if we're on the search results page -->
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="verifyOnSearchPage"/>
+
+        <!-- Set display mode to grid (default) -->
+        <click selector="{{StorefrontSearchTopToolbarSection.gridMode}}" stepKey="selectGridMode"/>
+        <waitForPageLoad stepKey="waitForGridModeApplied"/>
+
+        <!-- Set sort field to relevance (default for search) -->
+        <selectOption selector="{{StorefrontSearchTopToolbarSection.sortByDropdown}}" userInput="relevance" stepKey="selectSortByRelevance"/>
+        <waitForPageLoad stepKey="waitForRelevanceSortingApplied"/>
+
+        <!-- If currently ascending, click to change to descending -->
+        <conditionalClick
+            selector="{{StorefrontSearchTopToolbarSection.sortDirectionAsc}}"
+            dependentSelector="{{StorefrontSearchTopToolbarSection.sortDirectionAsc}}"
+            visible="true"
+            stepKey="clickAscendingIfVisible"/>
+
+        <!-- Set items per page to 12 (default) -->
+        <selectOption selector="{{StorefrontSearchTopToolbarSection.showDropdown}}" userInput="12" stepKey="selectItemsPerPage12"/>
+        <waitForPageLoad stepKey="waitForSettingsApplied"/>
+
+        <!-- Verify all default settings are properly applied -->
+        <seeElement selector="{{StorefrontSearchTopToolbarSection.gridMode}}" stepKey="verifyGridModeSelected"/>
+        <seeOptionIsSelected selector="{{StorefrontSearchTopToolbarSection.sortByDropdown}}" userInput="relevance" stepKey="verifyRelevanceSortSelected"/>
+        <seeElement selector="{{StorefrontSearchTopToolbarSection.sortDirectionDesc}}" stepKey="verifyDescendingSortDirection"/>
+        <seeOptionIsSelected selector="{{StorefrontSearchTopToolbarSection.showDropdown}}" userInput="12" stepKey="verify12ItemsPerPageSelected"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontSearchTopToolbarSection.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontSearchTopToolbarSection">
+        <element name="searchResultsToolbar" type="block" selector=".toolbar.toolbar-products" timeout="30"/>
+        <element name="gridMode" type="button" selector=".toolbar.toolbar-products .modes .mode-grid" timeout="30"/>
+        <element name="listMode" type="button" selector=".toolbar.toolbar-products .modes .mode-list" timeout="30"/>
+        <element name="sortByDropdown" type="select" selector=".toolbar.toolbar-products .sorter #sorter" timeout="30"/>
+        <element name="sortDirectionAsc" type="button" selector=".toolbar.toolbar-products .sorter a.sort-asc" timeout="30"/>
+        <element name="sortDirectionDesc" type="button" selector=".toolbar.toolbar-products .sorter a.sort-desc" timeout="30"/>
+        <element name="showDropdown" type="select" selector=".toolbar.toolbar-products .limiter #limiter" timeout="30"/>
+    </section>
+</sections>