.../layout_builder/tests/src/Functional/LayoutSectionTest.php | 11 ++++++----- core/profiles/standard/tests/src/Functional/StandardTest.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php b/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php index d5e0c75..7f9ce7c 100644 --- a/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php +++ b/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php @@ -79,7 +79,7 @@ public function providerTestLayoutSectionFormatter() { ], 'user', 'user:2', - 'UNCACHEABLE', + 'UNCACHEABLE (poor cacheability)', ]; $data['block_with_entity_context'] = [ [ @@ -173,7 +173,7 @@ public function testLayoutSectionFormatter($layout_data, $expected_selector, $ex $this->assertLayoutSection($expected_selector, $expected_content, $expected_cache_contexts, $expected_cache_tags, $expected_dynamic_cache); $this->drupalGet($canonical_url->toString() . '/layout'); - $this->assertLayoutSection($expected_selector, $expected_content, $expected_cache_contexts, $expected_cache_tags, 'UNCACHEABLE'); + $this->assertLayoutSection($expected_selector, $expected_content, $expected_cache_contexts, $expected_cache_tags, 'UNCACHEABLE (poor cacheability)'); } /** @@ -194,14 +194,14 @@ public function testLayoutSectionFormatterAccess() { $this->container->get('state')->set('test_block_access', FALSE); $this->drupalGet($node->toUrl('canonical')); - $this->assertLayoutSection('.layout--onecol', NULL, '', '', 'UNCACHEABLE'); + $this->assertLayoutSection('.layout--onecol', NULL, '', '', 'UNCACHEABLE (poor cacheability)'); // Ensure the block was not rendered. $this->assertSession()->pageTextNotContains('Hello test world'); // Grant access to the block, and ensure it was rendered. $this->container->get('state')->set('test_block_access', TRUE); $this->drupalGet($node->toUrl('canonical')); - $this->assertLayoutSection('.layout--onecol', 'Hello test world', '', '', 'UNCACHEABLE'); + $this->assertLayoutSection('.layout--onecol', 'Hello test world', '', '', 'UNCACHEABLE (poor cacheability)'); } /** @@ -331,7 +331,8 @@ public function testLayoutDeletingBundle() { * @param string $expected_cache_tags * A string of cache tags to be found in the header. * @param string $expected_dynamic_cache - * The expected dynamic cache header. Either 'HIT', 'MISS' or 'UNCACHEABLE'. + * The expected dynamic cache header. Either 'HIT', 'MISS' or + * 'UNCACHEABLE (poor cacheability)'. */ protected function assertLayoutSection($expected_selector, $expected_content, $expected_cache_contexts = '', $expected_cache_tags = '', $expected_dynamic_cache = 'MISS') { $assert_session = $this->assertSession(); diff --git a/core/profiles/standard/tests/src/Functional/StandardTest.php b/core/profiles/standard/tests/src/Functional/StandardTest.php index f449c10..a2c9329 100644 --- a/core/profiles/standard/tests/src/Functional/StandardTest.php +++ b/core/profiles/standard/tests/src/Functional/StandardTest.php @@ -181,7 +181,7 @@ public function testStandard() { $this->drupalLogin($this->adminUser); $url = Url::fromRoute('contact.site_page'); $this->drupalGet($url); - $this->assertEqual('UNCACHEABLE', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER), 'Site-wide contact page cannot be cached by Dynamic Page Cache.'); + $this->assertEqual('UNCACHEABLE (poor cacheability)', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER), 'Site-wide contact page cannot be cached by Dynamic Page Cache.'); $url = Url::fromRoute(''); $this->drupalGet($url);