MC-30255: In Stock Alert Email Shows Incorrect Item Pricing

- fixed
- modified tests
- remove redundant ImageProvider

Author: Oleksandr Dubovyk

app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php

@@ -6,8 +6,6 @@
 namespace Magento\ProductAlert\Block\Email;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\ProductAlert\Block\Product\ImageProvider;
 
 /**
  * Product Alert Abstract Email Block
@@ -43,32 +41,23 @@ abstract class AbstractEmail extends \Magento\Framework\View\Element\Template
      */
     protected $imageBuilder;
 
-    /**
-     * @var ImageProvider
-     */
-    private $imageProvider;
-
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Filter\Input\MaliciousCode $maliciousCode
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Catalog\Block\Product\ImageBuilder $imageBuilder
      * @param array $data
-     * @param ImageProvider $imageProvider
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Filter\Input\MaliciousCode $maliciousCode,
         PriceCurrencyInterface $priceCurrency,
         \Magento\Catalog\Block\Product\ImageBuilder $imageBuilder,
-        array $data = [],
-        ImageProvider $imageProvider = null
+        array $data = []
     ) {
         $this->imageBuilder = $imageBuilder;
         $this->priceCurrency = $priceCurrency;
         $this->_maliciousCode = $maliciousCode;
-        $this->imageProvider = $imageProvider ?: ObjectManager::getInstance()->get(ImageProvider::class);
-
         parent::__construct($context, $data);
     }
 
@@ -227,6 +216,6 @@ public function getProductPriceHtml(
      */
     public function getImage($product, $imageId, $attributes = [])
     {
-        return $this->imageProvider->getImage($product, $imageId, $attributes);
+        return $this->imageBuilder->create($product, $imageId, $attributes);
     }
 }

app/code/Magento/ProductAlert/Block/Product/ImageProvider.php

@@ -242,6 +242,7 @@ protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
                     );
 
                     $product->setCustomerGroupId($customer->getGroupId());
+                    $this->_storeManager->getStore()->setWebsiteId($website->getId());
                     if ($alert->getPrice() > $product->getFinalPrice()) {
                         $productPrice = $product->getFinalPrice();
                         $product->setFinalPrice($this->_catalogData->getTaxPrice($product, $productPrice));

app/code/Magento/ProductAlert/Model/Observer.php

@@ -25,11 +25,6 @@ class StockTest extends \PHPUnit\Framework\TestCase
      */
     protected $imageBuilder;
 
-    /**
-     * @var \Magento\ProductAlert\Block\Product\ImageProvider|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $imageProviderMock;
-
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -39,16 +34,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->imageProviderMock = $this->getMockBuilder(\Magento\ProductAlert\Block\Product\ImageProvider::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->_block = $objectManager->getObject(
             \Magento\ProductAlert\Block\Email\Stock::class,
             [
                 'maliciousCode' => $this->_filter,
-                'imageBuilder' => $this->imageBuilder,
-                'imageProvider' => $this->imageProviderMock
+                'imageBuilder' => $this->imageBuilder
             ]
         );
     }
@@ -88,8 +78,7 @@ public function testGetImage()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->imageProviderMock->expects($this->atLeastOnce())->method('getImage')->willReturn($productImageMock);
-
+        $this->imageBuilder->expects($this->atLeastOnce())->method('create')->willReturn($productImageMock);
         $this->assertInstanceOf(
             \Magento\Catalog\Block\Product\Image::class,
             $this->_block->getImage($productMock, $imageId, $attributes)

app/code/Magento/ProductAlert/Test/Unit/Block/Email/StockTest.php

@@ -11,6 +11,9 @@
 
 /**
  * Class ObserverTest
+ *
+ * Is used to test Product Alert Observer
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
@@ -168,7 +171,7 @@ protected function setUp()
         );
         $this->storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getDefaultStore', 'getId'])
+            ->setMethods(['getDefaultStore', 'getId', 'setWebsiteId'])
             ->getMock();
         $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
             ->getMock();
@@ -285,12 +288,13 @@ public function testProcessPriceEmailThrowsException()
         $this->storeMock->expects($this->any())->method('getDefaultStore')->willReturnSelf();
         $this->websiteMock->expects($this->once())->method('getDefaultStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->any())->method('getId')->willReturn(2);
+        $this->storeMock->expects($this->any())->method('setWebsiteId')->willReturnSelf();
 
         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(true);
 
         $this->priceColFactoryMock->expects($this->once())->method('create')->willReturnSelf();
         $this->priceColFactoryMock->expects($this->once())->method('addWebsiteFilter')->willReturnSelf();
-
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($this->storeMock);
         $items = [
             new \Magento\Framework\DataObject([
                 'customer_id' => $id