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 0e60d0879fe3 · 2025-11-04T17:45:40.000+05:30
This reverts commit 4ebc92f.
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/MergeTest.php
@@ -30,14 +30,25 @@ public function testLoadEntitySpecificHandleWithEsiBlock()
         /** @var EntitySpecificHandlesList $entitySpecificHandleList */
         $entitySpecificHandleList = $objectManager->get(EntitySpecificHandlesList::class);
 
-        // Register test handle as entity-specific
-        $testHandle = 'default';
+        // Register test layout with ttl attribute
+        $testHandle = 'test_entity_specific_handle';
+
+        // Add this handle to entity-specific list to trigger validation
         $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"/>';
+        // 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;
+
+        $layoutMerge->addUpdate($layoutXml);
 
-        // This should throw exception because the handle is entity-specific and contains ttl
-        $layoutMerge->validateUpdate($testHandle, $layoutXml);
+        // This should throw exception when loading because test_entity_specific_handle 
+        // is marked as entity-specific and contains a block with ttl
+        $layoutMerge->load([$testHandle]);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/_files/test_layout_with_ttl.xml b/dev/tests/integration/testsuite/Magento/PageCache/_files/test_layout_with_ttl.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+<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>
