Merge remote-tracking branch 'origin/MAGETWO-48729-varnish-cache-doesnt-purge' into develop

Author: Joan He

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/Product/ProductRuleIndexerTest.php

@@ -55,9 +55,6 @@ public function testDoExecuteList($ids, $idsForIndexer)
         $this->indexBuilder->expects($this->once())
             ->method('reindexByIds')
             ->with($idsForIndexer);
-        $this->cacheContextMock->expects($this->once())
-            ->method('registerTags')
-            ->with([\Magento\Catalog\Model\Category::CACHE_TAG]);
         $this->cacheContextMock->expects($this->once())
             ->method('registerEntities')
             ->with(\Magento\Catalog\Model\Product::CACHE_TAG, $ids);

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/Rule/RuleProductIndexerTest.php

@@ -55,7 +55,8 @@ public function testDoExecuteList()
             ->with(
                 [
                     \Magento\Catalog\Model\Category::CACHE_TAG,
-                    \Magento\Catalog\Model\Product::CACHE_TAG
+                    \Magento\Catalog\Model\Product::CACHE_TAG,
+                    \Magento\Framework\App\Cache\Type\Block::CACHE_TAG
                 ]
             );
         $this->indexer->executeList($ids);

app/code/Magento/Indexer/composer.json

@@ -4,7 +4,6 @@
     "require": {
         "php": "~5.5.22|~5.6.0|~7.0.0",
         "magento/module-backend": "100.0.*",
-        "magento/module-page-cache": "100.0.*",
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",