Merge branch '2.4-develop' into patch-3

Author: engcom-Dash

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/ActionGroup/StorefrontAssertProductInRecentlyOrderedWidgetActionGroup.xml

@@ -17,6 +17,6 @@
         </arguments>
 
         <waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" stepKey="waitWidgetRecentlyOrderedProductsGrid"/>
-        <see selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
+        <waitForText selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
     </actionGroup>
 </actionGroups>

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

@@ -18,6 +18,6 @@
         </arguments>
 
         <waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" stepKey="waitWidgetRecentlyViewedProductsGrid"/>
-        <see selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
+        <waitForText selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
     </actionGroup>
 </actionGroups>

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

@@ -31,7 +31,7 @@
         <element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
         <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocart')]" parameterized="true"/>
         <!--<element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>-->
-        <element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
+        <element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//*[(name()='a' or name()='button') and contains(@class, 'tocompare')]" parameterized="true"/>
         <element name="ProductImageByNameAndSrc" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[contains(@src, '{{src}}')]" parameterized="true"/>
         <element name="ProductStockUnavailable" type="text" selector="//*[text()='Out of stock']"/>
         <element name="listedProductOnProductPage" type="block" selector="//div[contains(@aria-labelledBy,'{{attribute_code}}')]//div[@aria-label='{{attribute_name}}']" parameterized="true"/>

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/Block/Widget/LinkTest.php

@@ -195,10 +195,17 @@ public function testStoreCodeShouldBeIncludedInURLOnlyIfItIsConfiguredSo(
                 [
                     [Store::XML_PATH_USE_REWRITES, ReinitableConfigInterface::SCOPE_TYPE_DEFAULT, null, true],
                     [Store::XML_PATH_UNSECURE_BASE_LINK_URL, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, ''],
+                ]
+            );
+        $config->expects($this->any())
+            ->method('isSetFlag')
+            ->willReturnMap(
+                [
                     [
                         Store::XML_PATH_STORE_IN_URL,
                         ReinitableConfigInterface::SCOPE_TYPE_DEFAULT,
-                        null, $includeStoreCode
+                        null,
+                        $includeStoreCode
                     ]
                 ]
             );

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())