Updated to Drupal 8.6.4, which is PHP 7.3 friendly. Also updated HTMLaw library....

[yaffs-website] / web / core / modules / media / tests / src / Functional / MediaSourceFileTest.php

diff --git a/web/core/modules/media/tests/src/Functional/MediaSourceFileTest.php b/web/core/modules/media/tests/src/Functional/MediaSourceFileTest.php
index b2e4f508d8a362ee059b47c81fe58605e841f8f5..fad13dc81f043f91f9f1effb5601aab52b546424 100644 (file)
--- a/web/core/modules/media/tests/src/Functional/MediaSourceFileTest.php
+++ b/web/core/modules/media/tests/src/Functional/MediaSourceFileTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\media\Functional;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\media\Entity\MediaType;
 
 /**
  * Tests the file media source.
@@ -12,17 +11,6 @@ use Drupal\media\Entity\MediaType;
  */
 class MediaSourceFileTest extends MediaFunctionalTestBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // We need to test without any default configuration in place.
-    // @TODO: Remove this as part of https://www.drupal.org/node/2883813.
-    MediaType::load('file')->delete();
-  }
-
   /**
    * Test that it's possible to change the allowed file extensions.
    */
@@ -31,7 +19,7 @@ class MediaSourceFileTest extends MediaFunctionalTestBase {
     $page = $session->getPage();
     $assert_session = $this->assertSession();
 
-    $media_type = $this->createMediaType([], 'file');
+    $media_type = $this->createMediaType('file');
     $media_type_id = $media_type->id();
     $this->assertSame('txt doc docx pdf', FieldConfig::load("media.$media_type_id.field_media_file")->get('settings')['file_extensions']);
 
@@ -55,7 +43,7 @@ class MediaSourceFileTest extends MediaFunctionalTestBase {
    * Ensure source field deletion is not possible.
    */
   public function testPreventSourceFieldDeletion() {
-    $media_type = $this->createMediaType([], 'file');
+    $media_type = $this->createMediaType('file');
     $media_type_id = $media_type->id();
 
     $this->drupalGet("admin/structure/media/manage/$media_type_id/fields/media.$media_type_id.field_media_file/delete");