.../modules/dblog/tests/src/Functional/DbLogResourceTest.php | 2 +- core/modules/rest/tests/src/Functional/ResourceTestBase.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/modules/dblog/tests/src/Functional/DbLogResourceTest.php b/core/modules/dblog/tests/src/Functional/DbLogResourceTest.php index fc22d49182..348ceff847 100644 --- a/core/modules/dblog/tests/src/Functional/DbLogResourceTest.php +++ b/core/modules/dblog/tests/src/Functional/DbLogResourceTest.php @@ -67,7 +67,7 @@ public function testWatchdog() { $request_options = $this->getAuthenticationRequestOptions('GET'); $response = $this->request('GET', $url, $request_options); - $this->assertResourceErrorResponse(403, "The 'restful get dblog' permission is required.", $response, ['4xx-response', 'http_response'], ['user.permissions'], FALSE, FALSE); + $this->assertResourceErrorResponse(403, "The 'restful get dblog' permission is required.", $response, ['4xx-response', 'http_response'], ['user.permissions'], 'UNCACHEABLE (request policy)', FALSE); // Create a user account that has the required permissions to read // the watchdog resource via the REST API. diff --git a/core/modules/rest/tests/src/Functional/ResourceTestBase.php b/core/modules/rest/tests/src/Functional/ResourceTestBase.php index 06204b3bc0..0d994d0cb7 100644 --- a/core/modules/rest/tests/src/Functional/ResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/ResourceTestBase.php @@ -422,8 +422,16 @@ protected function assertResourceResponse($expected_status_code, $expected_body, $this->assertSame($expected_dynamic_page_cache_header_value, $response->getHeader('X-Drupal-Dynamic-Cache')[0]); } else { - $this->assertTrue($response->hasHeader('X-Drupal-Dynamic-Cache')); - $this->stringStartsWith('UNCACHEABLE (', $response->getHeader('X-Drupal-Dynamic-Cache')[0]); + if ($expected_status_code === 403) { + if ($response->hasHeader('X-Drupal-Dynamic-Cache')) { + $this->assertTrue($response->hasHeader('X-Drupal-Dynamic-Cache')); + $this->stringStartsWith('UNCACHEABLE (', $response->getHeader('X-Drupal-Dynamic-Cache')[0]); + } + } + else { + $this->assertTrue($response->hasHeader('X-Drupal-Dynamic-Cache')); + $this->stringStartsWith('UNCACHEABLE (', $response->getHeader('X-Drupal-Dynamic-Cache')[0]); + } } }