MAGETWO-50551: When saving product or category cache cleared by general tag

- Fix unit test.

Author: Hayder Sharhan

app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php

@@ -55,7 +55,7 @@ protected function setUp()
     public function testInvalidateVarnish()
     {
         $tags = ['cache_1', 'cache_group'];
-        $pattern = '((^|,)cache(,|$))|((^|,)cache_1(,|$))|((^|,)cache_group(,|$))';
+        $pattern = '((^|,)cache_1(,|$))|((^|,)cache_group(,|$))';
 
         $this->configMock->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
         $this->configMock->expects(

app/code/Magento/Catalog/Model/Product.php

@@ -2268,7 +2268,7 @@ public function getIdentities()
                 $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
             }
         }
-        if ($this->getAppState()->getAreaCode() === \Magento\Framework\App\Area::AREA_FRONTEND) {
+        if ($this->getAppState()->getAreaCode() == \Magento\Framework\App\Area::AREA_FRONTEND) {
             $identities[] = self::CACHE_TAG;
         }
         return array_unique($identities);

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -166,6 +166,11 @@ class ProductTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     protected $mediaConfig;
 
+    /**
+     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $appStateMock;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -365,6 +370,14 @@ protected function setUp()
             ]
         );
 
+        $this->appStateMock = $this->getMockBuilder(\Magento\Framework\App\State::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $modelReflection = new \ReflectionClass(get_class($this->model));
+        $appStateReflection = $modelReflection->getProperty('appState');
+        $appStateReflection->setAccessible(true);
+        $appStateReflection->setValue($this->model, $this->appStateMock);
     }
 
     public function testGetAttributes()

app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php

@@ -62,7 +62,7 @@ public function testExecute($cacheState)
 
         if ($cacheState) {
             $tags = ['cache_1', 'cache_group'];
-            $expectedTags = ['cache_1', 'cache_group', 'cache'];
+            $expectedTags = ['cache_1', 'cache_group'];
 
             $eventMock = $this->getMock('Magento\Framework\Event', ['getObject'], [], '', false);
             $eventMock->expects($this->once())->method('getObject')->will($this->returnValue($observedObject));