X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fmedia%2Ftests%2Fsrc%2FFunctionalJavascript%2FMediaSourceFileTest.php;fp=web%2Fcore%2Fmodules%2Fmedia%2Ftests%2Fsrc%2FFunctionalJavascript%2FMediaSourceFileTest.php;h=ad509b02366ef558433ccc091d459ccd9a25001a;hp=21954d8a92f5986fe6034537cacd01b19a9a99e3;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
index 21954d8a9..ad509b023 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
@@ -19,6 +19,7 @@ class MediaSourceFileTest extends MediaSourceTestBase {
     $media_type_id = 'test_media_file_type';
     $source_field_id = 'field_media_file';
     $provided_fields = [
+      File::METADATA_ATTRIBUTE_NAME,
       File::METADATA_ATTRIBUTE_SIZE,
       File::METADATA_ATTRIBUTE_MIME,
     ];
@@ -40,6 +41,7 @@ class MediaSourceFileTest extends MediaSourceTestBase {
     $this->hideMediaTypeFieldWidget('name', $media_type_id);
 
     $this->drupalGet("admin/structure/media/manage/{$media_type_id}");
+    $page->selectFieldOption("field_map[" . File::METADATA_ATTRIBUTE_NAME . "]", 'name');
     $page->selectFieldOption("field_map[" . File::METADATA_ATTRIBUTE_SIZE . "]", 'field_string_file_size');
     $page->selectFieldOption("field_map[" . File::METADATA_ATTRIBUTE_MIME . "]", 'field_string_mime_type');
     $page->pressButton('Save');
@@ -55,7 +57,10 @@ class MediaSourceFileTest extends MediaSourceTestBase {
     $this->assertNotEmpty($result);
     $page->pressButton('Save');
 
-    $assert_session->addressEquals('media/1');
+    $assert_session->addressEquals('admin/content/media');
+
+    // Get the media entity view URL from the creation message.
+    $this->drupalGet($this->assertLinkToCreatedMedia());
 
     // Make sure the thumbnail is displayed.
     $assert_session->elementAttributeContains('css', '.image-style-thumbnail', 'src', 'generic.png');
@@ -69,9 +74,9 @@ class MediaSourceFileTest extends MediaSourceTestBase {
 
     // Load the media and check that all the fields are properly populated.
     $media = Media::load(1);
-    $this->assertEquals($test_filename, $media->getName());
-    $this->assertEquals('8', $media->get('field_string_file_size')->value);
-    $this->assertEquals('text/plain', $media->get('field_string_mime_type')->value);
+    $this->assertSame($test_filename, $media->getName());
+    $this->assertSame('8', $media->get('field_string_file_size')->value);
+    $this->assertSame('text/plain', $media->get('field_string_mime_type')->value);
 
     // Test the MIME type icon.
     $icon_base = \Drupal::config('media.settings')->get('icon_base_uri');
@@ -82,6 +87,23 @@ class MediaSourceFileTest extends MediaSourceTestBase {
     $this->assertNotEmpty($result);
     $page->pressButton('Save');
     $assert_session->elementAttributeContains('css', '.image-style-thumbnail', 'src', 'text--plain.png');
+
+    // Check if the mapped name is automatically updated.
+    $new_filename = $this->randomMachineName() . '.txt';
+    $new_filepath = 'public://' . $new_filename;
+    file_put_contents($new_filepath, $this->randomMachineName());
+    $this->drupalGet("media/1/edit");
+    $page->pressButton('Remove');
+    $result = $assert_session->waitForField("files[{$source_field_id}_0]");
+    $this->assertNotEmpty($result);
+    $page->attachFileToField("files[{$source_field_id}_0]", \Drupal::service('file_system')->realpath($new_filepath));
+    $result = $assert_session->waitForButton('Remove');
+    $this->assertNotEmpty($result);
+    $page->pressButton('Save');
+    /** @var \Drupal\media\MediaInterface $media */
+    $media = \Drupal::entityTypeManager()->getStorage('media')->loadUnchanged(1);
+    $this->assertEquals($new_filename, $media->getName());
+    $assert_session->pageTextContains("$new_filename has been updated.");
   }
 
 }