Fix for broken validate_attachment_content_type matcher (github issue…

… 211)
maccman · Jul 1, 2010 · ae9d7e9 · ae9d7e9
1 parent 44b02fa
commit ae9d7e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb b/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
@@ -57,7 +57,8 @@ def allow_types?(types)
             file = StringIO.new(".")
             file.content_type = type
             (subject = @subject.new).attachment_for(@attachment_name).assign(file)
-            subject.valid? && subject.errors[:"#{@attachment_name}_content_type"].blank?
+            subject.valid?
+            subject.errors[:"#{@attachment_name}_content_type"].blank?
           end
         end
 

diff --git a/test/matchers/validate_attachment_content_type_matcher_test.rb b/test/matchers/validate_attachment_content_type_matcher_test.rb
@@ -4,6 +4,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
   context "validate_attachment_content_type" do
     setup do
       reset_table("dummies") do |d|
+        d.string :title
         d.string :avatar_file_name
         d.string :avatar_content_type
       end
@@ -33,5 +34,14 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
       should_accept_dummy_class
     end
+
+    context "given a class with other validations but matching types" do
+      setup do
+        @dummy_class.validates_presence_of :title
+        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
+      end
+
+      should_accept_dummy_class
+    end
   end
 end