Fix PageCache: async rendering of blocks can corrupt layout cache #8554 #9050

Adapted page cache tests

Author: adrian-martinez-interactiv4

app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php

@@ -89,9 +89,11 @@ protected function setUp()
     public function testExecute($blockClass, $shouldSetHeaders)
     {
         $block = 'block';
-        $handles = ['handle1', 'handle2'];
+        $requestHandles = ['handle1', 'handle2'];
+        $additionalPageCacheHandle = 'additional_page_cache_handle';
+        $pageCacheHandles = array_merge($requestHandles, [$additionalPageCacheHandle]);
         $html = 'some-html';
-        $mapData = [['blocks', '', json_encode([$block])], ['handles', '', base64_encode(json_encode($handles))]];
+        $mapData = [['blocks', '', json_encode([$block])], ['handles', '', base64_encode(json_encode($requestHandles))]];
 
         $blockInstance1 = $this->getMock(
             $blockClass,
@@ -106,7 +108,7 @@ public function testExecute($blockClass, $shouldSetHeaders)
 
         $this->requestMock->expects($this->any())->method('getParam')->will($this->returnValueMap($mapData));
 
-        $this->viewMock->expects($this->once())->method('loadLayout')->with($this->equalTo($handles));
+        $this->viewMock->expects($this->once())->method('loadLayout')->with($this->equalTo($pageCacheHandles));
 
         $this->viewMock->expects($this->once())->method('getLayout')->will($this->returnValue($this->layoutMock));
 

app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php

@@ -111,7 +111,10 @@ public function testExecuteNoParams()
     public function testExecute()
     {
         $blocks = ['block1', 'block2'];
-        $handles = ['handle1', 'handle2'];
+        $requestHandles = ['handle1', 'handle2'];
+        $additionalPageCacheHandle = 'additional_page_cache_handle';
+        $pageCacheHandles = array_merge($requestHandles, [$additionalPageCacheHandle]);
+
         $originalRequest = '{"route":"route","controller":"controller","action":"action","uri":"uri"}';
         $expectedData = ['block1' => 'data1', 'block2' => 'data2'];
 
@@ -159,8 +162,8 @@ public function testExecute()
         $this->requestMock->expects($this->at(11))
             ->method('getParam')
             ->with($this->equalTo('handles'), $this->equalTo(''))
-            ->will($this->returnValue(base64_encode(json_encode($handles))));
-        $this->viewMock->expects($this->once())->method('loadLayout')->with($this->equalTo($handles));
+            ->will($this->returnValue(base64_encode(json_encode($requestHandles))));
+        $this->viewMock->expects($this->once())->method('loadLayout')->with($this->equalTo($pageCacheHandles));
         $this->viewMock->expects($this->any())->method('getLayout')->will($this->returnValue($this->layoutMock));
         $this->layoutMock->expects($this->at(0))
             ->method('getBlock')