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 4ce994934e42 · 2025-10-06T16:07:03.000+05:30
Fix for integration and static test failure
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 -->
 <page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/MergeTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\PageCache\Model\Layout;
 
@@ -29,10 +29,20 @@ public function testLoadEntitySpecificHandleWithEsiBlock()
 
         /** @var EntitySpecificHandlesList $entitySpecificHandleList */
         $entitySpecificHandleList = $objectManager->get(EntitySpecificHandlesList::class);
-        // 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']);
+
+        // 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);
+
+        // Manually add the layout XML from test fixture
+        $layoutXml = file_get_contents(__DIR__ . '/../../_files/test_layout_with_ttl.xml');
+        $layoutMerge->addUpdate($layoutXml);
+
+        // This throws exception when loading
+        // because test_layout_with_ttl 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>
