#8644: Sitemap bad urls: http//, but must bee https//

- merged with develop branch
magento · Mar 2, 2017 · d201703 · d201703
1 parent 653bad2
commit d201703
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/ProcessLayoutRenderElementTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/ProcessLayoutRenderElementTest.php
@@ -139,8 +139,8 @@ public function testExecute(
                     ->will($this->returnValue($blockTtl));
                 $this->_blockMock->expects($this->any())
                     ->method('getUrl')
-                    ->with('page_cache/block/esi', ['blocks' => '[null]', 'handles' => '["default","catalog_product_view"]'])
-                    ->will($this->returnValue('page_cache/block/wrapesi/with/handles/and/other/stuff'));
+                    ->with('page_cache/block/esi', ['blocks' => '[null]', 'handles' => 'WyJkZWZhdWx0IiwiY2F0YWxvZ19wcm9kdWN0X3ZpZXciXQ=='])
+                    ->will($this->returnValue('page_cache/block/wrapesi/with/handles/WyJkZWZhdWx0IiwiY2F0YWxvZ19wcm9kdWN0X3ZpZXciXQ=='));
             }
             if ($scopeIsPrivate) {
                 $this->_blockMock->expects($this->once())
@@ -197,6 +197,10 @@ public function testExecuteWithBase64Encode()
                 ->method('getBlock')
                 ->will($this->returnValue($this->_blockMock));
 
+        $this->entitySpecificHandlesListMock->expects($this->any())
+            ->method('getHandles')
+            ->will($this->returnValue(['catalog_product_view_id_1']));
+
         $this->_blockMock->expects($this->once())
             ->method('getData')
             ->with('ttl')
@@ -229,7 +233,7 @@ public function processLayoutRenderDataProvider()
                 true,
                 false,
                 360,
-                '<esi:include src="page_cache/block/wrapesi/with/handles/and/other/stuff" />',
+                '<esi:include src="page_cache/block/wrapesi/with/handles/WyJkZWZhdWx0IiwiY2F0YWxvZ19wcm9kdWN0X3ZpZXciXQ==" />',
             ],
             'full_page type and Varnish enabled, public scope, ttl is not set' => [
                 true,