.../src/Functional/EntityResource/File/FileHalJsonAnonTest.php | 2 +- .../src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php | 8 ++++++++ .../src/Functional/EntityResource/Media/MediaResourceTestBase.php | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php index 18e91e8..2e605a0 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/File/FileHalJsonAnonTest.php @@ -114,7 +114,7 @@ protected function getExpectedCacheContexts() { /** * @see hal_update_8501() */ - function testGetBcUriField() { + public function testGetBcUriField() { $this->config('hal.settings')->set('bc_file_uri_as_url_normalizer', TRUE)->save(TRUE); $this->initAuthentication(); diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php index 66e1cc0..c9ee773 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Media/MediaHalJsonAnonTest.php @@ -2,6 +2,7 @@ namespace Drupal\Tests\hal\Functional\EntityResource\Media; +use Drupal\Core\Cache\Cache; use Drupal\file\Entity\File; use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait; use Drupal\Tests\rest\Functional\AnonResourceTestTrait; @@ -163,4 +164,11 @@ protected function getNormalizedPostEntity() { ]; } + /** + * {@inheritdoc} + */ + protected function getExpectedCacheTags() { + return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:hal.settings']); + } + } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php index 742d817..1875d00 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\rest\Functional\EntityResource\Media; -use Drupal\Core\Cache\Cache; use Drupal\file\Entity\File; use Drupal\media\Entity\Media; use Drupal\media\Entity\MediaType; @@ -273,11 +272,4 @@ protected function getExpectedUnauthorizedAccessCacheability() { ->addCacheTags(['media:1']); } - /** - * {@inheritdoc} - */ - protected function getExpectedCacheTags() { - return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:hal.settings']); - } - }