Merge remote-tracking branch 'origin/MAGETWO-51072' into develop

Author: Yaroslav Onischenko

app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Swatches\Plugin\Catalog;
+
+class CacheInvalidate
+{
+    /**
+     * @var \Magento\Framework\App\Cache\TypeListInterface
+     */
+    private $typeList;
+
+    /**
+     * @var \Magento\Swatches\Helper\Data
+     */
+    private $swatchHelper;
+
+    /**
+     * @param \Magento\Framework\App\Cache\TypeListInterface $typeList
+     * @param \Magento\Swatches\Helper\Data $swatchHelper
+     */
+    public function __construct(
+        \Magento\Framework\App\Cache\TypeListInterface $typeList,
+        \Magento\Swatches\Helper\Data $swatchHelper
+    ) {
+        $this->typeList = $typeList;
+        $this->swatchHelper = $swatchHelper;
+    }
+
+    /**
+     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $subject
+     * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $result
+     * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute
+     */
+    public function afterSave(
+        \Magento\Catalog\Model\ResourceModel\Eav\Attribute $subject,
+        \Magento\Catalog\Model\ResourceModel\Eav\Attribute $result
+    ) {
+        if ($this->swatchHelper->isSwatchAttribute($subject)) {
+            $this->typeList->invalidate('block_html');
+            $this->typeList->invalidate('collections');
+            $this->typeList->invalidate('full_page');
+        }
+        return $result;
+    }
+}

app/code/Magento/Swatches/Test/Unit/Plugin/Catalog/CacheInvalidateTest.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Swatches\Test\Unit\Plugin\Catalog;
+
+class CacheInvalidateTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\App\Cache\TypeListInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $typeList;
+
+    /**
+     * @var \Magento\Swatches\Helper\Data | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $swatchHelper;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attribute;
+
+    /**
+     * @var \Magento\Swatches\Plugin\Catalog\CacheInvalidate
+     */
+    private $cacheInvalidate;
+
+    protected function setUp()
+    {
+        $this->typeList = $this->getMock(
+            '\Magento\Framework\App\Cache\TypeListInterface',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->swatchHelper = $this->getMock(
+            '\Magento\Swatches\Helper\Data',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->attribute = $this->getMock(
+            '\Magento\Catalog\Model\ResourceModel\Eav\Attribute',
+            [],
+            [],
+            '',
+            false
+        );
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->cacheInvalidate = $objectManager->getObject(
+            'Magento\Swatches\Plugin\Catalog\CacheInvalidate',
+            [
+                'typeList' => $this->typeList,
+                'swatchHelper' => $this->swatchHelper
+            ]
+        );
+    }
+
+    public function testAfterSaveSwatch()
+    {
+        $this->swatchHelper->expects($this->atLeastOnce())->method('isSwatchAttribute')->with($this->attribute)
+            ->willReturn(true);
+        $this->typeList->expects($this->at(0))->method('invalidate')->with('block_html');
+        $this->typeList->expects($this->at(1))->method('invalidate')->with('collections');
+        $this->typeList->expects($this->at(2))->method('invalidate')->with('full_page');
+        $this->assertSame($this->attribute, $this->cacheInvalidate->afterSave($this->attribute, $this->attribute));
+    }
+
+    public function testAfterSaveNotSwatch()
+    {
+        $this->swatchHelper->expects($this->atLeastOnce())->method('isSwatchAttribute')->with($this->attribute)
+            ->willReturn(false);
+        $this->typeList->expects($this->never())->method('invalidate');
+        $this->assertSame($this->attribute, $this->cacheInvalidate->afterSave($this->attribute, $this->attribute));
+    }
+}

app/code/Magento/Swatches/etc/adminhtml/di.xml

@@ -24,4 +24,7 @@
             <argument name="attributesList" xsi:type="object">Magento\Swatches\Model\AttributesList</argument>
         </arguments>
     </type>
+    <type name="\Magento\Catalog\Model\ResourceModel\Eav\Attribute">
+        <plugin name="invalidate_caches_after_attribute_save" type="Magento\Swatches\Plugin\Catalog\CacheInvalidate" />
+    </type>
 </config>