Merge remote-tracking branch 'origin/MAGETWO-97302' into 2.2-develop-pr17

Author: serhii-balko

app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php

@@ -5,25 +5,24 @@
  */
 namespace Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer;
 
-use Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as TypeConfigurable;
 
 /**
  * A plugin for a salable resolver.
  */
 class SalableResolver
 {
     /**
-     * @var LowestPriceOptionsProviderInterface
+     * @var TypeConfigurable
      */
-    private $lowestPriceOptionsProvider;
+    private $typeConfigurable;
 
     /**
-     * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+     * @param TypeConfigurable $typeConfigurable
      */
-    public function __construct(
-        LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
-    ) {
-        $this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider;
+    public function __construct(TypeConfigurable $typeConfigurable)
+    {
+        $this->typeConfigurable = $typeConfigurable;
     }
 
     /**
@@ -33,18 +32,16 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject
      * @param bool $result
      * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
-     *
      * @return bool
-     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterIsSalable(
         \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject,
         $result,
         \Magento\Framework\Pricing\SaleableInterface $salableItem
     ) {
-        if ($salableItem->getTypeId() == 'configurable' && $result) {
-            $result = $salableItem->isSalable();
+        if ($salableItem->getTypeId() === TypeConfigurable::TYPE_CODE && $result) {
+            $result = $this->typeConfigurable->isSalable($salableItem);
         }
 
         return $result;

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\Catalog\Model\Product\Pricing\Renderer;
+
+use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as TypeConfigurable;
+use Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer\SalableResolver as SalableResolverPlugin;
+use Magento\Framework\Pricing\SaleableInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class SalableResolverTest
+ */
+class SalableResolverTest extends TestCase
+{
+    /**
+     * @var TypeConfigurable|MockObject
+     */
+    private $typeConfigurable;
+
+    /**
+     * @var SalableResolverPlugin
+     */
+    private $salableResolver;
+
+    protected function setUp()
+    {
+        $this->typeConfigurable = $this->createMock(TypeConfigurable::class);
+        $this->salableResolver = new SalableResolverPlugin($this->typeConfigurable);
+    }
+
+    /**
+     * @param SaleableInterface|MockObject $salableItem
+     * @param bool $isSalable
+     * @param bool $typeIsSalable
+     * @param bool $expectedResult
+     * @return void
+     * @dataProvider afterIsSalableDataProvider
+     */
+    public function testAfterIsSalable($salableItem, bool $isSalable, bool $typeIsSalable, bool $expectedResult)
+    {
+        $salableResolver = $this->createMock(SalableResolver::class);
+
+        $this->typeConfigurable->method('isSalable')
+            ->willReturn($typeIsSalable);
+
+        $result = $this->salableResolver->afterIsSalable($salableResolver, $isSalable, $salableItem);
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * Data provider for testAfterIsSalable
+     *
+     * @return array
+     */
+    public function afterIsSalableDataProvider(): array
+    {
+        $simpleSalableItem = $this->createMock(SaleableInterface::class);
+        $simpleSalableItem->method('getTypeId')
+            ->willReturn('simple');
+
+        $configurableSalableItem = $this->createMock(SaleableInterface::class);
+        $configurableSalableItem->method('getTypeId')
+            ->willReturn('configurable');
+
+        return [
+            [
+                $simpleSalableItem,
+                true,
+                false,
+                true,
+            ],
+            [
+                $configurableSalableItem,
+                true,
+                false,
+                false,
+            ],
+        ];
+    }
+}