Merged r20946 from trunk to 4.1-stable (#34367).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20948 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 13 insertions, 0 deletions

diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
index e2b6bb85e..3c1500d70 100644
--- a/test/unit/attachment_test.rb
+++ b/test/unit/attachment_test.rb
@@ -152,6 +152,19 @@ class AttachmentTest < ActiveSupport::TestCase
     end
   end
 
+  def test_extension_update_should_be_validated_against_denied_extensions
+    with_settings :attachment_extensions_denied => "txt, png" do
+      a = Attachment.new(:container => Issue.find(1),
+                         :file => mock_file_with_options(:original_filename => "test.jpeg"),
+                         :author => User.find(1))
+      assert_save a
+
+      b = Attachment.find(a.id)
+      b.filename = "test.png"
+      assert !b.save
+    end
+  end
+
   def test_valid_extension_should_be_case_insensitive
     with_settings :attachment_extensions_allowed => "txt, Png" do
       assert Attachment.valid_extension?(".pnG")