Merge branch '2.4-develop' into ACQE-functional-deployment-v4-4

Author: Karishmathakare19

app/code/Magento/Theme/view/frontend/layout/default.xml

@@ -73,7 +73,7 @@
                     <arguments>
                         <argument name="title" translate="true" xsi:type="string">Menu</argument>
                     </arguments>
-                    <block class="Magento\Theme\Block\Html\Topmenu" name="catalog.topnav" template="Magento_Theme::html/topmenu.phtml" before="-"/>
+                    <block class="Magento\Theme\Block\Html\Topmenu" name="catalog.topnav" template="Magento_Theme::html/topmenu.phtml" ttl="3600" before="-"/>
                 </block>
                 <block class="Magento\Framework\View\Element\Text" name="store.links" group="navigation-sections">
                     <arguments>

dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/MergeTest.php

@@ -15,7 +15,7 @@ class MergeTest extends \PHPUnit\Framework\TestCase
     public function testLoadEntitySpecificHandleWithEsiBlock()
     {
         $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('must not contain blocks with \'ttl\' attribute specified');
+        $this->expectExceptionMessage('Handle \'default\' must not contain blocks with \'ttl\' attribute specified');
 
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
@@ -29,15 +29,10 @@ public function testLoadEntitySpecificHandleWithEsiBlock()
 
         /** @var EntitySpecificHandlesList $entitySpecificHandleList */
         $entitySpecificHandleList = $objectManager->get(EntitySpecificHandlesList::class);
-
-        // Register test handle as entity-specific
-        $testHandle = 'default';
-        $entitySpecificHandleList->addHandle($testHandle);
-
-        // Simple XML with ttl attribute that should trigger the validation
-        $layoutXml = '<block class="Magento\Framework\View\Element\Template" name="test.block" ttl="3600"/>';
-
-        // This should throw exception because the handle is entity-specific and contains ttl
-        $layoutMerge->validateUpdate($testHandle, $layoutXml);
+        // Add 'default' handle, which has declarations of blocks with ttl, to the list of entity specific handles.
+        // This allows to simulate a situation, when block with ttl attribute
+        // is declared e.g. in 'catalog_product_view_id_1' handle
+        $entitySpecificHandleList->addHandle('default');
+        $layoutMerge->load(['default']);
     }
 }