Revert "AC-15674: Varnish 7.3 (latest version)- Sub Categories links / options of Default category are not getting displayed on Store front Home page"

sumesh-GL · sumesh-GL · commit 58ad41d57dcc · 2025-11-04T17:45:57.000+05:30
This reverts commit ec78c37.
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/MergeTest.php b/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();
 
@@ -30,25 +30,19 @@ public function testLoadEntitySpecificHandleWithEsiBlock()
         /** @var EntitySpecificHandlesList $entitySpecificHandleList */
         $entitySpecificHandleList = $objectManager->get(EntitySpecificHandlesList::class);
 
-        // Register test layout with ttl attribute
-        $testHandle = 'test_entity_specific_handle';
+        // Register test layout file with ttl attribute
+        $testHandle = 'test_layout_with_ttl';
 
         // Add this handle to entity-specific list to trigger validation
         $entitySpecificHandleList->addHandle($testHandle);
 
-        // Layout XML with ttl attribute (without XML declaration to avoid parsing issues)
-        $layoutXml = <<<XML
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <body>
-        <block class="Magento\Framework\View\Element\Template" name="test.block.with.ttl" template="Magento_Theme::html/notices.phtml" ttl="3600"/>
-    </body>
-</page>
-XML;
-
+        // Manually add the layout XML from test fixture
+        $layoutXml = file_get_contents(__DIR__ . '/../../_files/test_layout_with_ttl.xml');
         $layoutMerge->addUpdate($layoutXml);
 
-        // This should throw exception when loading because test_entity_specific_handle 
-        // is marked as entity-specific and contains a block with ttl
+        // This throws exception when loading
+        // because test_layout_with_ttl is marked as entity-specific
+        // and contains a block with ttl
         $layoutMerge->load([$testHandle]);
     }
 }
