Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / rest / tests / src / Functional / EntityResource / Media / MediaResourceTestBase.php

diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
index f5bfa1429147d2ddec1df94c4c769c48ca2e5bd6..40f7997251bc060d6e6b9dae36692564fbb83a8c 100644 (file)
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Media/MediaResourceTestBase.php
@@ -45,15 +45,17 @@ abstract class MediaResourceTestBase extends EntityResourceTestBase {
         break;
 
       case 'POST':
-        $this->grantPermissionsToTestedRole(['create media']);
+        $this->grantPermissionsToTestedRole(['create camelids media']);
         break;
 
       case 'PATCH':
-        $this->grantPermissionsToTestedRole(['update any media']);
+        $this->grantPermissionsToTestedRole(['edit any camelids media']);
+        // @todo Remove this in https://www.drupal.org/node/2824851.
+        $this->grantPermissionsToTestedRole(['access content']);
         break;
 
       case 'DELETE':
-        $this->grantPermissionsToTestedRole(['delete any media']);
+        $this->grantPermissionsToTestedRole(['delete any camelids media']);
         break;
     }
   }
@@ -92,7 +94,7 @@ abstract class MediaResourceTestBase extends EntityResourceTestBase {
     // Create a "Llama" media item.
     $media = Media::create([
       'bundle' => 'camelids',
-      'field_media_file_1' => [
+      'field_media_file' => [
         'target_id' => $file->id(),
       ],
     ]);
@@ -147,7 +149,7 @@ abstract class MediaResourceTestBase extends EntityResourceTestBase {
           'value' => 'Llama',
         ],
       ],
-      'field_media_file_1' => [
+      'field_media_file' => [
         [
           'description' => NULL,
           'display' => NULL,
@@ -261,4 +263,13 @@ abstract class MediaResourceTestBase extends EntityResourceTestBase {
     $this->markTestSkipped('POSTing File Media items is not supported until https://www.drupal.org/node/1927648 is solved.');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessCacheability() {
+    // @see \Drupal\media\MediaAccessControlHandler::checkAccess()
+    return parent::getExpectedUnauthorizedAccessCacheability()
+      ->addCacheTags(['media:1']);
+  }
+
 }