Merge remote-tracking branch 'chaika/MC-30461' into Chaika-PR23-2020-01-22

Author: Oleksandr Dubovyk

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

@@ -5,11 +5,8 @@
  */
 namespace Magento\ProductAlert\Block\Product;
 
-use Magento\Store\Model\App\Emulation;
 use Magento\Catalog\Block\Product\ImageBuilder;
 use Magento\Catalog\Model\Product;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Area;
 use Magento\Catalog\Block\Product\Image;
 
 /**
@@ -22,32 +19,18 @@ class ImageProvider
      */
     private $imageBuilder;
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var Emulation
-     */
-    private $appEmulation;
-
     /**
      * @param ImageBuilder $imageBuilder
-     * @param StoreManagerInterface $storeManager
-     * @param Emulation $appEmulation
      */
     public function __construct(
-        ImageBuilder $imageBuilder,
-        StoreManagerInterface $storeManager,
-        Emulation $appEmulation
+        ImageBuilder $imageBuilder
     ) {
         $this->imageBuilder = $imageBuilder;
-        $this->storeManager = $storeManager;
-        $this->appEmulation = $appEmulation;
     }
 
     /**
+     * Gets Product Image Block
+     *
      * @param Product $product
      * @param string $imageId
      * @param array $attributes
@@ -56,17 +39,6 @@ public function __construct(
      */
     public function getImage(Product $product, $imageId, $attributes = [])
     {
-        $storeId = $this->storeManager->getStore()->getId();
-        $this->appEmulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
-
-        try {
-            $image = $this->imageBuilder->create($product, $imageId, $attributes);
-        } catch (\Exception $exception) {
-            $this->appEmulation->stopEnvironmentEmulation();
-            throw $exception;
-        }
-
-        $this->appEmulation->stopEnvironmentEmulation();
-        return $image;
+        return $this->imageBuilder->create($product, $imageId, $attributes);
     }
 }

app/code/Magento/ProductAlert/Model/Observer.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/Test/Unit/Block/Product/ImageProviderTest.php

@@ -12,16 +12,6 @@ class ImageProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $imageBuilderMock;
 
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $storeManagerMock;
-
-    /**
-     * @var \Magento\Store\Model\App\Emulation|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $emulationMock;
-
     /**
      * @var \Magento\ProductAlert\Block\Product\ImageProvider
      */
@@ -32,17 +22,9 @@ protected function setUp()
         $this->imageBuilderMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\ImageBuilder::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->emulationMock = $this->getMockBuilder(\Magento\Store\Model\App\Emulation::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $this->model = new \Magento\ProductAlert\Block\Product\ImageProvider(
-            $this->imageBuilderMock,
-            $this->storeManagerMock,
-            $this->emulationMock
+            $this->imageBuilderMock
         );
     }
 
@@ -56,44 +38,11 @@ public function testGetImage()
 
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $imageMock = $this->createMock(\Magento\Catalog\Block\Product\Image::class);
-        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
-
-        $this->storeManagerMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeMock);
-        $this->emulationMock->expects($this->once())->method('startEnvironmentEmulation');
         $this->imageBuilderMock->expects($this->once())
             ->method('create')
             ->with($productMock, $imageId, $attributes)
             ->willReturn($imageMock);
-        $this->emulationMock->expects($this->once())->method('stopEnvironmentEmulation');
 
         $this->assertEquals($imageMock, $this->model->getImage($productMock, $imageId, $attributes));
     }
-
-    /**
-     * Test that app emulation stops when exception occurs.
-     *
-     * @expectedException \Exception
-     * @expectedExceptionMessage Image Builder Exception
-     */
-    public function testGetImageThrowsAnException()
-    {
-        $imageId = 1;
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->emulationMock->expects($this->once())->method('startEnvironmentEmulation');
-        $this->storeManagerMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeMock);
-
-        $this->imageBuilderMock->expects($this->once())
-            ->method('create')
-            ->with($productMock, $imageId)
-            ->willThrowException(new \Exception("Image Builder Exception"));
-
-        $this->emulationMock->expects($this->once())->method('stopEnvironmentEmulation');
-        $this->model->getImage($productMock, $imageId);
-    }
 }

app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.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