X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fmedia%2Ftests%2Fsrc%2FFunctional%2FUpdate%2FMediaUpdateTest.php;h=4d4c3ea76f45f6000f7a396d47077da1e051598f;hp=2dbe28be365074c3aed24000b3e132f3e1402277;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/web/core/modules/media/tests/src/Functional/Update/MediaUpdateTest.php b/web/core/modules/media/tests/src/Functional/Update/MediaUpdateTest.php
index 2dbe28be3..4d4c3ea76 100644
--- a/web/core/modules/media/tests/src/Functional/Update/MediaUpdateTest.php
+++ b/web/core/modules/media/tests/src/Functional/Update/MediaUpdateTest.php
@@ -9,6 +9,7 @@ use Drupal\user\Entity\Role;
  * Tests that media settings are properly updated during database updates.
  *
  * @group media
+ * @group legacy
  */
 class MediaUpdateTest extends UpdatePathTestBase {
 
@@ -17,8 +18,9 @@ class MediaUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../fixtures/update/drupal-8.media-enabled.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.4.0.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.4.0-media_installed.php',
+      __DIR__ . '/../../../fixtures/update/drupal-8.media-add-additional-permissions.php',
     ];
   }
 
@@ -28,16 +30,6 @@ class MediaUpdateTest extends UpdatePathTestBase {
    * @see media_update_8500()
    */
   public function testBundlePermission() {
-    $role = Role::load(Role::AUTHENTICATED_ID);
-
-    $this->grantPermissions($role, [
-      'update media',
-      'update any media',
-      'delete media',
-      'delete any media',
-      'create media',
-    ]);
-
     $this->runUpdates();
 
     /** @var \Drupal\user\RoleInterface $role */
@@ -53,4 +45,21 @@ class MediaUpdateTest extends UpdatePathTestBase {
     }
   }
 
+  /**
+   * Tests that media.settings config is updated with oEmbed configuration.
+   *
+   * @see media_update_8600()
+   */
+  public function testOEmbedConfig() {
+    $config = $this->config('media.settings');
+    $this->assertNull($config->get('oembed_providers_url'));
+    $this->assertNull($config->get('iframe_domain'));
+
+    $this->runUpdates();
+
+    $config = $this->config('media.settings');
+    $this->assertSame('https://oembed.com/providers.json', $config->get('oembed_providers_url'));
+    $this->assertSame('', $config->get('iframe_domain'));
+  }
+
 }