X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fimage%2Ftests%2Fsrc%2FFunctional%2FImageFieldWidgetTest.php;fp=web%2Fcore%2Fmodules%2Fimage%2Ftests%2Fsrc%2FFunctional%2FImageFieldWidgetTest.php;h=cdec5b905e736a0cf3c10de5dbb9fb2cee0d2c0a;hp=7c3b94d494bc4b074133c422b6e1159be7251e30;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hpb=680c79a86e3ed402f263faeac92e89fb6d9edcc0

diff --git a/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php b/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
index 7c3b94d49..cdec5b905 100644
--- a/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\image\Functional;
 
+use Drupal\field\Entity\FieldConfig;
+
 /**
  * Tests the image field widget.
  *
@@ -27,6 +29,22 @@ class ImageFieldWidgetTest extends ImageFieldTestBase {
     $this->assertNotEqual(0, count($this->xpath('//div[contains(@class, "field--widget-image-image")]')), 'Image field widget found on add/node page', 'Browser');
     $this->assertNotEqual(0, count($this->xpath('//input[contains(@accept, "image/*")]')), 'Image field widget limits accepted files.', 'Browser');
     $this->assertNoText('Image test on [site:name]');
+
+    // Check for allowed image file extensions - default.
+    $this->assertText('Allowed types: png gif jpg jpeg.');
+
+    // Try adding to the field config an unsupported extension, should not
+    // appear in the allowed types.
+    $field_config = FieldConfig::loadByName('node', 'article', $field_name);
+    $field_config->setSetting('file_extensions', 'png gif jpg jpeg tiff')->save();
+    $this->drupalGet('node/add/article');
+    $this->assertText('Allowed types: png gif jpg jpeg.');
+
+    // Add a supported extension and remove some supported ones, we should see
+    // the intersect of those entered in field config with those supported.
+    $field_config->setSetting('file_extensions', 'png jpe tiff')->save();
+    $this->drupalGet('node/add/article');
+    $this->assertText('Allowed types: png jpe.');
   }
 
 }