MAGETWO-51072: Changing Swatch attribute's property doesn't affect storefront

Author: Yaroslav Onischenko

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

@@ -5,6 +5,9 @@
  */
 namespace Magento\Swatches\Plugin\Catalog;
 
+use \Magento\Framework\App\Cache\Type\Block;
+use \Magento\Framework\App\Cache\Type\Collection;
+
 class CacheInvalidate
 {
     /**
@@ -39,9 +42,8 @@ public function afterSave(
         \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');
+            $this->typeList->invalidate(Block::TYPE_IDENTIFIER);
+            $this->typeList->invalidate(Collection::TYPE_IDENTIFIER);
         }
         return $result;
     }

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

@@ -67,7 +67,6 @@ public function testAfterSaveSwatch()
             ->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));
     }