diff --git a/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php b/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php index 6f110f59624abd8aa18c9f9fd13e1c1f1f39a1ca..2d344bdd20cf81a084047dcb5d17fa3d92dd42fa 100644 --- a/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php +++ b/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php @@ -102,7 +102,7 @@ public function testDisplayConfiguration() { $account = $this->drupalCreateUser(['administer media display']); $this->drupalLogin($account); - $media_type = $this->createMediaType([], 'oembed:video'); + $media_type = $this->createMediaType('oembed:video'); $this->drupalGet('/admin/structure/media/manage/' . $media_type->id() . '/display'); $assert = $this->assertSession(); $assert->statusCodeEquals(200); @@ -132,7 +132,7 @@ public function testRender($url, $resource_url, array $formatter_settings, array $account = $this->drupalCreateUser(['view media']); $this->drupalLogin($account); - $media_type = $this->createMediaType([], 'oembed:video'); + $media_type = $this->createMediaType('oembed:video'); $source = $media_type->getSource(); $source_field = $source->getSourceFieldDefinition($media_type); diff --git a/core/modules/media/tests/src/Functional/MediaAccessTest.php b/core/modules/media/tests/src/Functional/MediaAccessTest.php index ef9f648f4954176632b81cabc2deee81c82554e9..4672c3e2883f78a847c903f57203d5c2d5e2722a 100644 --- a/core/modules/media/tests/src/Functional/MediaAccessTest.php +++ b/core/modules/media/tests/src/Functional/MediaAccessTest.php @@ -39,7 +39,7 @@ protected function setUp() { public function testMediaAccess() { $assert_session = $this->assertSession(); - $media_type = $this->createMediaType(); + $media_type = $this->createMediaType('test'); // Create media. $media = Media::create([ diff --git a/core/modules/media/tests/src/Functional/MediaBulkFormTest.php b/core/modules/media/tests/src/Functional/MediaBulkFormTest.php index 44ec6b8e16108d6ec17c26d6880fda7d43094f19..6bf9195fdc830d613c79583199e681b5c3b06f7f 100644 --- a/core/modules/media/tests/src/Functional/MediaBulkFormTest.php +++ b/core/modules/media/tests/src/Functional/MediaBulkFormTest.php @@ -39,7 +39,7 @@ class MediaBulkFormTest extends MediaFunctionalTestBase { protected function setUp() { parent::setUp(); - $this->testMediaType = $this->createMediaType(); + $this->testMediaType = $this->createMediaType('test'); // Create some test media items. $this->mediaItems = []; diff --git a/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php b/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php index ece89f43eae2ae47f72fd24922be5baf7bb76f0e..4cacf3d467052c8b9339eb061de9f61e98d4b2a5 100644 --- a/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php +++ b/core/modules/media/tests/src/Functional/MediaCacheTagsTest.php @@ -4,6 +4,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\media\Entity\Media; +use Drupal\Tests\media\Traits\MediaTypeCreationTrait; use Drupal\Tests\system\Functional\Entity\EntityWithUriCacheTagsTestBase; /** @@ -13,7 +14,7 @@ */ class MediaCacheTagsTest extends EntityWithUriCacheTagsTestBase { - use MediaFunctionalTestCreateMediaTypeTrait; + use MediaTypeCreationTrait; /** * {@inheritdoc} @@ -28,7 +29,7 @@ class MediaCacheTagsTest extends EntityWithUriCacheTagsTestBase { */ protected function createEntity() { // Create a media type. - $mediaType = $this->createMediaType(); + $mediaType = $this->createMediaType('test'); // Create a media item. $media = Media::create([ diff --git a/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php b/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php index 1d97773143ac8fa943f0125bf77c2782e3cd3fd9..540afac6a2edc5b377ea5f5630c60302ff5043af 100644 --- a/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php +++ b/core/modules/media/tests/src/Functional/MediaContextualLinksTest.php @@ -23,7 +23,7 @@ class MediaContextualLinksTest extends MediaFunctionalTestBase { */ public function testMediaContextualLinks() { // Create a media type. - $mediaType = $this->createMediaType(); + $mediaType = $this->createMediaType('test'); // Create a media item. $media = Media::create([ diff --git a/core/modules/media/tests/src/Functional/MediaFunctionalTestBase.php b/core/modules/media/tests/src/Functional/MediaFunctionalTestBase.php index 017e725e3b46995eab19d3ba697013ce2d56fff3..b786d2e3a18be4e19d143deea0f5f714722d037b 100644 --- a/core/modules/media/tests/src/Functional/MediaFunctionalTestBase.php +++ b/core/modules/media/tests/src/Functional/MediaFunctionalTestBase.php @@ -3,6 +3,7 @@ namespace Drupal\Tests\media\Functional; use Drupal\Tests\BrowserTestBase; +use Drupal\Tests\media\Traits\MediaTypeCreationTrait; /** * Base class for Media functional tests. @@ -10,7 +11,7 @@ abstract class MediaFunctionalTestBase extends BrowserTestBase { use MediaFunctionalTestTrait; - use MediaFunctionalTestCreateMediaTypeTrait; + use MediaTypeCreationTrait; /** * Modules to enable. diff --git a/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php b/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php index 2a72edd725c477457ef556595bb8ef257280fdd7..265671b3d9832c6f76346afbe068d067417333bd 100644 --- a/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php +++ b/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php @@ -2,13 +2,24 @@ namespace Drupal\Tests\media\Functional; -use Drupal\media\Entity\MediaType; +@trigger_error(__NAMESPACE__ . '\MediaFunctionalTestCreateMediaTypeTrait is deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Use \Drupal\Tests\media\Traits\MediaTypeCreationTrait instead. See https://www.drupal.org/node/2981614.', E_USER_DEPRECATED); + +use Drupal\Tests\media\Traits\MediaTypeCreationTrait; /** * Trait with helpers for Media functional tests. + * + * @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Use + * \Drupal\Tests\media\Traits\MediaTypeCreationTrait instead. + * + * @see https://www.drupal.org/node/2981614 */ trait MediaFunctionalTestCreateMediaTypeTrait { + use MediaTypeCreationTrait { + createMediaType as traitCreateMediaType; + } + /** * Creates a media type. * @@ -22,52 +33,7 @@ trait MediaFunctionalTestCreateMediaTypeTrait { * A newly created media type. */ protected function createMediaType(array $values = [], $source = 'test') { - if (empty($values['bundle'])) { - $id = strtolower($this->randomMachineName()); - } - else { - $id = $values['bundle']; - } - $values += [ - 'id' => $id, - 'label' => $id, - 'source' => $source, - 'source_configuration' => [], - 'field_map' => [], - 'new_revision' => FALSE, - ]; - - $media_type = MediaType::create($values); - $status = $media_type->save(); - - // @todo Rename to assertSame() when #1945040 is done. - // @see https://www.drupal.org/node/1945040 - $this->assertIdentical(SAVED_NEW, $status, 'Media type was created successfully.'); - - // Ensure that the source field exists. - /** @var \Drupal\media\MediaSourceInterface $source */ - $source = $media_type->getSource(); - $source_field = $source->getSourceFieldDefinition($media_type); - if (!$source_field) { - $source_field = $source->createSourceField($media_type); - /** @var \Drupal\field\FieldStorageConfigInterface $storage */ - $storage = $source_field->getFieldStorageDefinition(); - $storage->save(); - $source_field->save(); - - $media_type - ->set('source_configuration', [ - 'source_field' => $source_field->getName(), - ]) - ->save(); - } - - // Move source field in form display. - entity_get_form_display('media', $id, 'default') - ->setComponent($source_field->getName()) - ->save(); - - return $media_type; + return $this->traitCreateMediaType($source, $values); } } diff --git a/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php b/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php index f9467891ad2b5b11c075b7c46b5f7f0af772a38e..069390e0feef35c48955d6ffa5449d2f731eec78 100644 --- a/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php +++ b/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php @@ -57,8 +57,8 @@ public function testMediaOverviewPage() { $assert_session->pageTextContains('No content available.'); // Create some content for the view. - $media_type1 = $this->createMediaType(); - $media_type2 = $this->createMediaType(); + $media_type1 = $this->createMediaType('test'); + $media_type2 = $this->createMediaType('test'); $media1 = Media::create([ 'bundle' => $media_type1->id(), 'name' => 'Media 1', diff --git a/core/modules/media/tests/src/Functional/MediaRevisionTest.php b/core/modules/media/tests/src/Functional/MediaRevisionTest.php index 1747d5dd78741dd555d50e755438b4bc9beeefd1..9a8ce5a0bccd68d117b7bffc9e12189123922fa3 100644 --- a/core/modules/media/tests/src/Functional/MediaRevisionTest.php +++ b/core/modules/media/tests/src/Functional/MediaRevisionTest.php @@ -25,7 +25,7 @@ public function testRevisions() { $media_storage = $this->container->get('entity.manager')->getStorage('media'); // Create a media type and media item. - $media_type = $this->createMediaType(); + $media_type = $this->createMediaType('test'); $media = $media_storage->create([ 'bundle' => $media_type->id(), 'name' => 'Unnamed', @@ -80,7 +80,7 @@ public function testFileMediaRevision() { $uri = 'temporary://foo.txt'; file_put_contents($uri, $this->randomString(128)); - $this->createMediaType(['bundle' => 'file', 'new_revision' => TRUE], 'file'); + $this->createMediaType('file', ['id' => 'file', 'new_revision' => TRUE]); // Create a media item. $this->drupalGet('/media/add/file'); @@ -119,7 +119,7 @@ public function testFileMediaRevision() { public function testImageMediaRevision() { $assert = $this->assertSession(); - $this->createMediaType(['bundle' => 'image', 'new_revision' => TRUE], 'image'); + $this->createMediaType('image', ['id' => 'image', 'new_revision' => TRUE]); /** @var \Drupal\field\FieldConfigInterface $field */ // Disable the alt text field, because this is not a JavaScript test and diff --git a/core/modules/media/tests/src/Functional/MediaSettingsTest.php b/core/modules/media/tests/src/Functional/MediaSettingsTest.php index 850d0e2b447d54b1e7419903e87ec624a75ffafe..ba25392f5c6b9da92a1f53773ac5a7d08255c550 100644 --- a/core/modules/media/tests/src/Functional/MediaSettingsTest.php +++ b/core/modules/media/tests/src/Functional/MediaSettingsTest.php @@ -26,7 +26,7 @@ public function testStatusPage() { $this->drupalGet('admin/reports/status'); $assert_session->pageTextNotContains('It is potentially insecure to display oEmbed content in a frame'); - $this->createMediaType([], 'oembed:video'); + $this->createMediaType('oembed:video'); $this->drupalGet('admin/reports/status'); $assert_session->pageTextContains('It is potentially insecure to display oEmbed content in a frame'); diff --git a/core/modules/media/tests/src/Functional/MediaSourceFileTest.php b/core/modules/media/tests/src/Functional/MediaSourceFileTest.php index 18131a47b59e2355633a7b30d1039f8fc36d81cd..fad13dc81f043f91f9f1effb5601aab52b546424 100644 --- a/core/modules/media/tests/src/Functional/MediaSourceFileTest.php +++ b/core/modules/media/tests/src/Functional/MediaSourceFileTest.php @@ -19,7 +19,7 @@ public function testSourceFieldSettingsEditing() { $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']); @@ -43,7 +43,7 @@ public function testSourceFieldSettingsEditing() { * 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"); diff --git a/core/modules/media/tests/src/Functional/MediaTemplateSuggestionsTest.php b/core/modules/media/tests/src/Functional/MediaTemplateSuggestionsTest.php index 274497ae0112e86511c688315b0a32a24889b91f..d4e356662d64065e584d9922d7c0eb86b7d7b5ea 100644 --- a/core/modules/media/tests/src/Functional/MediaTemplateSuggestionsTest.php +++ b/core/modules/media/tests/src/Functional/MediaTemplateSuggestionsTest.php @@ -22,8 +22,7 @@ class MediaTemplateSuggestionsTest extends MediaFunctionalTestBase { * Tests template suggestions from media_theme_suggestions_media(). */ public function testMediaThemeHookSuggestions() { - $media_type = $this->createMediaType([ - 'new_revision' => FALSE, + $media_type = $this->createMediaType('test', [ 'queue_thumbnail_downloads' => FALSE, ]); diff --git a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php index c885ea4f5ed3236e3c12b9d350134230303c40c7..f820153884bab5b4f9e93538834ee6ab71c59d30 100644 --- a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php +++ b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php @@ -43,8 +43,7 @@ public function testMediaWithOnlyOneMediaType() { $page = $session->getPage(); $assert_session = $this->assertSession(); - $media_type = $this->createMediaType([ - 'new_revision' => FALSE, + $media_type = $this->createMediaType('test', [ 'queue_thumbnail_downloads' => FALSE, ]); @@ -151,10 +150,10 @@ public function testMediaWithMultipleMediaTypes() { $assert_session = $this->assertSession(); // Tests and creates the first media type. - $first_media_type = $this->createMediaType(['description' => $this->randomMachineName(32)]); + $first_media_type = $this->createMediaType('test', ['description' => $this->randomMachineName()]); // Test and create a second media type. - $second_media_type = $this->createMediaType(['description' => $this->randomMachineName(32)]); + $second_media_type = $this->createMediaType('test', ['description' => $this->randomMachineName()]); // Test if media/add displays two media type options. $this->drupalGet('media/add'); @@ -284,7 +283,10 @@ public function testMediaReferenceWidget($cardinality, array $media_type_create_ $create_media_types[] = "media_type_$id"; $permissions[] = "create media_type_$id media"; } - $this->createMediaType(['bundle' => "media_type_$id"]); + $this->createMediaType('test', [ + 'id' => "media_type_$id", + 'label' => "media_type_$id", + ]); $media_types["media_type_$id"] = "media_type_$id"; } @@ -513,7 +515,7 @@ public function testMediaCollectionRoute() { $this->container->get('module_installer')->uninstall(['views']); // Create a media type and media item. - $media_type = $this->createMediaType(); + $media_type = $this->createMediaType('test'); $media = $media_storage->create([ 'bundle' => $media_type->id(), 'name' => 'Unnamed', diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php index 0549d2d16cba220cbefec0bc51863d9c4a9bc98f..30b62042c8271ee61656903c3ac092a5caf05ac3 100644 --- a/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php @@ -39,7 +39,7 @@ public function testMediaDisplay() { $assert_session = $this->assertSession(); $page = $this->getSession()->getPage(); - $media_type = $this->createMediaType(); + $media_type = $this->createMediaType('test'); // Create a media item. $media = Media::create([ diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php b/core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php index 7fc26ec96e5b322b95b9264379ec543d36265220..e84db38b7ddb39734e7a2e3348e16cf33395e2bd 100644 --- a/core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php @@ -3,8 +3,8 @@ namespace Drupal\Tests\media\FunctionalJavascript; use Drupal\FunctionalJavascriptTests\JavascriptTestBase; -use Drupal\Tests\media\Functional\MediaFunctionalTestCreateMediaTypeTrait; use Drupal\Tests\media\Functional\MediaFunctionalTestTrait; +use Drupal\Tests\media\Traits\MediaTypeCreationTrait; /** * Base class for Media functional JavaScript tests. @@ -12,7 +12,7 @@ abstract class MediaJavascriptTestBase extends JavascriptTestBase { use MediaFunctionalTestTrait; - use MediaFunctionalTestCreateMediaTypeTrait; + use MediaTypeCreationTrait; /** * Modules to enable. diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php index 0116305771e73a2324dde62971dbf3bac0b72601..7af61fcad0048bd9a97fc884329785145e5c60ef 100644 --- a/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php @@ -191,7 +191,7 @@ public function testMediaTypes() { // Test that the system for preventing the deletion of media types works // (they cannot be deleted if there is media content of that type/bundle). - $media_type2 = $this->createMediaType(); + $media_type2 = $this->createMediaType('test'); $label2 = $media_type2->label(); $media = Media::create(['name' => 'lorem ipsum', 'bundle' => $media_type2->id()]); $media->save(); diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaViewsWizardTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaViewsWizardTest.php index df71943096a3bc1e949f2339b1f9846c0a3294ac..3be7b1ad4555aa5f8bf5e4b658ea67291fe4fa48 100644 --- a/core/modules/media/tests/src/FunctionalJavascript/MediaViewsWizardTest.php +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaViewsWizardTest.php @@ -22,7 +22,7 @@ public function testMediaWizard() { $page = $session->getPage(); $assert_session = $this->assertSession(); - $this->createMediaType(); + $this->createMediaType('test'); $view_id = strtolower($this->randomMachineName(16)); $this->drupalGet('admin/structure/views/add'); diff --git a/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php b/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php index c00dc3d1de4462633229a997ec861d3b801a3724..1c6a879eeaae2eee939c0722839802162f14d960 100644 --- a/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php +++ b/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php @@ -5,8 +5,8 @@ use Drupal\file\Entity\File; use Drupal\KernelTests\KernelTestBase; use Drupal\media\Entity\Media; -use Drupal\media\Entity\MediaType; use Drupal\media\MediaTypeInterface; +use Drupal\Tests\media\Traits\MediaTypeCreationTrait; use Drupal\user\Entity\User; use org\bovigo\vfs\vfsStream; @@ -15,6 +15,8 @@ */ abstract class MediaKernelTestBase extends KernelTestBase { + use MediaTypeCreationTrait; + /** * Modules to install. * @@ -77,37 +79,6 @@ protected function setUp() { $this->container->get('current_user')->setAccount($this->user); } - /** - * Create a media type for a source plugin. - * - * @param string $media_source_name - * The name of the media source. - * - * @return \Drupal\media\MediaTypeInterface - * A media type. - */ - protected function createMediaType($media_source_name) { - $id = strtolower($this->randomMachineName()); - $media_type = MediaType::create([ - 'id' => $id, - 'label' => $id, - 'source' => $media_source_name, - 'new_revision' => FALSE, - ]); - $media_type->save(); - $source_field = $media_type->getSource()->createSourceField($media_type); - // The media type form creates a source field if it does not exist yet. The - // same must be done in a kernel test, since it does not use that form. - // @see \Drupal\media\MediaTypeForm::save() - $source_field->getFieldStorageDefinition()->save(); - // The source field storage has been created, now the field can be saved. - $source_field->save(); - $media_type->set('source_configuration', [ - 'source_field' => $source_field->getName(), - ])->save(); - return $media_type; - } - /** * Helper to generate a media item. * diff --git a/core/modules/media/tests/src/Traits/MediaTypeCreationTrait.php b/core/modules/media/tests/src/Traits/MediaTypeCreationTrait.php new file mode 100644 index 0000000000000000000000000000000000000000..84375072fc7d4ed0d2e480b2cff05d1bde5cfb25 --- /dev/null +++ b/core/modules/media/tests/src/Traits/MediaTypeCreationTrait.php @@ -0,0 +1,76 @@ + $this->randomMachineName(), + 'label' => $this->randomString(), + 'source' => $source_plugin_id, + ]; + + /** @var \Drupal\media\MediaTypeInterface $media_type */ + $media_type = MediaType::create($values); + $this->assertSame(SAVED_NEW, $media_type->save()); + + $source = $media_type->getSource(); + $source_field = $source->createSourceField($media_type); + // The media type form creates a source field if it does not exist yet. The + // same must be done in a kernel test, since it does not use that form. + // @see \Drupal\media\MediaTypeForm::save() + $source_field->getFieldStorageDefinition()->save(); + // The source field storage has been created, now the field can be saved. + $source_field->save(); + + $source_configuration = $source->getConfiguration(); + $source_configuration['source_field'] = $source_field->getName(); + $source->setConfiguration($source_configuration); + + $this->assertSame(SAVED_UPDATED, $media_type->save()); + + // Add the source field to the form display for the media type. + $form_display = entity_get_form_display('media', $media_type->id(), 'default'); + $source->prepareFormDisplay($media_type, $form_display); + $form_display->save(); + + return $media_type; + } + +} diff --git a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php index 095de3306ed2a2e0003a0336ce3ede30564eb3ee..1bcedcfa67663ff990c0bbc6e11a86350dfb022c 100644 --- a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php @@ -16,7 +16,7 @@ use Drupal\node\Entity\NodeType; use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; -use Drupal\Tests\media\Functional\MediaFunctionalTestCreateMediaTypeTrait; +use Drupal\Tests\media\Traits\MediaTypeCreationTrait; use Drupal\user\Entity\User; /** @@ -27,7 +27,7 @@ class ContentEntityTest extends KernelTestBase { use EntityReferenceTestTrait; - use MediaFunctionalTestCreateMediaTypeTrait; + use MediaTypeCreationTrait; /** * {@inheritdoc} @@ -339,12 +339,11 @@ public function testNodeSource() { public function testMediaSource() { $values = [ 'id' => 'image', - 'bundle' => 'image', 'label' => 'Image', 'source' => 'test', 'new_revision' => FALSE, ]; - $media_type = $this->createMediaType($values); + $media_type = $this->createMediaType('test', $values); $media = Media::create([ 'name' => 'Foo media', 'uid' => $this->user->id(),