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

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

diff --git a/web/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php b/web/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php
index 4197caab65c8f61e04c35beea2ef59210c056423..2a72edd725c477457ef556595bb8ef257280fdd7 100644 (file)
--- a/web/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php
+++ b/web/core/modules/media/tests/src/Functional/MediaFunctionalTestCreateMediaTypeTrait.php
@@ -45,6 +45,7 @@ trait MediaFunctionalTestCreateMediaTypeTrait {
     $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) {
@@ -61,6 +62,11 @@ trait MediaFunctionalTestCreateMediaTypeTrait {
         ->save();
     }
 
+    // Move source field in form display.
+    entity_get_form_display('media', $id, 'default')
+      ->setComponent($source_field->getName())
+      ->save();
+
     return $media_type;
   }