diff -u b/core/modules/media/config/install/field.field.media.file.field_media_file.yml b/core/modules/media/config/install/field.field.media.file.field_media_file.yml --- b/core/modules/media/config/install/field.field.media.file.field_media_file.yml +++ b/core/modules/media/config/install/field.field.media.file.field_media_file.yml @@ -4,11 +4,11 @@ config: - field.storage.media.field_media_file - media.type.file - module: - - file enforced: module: - media + module: + - file id: media.file.field_media_file field_name: field_media_file entity_type: media diff -u b/core/modules/media/config/install/field.storage.media.field_media_file.yml b/core/modules/media/config/install/field.storage.media.field_media_file.yml --- b/core/modules/media/config/install/field.storage.media.field_media_file.yml +++ b/core/modules/media/config/install/field.storage.media.field_media_file.yml @@ -1,12 +1,12 @@ langcode: en status: true dependencies: - module: - - file - - media enforced: module: - media + module: + - file + - media id: media.field_media_file field_name: field_media_file entity_type: media diff -u b/core/modules/media/config/install/media.type.file.yml b/core/modules/media/config/install/media.type.file.yml --- b/core/modules/media/config/install/media.type.file.yml +++ b/core/modules/media/config/install/media.type.file.yml @@ -1,8 +1,6 @@ langcode: en status: true -dependencies: - module: - - media +dependencies: { } id: file label: File description: "Use local files for reusable media." diff -u b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php --- b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php @@ -3,7 +3,7 @@ namespace Drupal\Tests\media\FunctionalJavascript; use Drupal\media\Entity\Media; -use Drupal\media\Plugin\media\Source\File; +use Drupal\media\Entity\MediaType; /** * Tests the file media source. @@ -13,6 +13,17 @@ class MediaSourceFileTest extends MediaSourceTestBase { /** + * {@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(); + } + + /** * Tests the file media source. */ public function testMediaFileSource() { diff -u b/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php b/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php --- b/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php +++ b/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\media\Kernel; +use Drupal\media\Entity\MediaType; + /** * Tests the file media source. * @@ -10,6 +12,17 @@ class MediaSourceFileTest extends MediaKernelTestBase { /** + * {@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(); + } + + /** * Tests the file extension constraint. */ public function testFileExtensionConstraint() { only in patch2: unchanged: --- a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php +++ b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php @@ -3,6 +3,7 @@ namespace Drupal\Tests\media\Functional; use Drupal\media\Entity\Media; +use Drupal\media\Entity\MediaType; /** * Ensures that media UI works correctly. @@ -28,6 +29,10 @@ protected function setUp() { parent::setUp(); $this->drupalPlaceBlock('local_actions_block'); $this->drupalPlaceBlock('local_tasks_block'); + + // We need to test without any default configuration in place. + // @TODO: Remove this when https://www.drupal.org/node/2883813 lands. + MediaType::load('file')->delete(); } /** only in patch2: unchanged: --- a/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php @@ -38,6 +38,10 @@ protected function setUp() { parent::setUp(); $this->drupalPlaceBlock('local_actions_block'); $this->drupalPlaceBlock('local_tasks_block'); + + // 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(); } /**