Fix for broken validate_attachment_content_type matcher (github issue 211)

lib/paperclip/matchers/validate_attachment_content_type_matcher.rb

@@ -57,7 +57,8 @@ module Paperclip
             file = StringIO.new(".")
             file = StringIO.new(".")
             file.content_type = type
             file.content_type = type
             (subject = @subject.new).attachment_for(@attachment_name).assign(file)
             (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
         end
         end
 
 

test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -4,6 +4,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
   context "validate_attachment_content_type" do
   context "validate_attachment_content_type" do
     setup do
     setup do
       reset_table("dummies") do |d|
       reset_table("dummies") do |d|
+        d.string :title
         d.string :avatar_file_name
         d.string :avatar_file_name
         d.string :avatar_content_type
         d.string :avatar_content_type
       end
       end
@@ -33,5 +34,14 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
 
       should_accept_dummy_class
       should_accept_dummy_class
     end
     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
 end
 end