Merge remote-tracking branch 'south/MAGETWO-71841' into bugs

Author: irenelagno

app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php

@@ -9,6 +9,7 @@
 
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Customer\Model\Session;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Locale\Format;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -31,6 +32,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
     /**
      * Current customer
      *
+     * @deprecated, as unused property
      * @var CurrentCustomer
      */
     protected $currentCustomer;
@@ -67,6 +69,11 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      */
     private $localeFormat;
 
+    /**
+     * @var Session
+     */
+    private $customerSession;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -78,6 +85,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      * @param ConfigurableAttributeData $configurableAttributeData
      * @param array $data
      * @param Format|null $localeFormat
+     * @param Session|null $customerSession
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -90,7 +98,8 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         ConfigurableAttributeData $configurableAttributeData,
         array $data = [],
-        Format $localeFormat = null
+        Format $localeFormat = null,
+        Session $customerSession = null
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->helper = $helper;
@@ -99,6 +108,7 @@ public function __construct(
         $this->currentCustomer = $currentCustomer;
         $this->configurableAttributeData = $configurableAttributeData;
         $this->localeFormat = $localeFormat ?: ObjectManager::getInstance()->get(Format::class);
+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->get(Session::class);
 
         parent::__construct(
             $context,
@@ -117,6 +127,7 @@ public function getCacheKeyInfo()
     {
         $parentData = parent::getCacheKeyInfo();
         $parentData[] = $this->priceCurrency->getCurrencySymbol();
+        $parentData[] = $this->customerSession->getCustomerGroupId();
         return $parentData;
     }
 

app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Block\Product\View\Type;
 
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\State;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -65,6 +68,11 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $storeManager;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSession;
+
     protected function setUp()
     {
         $this->mockContextObject();
@@ -92,6 +100,28 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $appState = $this->getMockBuilder(State::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getAppState')
+            ->willReturn($appState);
+        $appState->expects($this->any())
+            ->method('getAreaCode')
+            ->willReturn('frontend');
+        $urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getUrlBuilder')
+            ->willReturn($urlBuilder);
+        $fileResolverMock = $this
+            ->getMockBuilder(\Magento\Framework\View\Element\Template\File\Resolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getResolver')
+            ->willReturn($fileResolverMock);
         $this->configurableAttributeData = $this->getMockBuilder(
             \Magento\ConfigurableProduct\Model\ConfigurableAttributeData::class
         )
@@ -102,6 +132,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->customerSession = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->block = new \Magento\ConfigurableProduct\Block\Product\View\Type\Configurable(
             $this->context,
             $this->arrayUtils,
@@ -112,10 +146,92 @@ protected function setUp()
             $this->priceCurrency,
             $this->configurableAttributeData,
             [],
-            $this->localeFormat
+            $this->localeFormat,
+            $this->customerSession
         );
     }
 
+    /**
+     * Provide cache key info
+     *
+     * @return array
+     */
+    public function cacheKeyProvider() : array
+    {
+        return [
+            'without_currency_and_customer_group' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => null,
+                    4 => null,
+                ],
+                null,
+                null,
+            ],
+            'with_customer_group' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => null,
+                    4 => 1,
+                ],
+                null,
+                1,
+            ],
+            'with_price_currency' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => '$',
+                    4 => null,
+                ],
+                '$',
+                null,
+            ]
+        ];
+    }
+
+    /**
+     * Test cache Tags
+     * @dataProvider cacheKeyProvider
+     * @param array $expected
+     * @param string|null $priceCurrency
+     * @param string|null $customerGroupId
+     */
+    public function testGetCacheKeyInfo(array $expected, string $priceCurrency = null, string $customerGroupId = null)
+    {
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->setMethods([
+                'getCurrentCurrency',
+            ])
+            ->getMockForAbstractClass();
+        $storeMock->expects($this->any())
+            ->method('getCode')
+            ->willReturn('default');
+
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($storeMock);
+        $this->priceCurrency->expects($this->once())
+            ->method('getCurrencySymbol')
+            ->willReturn($priceCurrency);
+        $this->customerSession->expects($this->once())
+            ->method('getCustomerGroupId')
+            ->willReturn($customerGroupId);
+        $actual = $this->block->getCacheKeyInfo();
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * Check that getJsonConfig() method returns expected value
      */