MAGETWO-58265: [Github][Cloud][Customer]Fix Varnish X-Header

- Stabilization fixes

Author: Andrey Konosov

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\App\Test\Unit\Model\Product\Cache\Tag;
+namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Cache\Tag;
 
 use \Magento\ConfigurableProduct\Model\Product\Cache\Tag\Configurable;
 

app/code/Magento/PageCache/Observer/FlushCacheByTags.php

@@ -30,6 +30,13 @@ class FlushCacheByTags implements ObserverInterface
      */
     private $fullPageCache;
 
+    /**
+     * Invalidation tags resolver
+     *
+     * @var \Magento\Framework\App\Cache\Tag\Resolver
+     */
+    private $tagResolver;
+
     /**
      * @param \Magento\PageCache\Model\Config $config
      * @param \Magento\Framework\App\PageCache\Cache $cache
@@ -49,12 +56,11 @@ public function __construct(\Magento\PageCache\Model\Config $config, \Magento\Fr
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        $object = $observer->getEvent()->getObject();
-        if (!is_object($object)) {
-            return;
-        }
-
         if ($this->_config->getType() == \Magento\PageCache\Model\Config::BUILT_IN && $this->_config->isEnabled()) {
+            $object = $observer->getEvent()->getObject();
+            if (!is_object($object)) {
+                return;
+            }
             $tags = $this->getTagResolver()->getTags($object);
 
             if (!empty($tags)) {
@@ -83,6 +89,10 @@ private function getCache()
      */
     private function getTagResolver()
     {
-        return ObjectManager::getInstance()->get(\Magento\Framework\App\Cache\Tag\Resolver::class);
+        if ($this->tagResolver === null) {
+            $this->tagResolver = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\App\Cache\Tag\Resolver::class);
+        }
+        return $this->tagResolver;
     }
 }

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

@@ -23,11 +23,15 @@ class FlushCacheByTagsTest extends \PHPUnit_Framework_TestCase
     /** @var  \PHPUnit_Framework_MockObject_MockObject|\Magento\PageCache\Model\Cache\Type */
     private $fullPageCacheMock;
 
+    /** @var  \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Cache\Tag\Resolver */
+    private $tagResolver;
+
     /**
      * Set up all mocks and data for test
      */
     protected function setUp()
     {
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_configMock = $this->getMock(
             \Magento\PageCache\Model\Config::class,
             ['getType', 'isEnabled'],
@@ -42,6 +46,11 @@ protected function setUp()
             $this->_configMock,
             $this->_cacheMock
         );
+
+        $this->tagResolver = $this->getMock(\Magento\Framework\App\Cache\Tag\Resolver::class, [], [], '', false);
+
+
+        $helper->setBackwardCompatibleProperty($this->_model, 'tagResolver', $this->tagResolver);
         $reflection = new \ReflectionClass(\Magento\PageCache\Observer\FlushCacheByTags::class);
         $reflectionProperty = $reflection->getProperty('fullPageCache');
         $reflectionProperty->setAccessible(true);
@@ -70,7 +79,7 @@ public function testExecute($cacheState)
             $this->_configMock->expects($this->once())
                 ->method('getType')
                 ->willReturn(\Magento\PageCache\Model\Config::BUILT_IN);
-            $observedObject->expects($this->once())->method('getIdentities')->will($this->returnValue($tags));
+            $this->tagResolver->expects($this->once())->method('getTags')->will($this->returnValue($tags));
 
             $this->fullPageCacheMock->expects($this->once())
                 ->method('clean')
@@ -106,7 +115,7 @@ public function testExecuteWithEmptyTags()
         )->will(
             $this->returnValue(\Magento\PageCache\Model\Config::BUILT_IN)
         );
-        $observedObject->expects($this->once())->method('getIdentities')->will($this->returnValue($tags));
+        $this->tagResolver->expects($this->once())->method('getTags')->will($this->returnValue($tags));
 
         $this->fullPageCacheMock->expects($this->never())->method('clean');