ACP2E-1634: fix failing unit tests

Author: alzota

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

@@ -43,8 +43,8 @@ public function __construct(CalculatorInterface $calculator)
     public function getValue(SaleableInterface $saleableItem)
     {
         /** @var TierPrice $price */
-        $price = $saleableItem->getPriceInfo()->getPrice(TierPrice::PRICE_CODE);
-        $tierPriceList = $price->getTierPriceList();
+        $tierPrice = $saleableItem->getPriceInfo()->getPrice(TierPrice::PRICE_CODE);
+        $tierPriceList = $tierPrice->getTierPriceList();
         $finalPrice = $saleableItem->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue();
 
         $minPrice = $finalPrice;

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

@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Test\Unit\Pricing\Price;
 
+use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\Catalog\Pricing\Price\MinimalTierPriceCalculator;
 use Magento\Catalog\Pricing\Price\TierPrice;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
@@ -73,10 +74,10 @@ private function getValueTierPricesExistShouldReturnMinTierPrice()
         $notMinPrice = 10;
 
         $minAmount = $this->getMockForAbstractClass(AmountInterface::class);
-        $minAmount->expects($this->once())->method('getValue')->willReturn($minPrice);
+        $minAmount->expects($this->atLeastOnce())->method('getValue')->willReturn($minPrice);
 
         $notMinAmount = $this->getMockForAbstractClass(AmountInterface::class);
-        $notMinAmount->expects($this->once())->method('getValue')->willReturn($notMinPrice);
+        $notMinAmount->expects($this->atLeastOnce())->method('getValue')->willReturn($notMinPrice);
 
         $tierPriceList = [
             [
@@ -89,10 +90,12 @@ private function getValueTierPricesExistShouldReturnMinTierPrice()
 
         $this->price->expects($this->once())->method('getTierPriceList')->willReturn($tierPriceList);
 
-        $this->priceInfo->expects($this->once())->method('getPrice')->with(TierPrice::PRICE_CODE)
-            ->willReturn($this->price);
+        $this->priceInfo->expects($this->atLeastOnce())
+            ->method('getPrice')
+            ->withConsecutive([TierPrice::PRICE_CODE], [FinalPrice::PRICE_CODE])
+            ->willReturnOnConsecutiveCalls($this->price, $notMinAmount);
 
-        $this->saleable->expects($this->once())->method('getPriceInfo')->willReturn($this->priceInfo);
+        $this->saleable->expects($this->atLeastOnce())->method('getPriceInfo')->willReturn($this->priceInfo);
         return $minPrice;
     }
 
@@ -107,12 +110,8 @@ public function testGetGetAmountMinTierPriceExistShouldReturnAmountObject()
         $minPrice = $this->getValueTierPricesExistShouldReturnMinTierPrice();
 
         $amount = $this->getMockForAbstractClass(AmountInterface::class);
+        $amount->method('getValue')->willReturn($minPrice);
 
-        $this->calculator->expects($this->once())
-            ->method('getAmount')
-            ->with($minPrice, $this->saleable)
-            ->willReturn($amount);
-
-        $this->assertSame($amount, $this->object->getAmount($this->saleable));
+        $this->assertEquals($amount, $this->object->getAmount($this->saleable));
     }
 }

app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

@@ -339,10 +339,10 @@ public function testRenderAmountMinimal(): void
         $arguments = [
             'zone' => 'test_zone',
             'list_category_page' => true,
-            'display_label' => 'As low as',
+            'display_label' => __('As low as'),
             'price_id' => $priceId,
             'include_container' => false,
-            'skip_adjustments' => true
+            'skip_adjustments' => false
         ];
 
         $amountRender = $this->createPartialMock(Amount::class, ['toHtml']);