paperclip 3.0.3 → 3.5.1

data/test/validators/attachment_content_type_validator_test.rb

@@ -50,6 +50,32 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
     end
   end
 
+  context "with a failing validation" do
+    setup do
+      build_validator :content_type => "image/png", :allow_nil => false
+      @dummy.stubs(:avatar_content_type => nil)
+      @validator.validate(@dummy)
+    end
+
+    should "add error to the base object" do
+      assert @dummy.errors[:avatar].present?,
+        "Error not added to base attribute"
+    end
+  end
+
+  context "with a successful validation" do
+    setup do
+      build_validator :content_type => "image/png", :allow_nil => false
+      @dummy.stubs(:avatar_content_type => "image/png")
+      @validator.validate(@dummy)
+    end
+
+    should "not add error to the base object" do
+      assert @dummy.errors[:avatar].blank?,
+        "Error was added to base attribute"
+    end
+  end
+
   context "with :allow_blank option" do
     context "as true" do
       setup do
@@ -76,93 +102,189 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
     end
   end
 
-  context "with an allowed type" do
-    context "as a string" do
-      setup do
-        build_validator :content_type => "image/jpg"
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
-      end
+  context "whitelist format" do
+    context "with an allowed type" do
+      context "as a string" do
+        setup do
+          build_validator :content_type => "image/jpg"
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
 
-      should "not set an error message" do
-        assert @dummy.errors[:avatar_content_type].blank?
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
-    end
 
-    context "as an regexp" do
-      setup do
-        build_validator :content_type => /^image\/.*/
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
+      context "as an regexp" do
+        setup do
+          build_validator :content_type => /^image\/.*/
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
 
-      should "not set an error message" do
-        assert @dummy.errors[:avatar_content_type].blank?
+      context "as a list" do
+        setup do
+          build_validator :content_type => ["image/png", "image/jpg", "image/jpeg"]
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
     end
 
-    context "as a list" do
-      setup do
-        build_validator :content_type => ["image/png", "image/jpg", "image/jpeg"]
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
+    context "with a disallowed type" do
+      context "as a string" do
+        setup do
+          build_validator :content_type => "image/png"
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "set a correct default error message" do
+          assert @dummy.errors[:avatar_content_type].present?
+          assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+        end
       end
 
-      should "not set an error message" do
-        assert @dummy.errors[:avatar_content_type].blank?
+      context "as a regexp" do
+        setup do
+          build_validator :content_type => /^text\/.*/
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "set a correct default error message" do
+          assert @dummy.errors[:avatar_content_type].present?
+          assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+        end
+      end
+
+      context "with :message option" do
+        context "without interpolation" do
+          setup do
+            build_validator :content_type => "image/png", :message => "should be a PNG image"
+            @dummy.stubs(:avatar_content_type => "image/jpg")
+            @validator.validate(@dummy)
+          end
+
+          should "set a correct error message" do
+            assert_includes @dummy.errors[:avatar_content_type], "should be a PNG image"
+          end
+        end
+
+        context "with interpolation" do
+          setup do
+            build_validator :content_type => "image/png", :message => "should have content type %{types}"
+            @dummy.stubs(:avatar_content_type => "image/jpg")
+            @validator.validate(@dummy)
+          end
+
+          should "set a correct error message" do
+            assert_includes @dummy.errors[:avatar_content_type], "should have content type image/png"
+          end
+        end
       end
     end
   end
 
-  context "with a disallowed type" do
-    context "as a string" do
-      setup do
-        build_validator :content_type => "image/png"
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
-      end
+  context "blacklist format" do
+    context "with an allowed type" do
+      context "as a string" do
+        setup do
+          build_validator :not => "image/gif"
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
 
-      should "set a correct default error message" do
-        assert @dummy.errors[:avatar_content_type].present?
-        assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
-    end
 
-    context "as a regexp" do
-      setup do
-        build_validator :content_type => /^text\/.*/
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
+      context "as an regexp" do
+        setup do
+          build_validator :not => /^text\/.*/
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
 
-      should "set a correct default error message" do
-        assert @dummy.errors[:avatar_content_type].present?
-        assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+      context "as a list" do
+        setup do
+          build_validator :not => ["image/png", "image/jpg", "image/jpeg"]
+          @dummy.stubs(:avatar_content_type => "image/gif")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
     end
 
-    context "with :message option" do
-      context "without interpolation" do
+    context "with a disallowed type" do
+      context "as a string" do
         setup do
-          build_validator :content_type => "image/png", :message => "should be a PNG image"
-          @dummy.stubs(:avatar_content_type => "image/jpg")
+          build_validator :not => "image/png"
+          @dummy.stubs(:avatar_content_type => "image/png")
           @validator.validate(@dummy)
         end
 
-        should "set a correct error message" do
-          assert_includes @dummy.errors[:avatar_content_type], "should be a PNG image"
+        should "set a correct default error message" do
+          assert @dummy.errors[:avatar_content_type].present?
+          assert_includes @dummy.errors[:avatar_content_type], "is invalid"
         end
       end
 
-      context "with interpolation" do
+      context "as a regexp" do
         setup do
-          build_validator :content_type => "image/png", :message => "should have content type %{types}"
-          @dummy.stubs(:avatar_content_type => "image/jpg")
+          build_validator :not => /^text\/.*/
+          @dummy.stubs(:avatar_content_type => "text/plain")
           @validator.validate(@dummy)
         end
 
-        should "set a correct error message" do
-          assert_includes @dummy.errors[:avatar_content_type], "should have content type image/png"
+        should "set a correct default error message" do
+          assert @dummy.errors[:avatar_content_type].present?
+          assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+        end
+      end
+
+      context "with :message option" do
+        context "without interpolation" do
+          setup do
+            build_validator :not => "image/png", :message => "should not be a PNG image"
+            @dummy.stubs(:avatar_content_type => "image/png")
+            @validator.validate(@dummy)
+          end
+
+          should "set a correct error message" do
+            assert_includes @dummy.errors[:avatar_content_type], "should not be a PNG image"
+          end
+        end
+
+        context "with interpolation" do
+          setup do
+            build_validator :not => "image/png", :message => "should not have content type %{types}"
+            @dummy.stubs(:avatar_content_type => "image/png")
+            @validator.validate(@dummy)
+          end
+
+          should "set a correct error message" do
+            assert_includes @dummy.errors[:avatar_content_type], "should not have content type image/png"
+          end
         end
       end
     end
@@ -185,8 +307,12 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
       end
     end
 
-    should "not raise arguemnt error if :content_type was given" do
+    should "not raise argument error if :content_type was given" do
       build_validator :content_type => "image/jpg"
     end
+
+    should "not raise argument error if :not was given" do
+      build_validator :not => "image/jpg"
+    end
   end
 end

data/test/validators/attachment_size_validator_test.rb

@@ -20,6 +20,11 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
         assert @dummy.errors[:avatar_file_size].blank?,
           "Expect an error message on :avatar_file_size, got none."
       end
+
+      should "not add error to the base dummy object" do
+        assert @dummy.errors[:avatar].blank?,
+          "Error added to base attribute"
+      end
     end
   end
 
@@ -35,6 +40,11 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
           "Unexpected error message on :avatar_file_size"
       end
 
+      should "add error to the base dummy object" do
+        assert @dummy.errors[:avatar].present?,
+          "Error not added to base attribute"
+      end
+
       if options[:message]
         should "return a correct error message" do
           assert_includes @dummy.errors[:avatar_file_size], options[:message]

data/test/validators_test.rb

@@ -7,7 +7,7 @@ class ValidatorsTest < Test::Unit::TestCase
 
   context "using the helper" do
     setup do
-      Dummy.validates_attachment :avatar, :presence => true, :content_type => { :content_type => "image/jpg" }, :size => { :in => 0..10.kilobytes }
+      Dummy.validates_attachment :avatar, :presence => true, :content_type => { :content_type => "image/jpeg" }, :size => { :in => 0..10.kilobytes }
     end
 
     should "add the attachment_presence validator to the class" do
@@ -21,5 +21,12 @@ class ValidatorsTest < Test::Unit::TestCase
     should "add the attachment_size validator to the class" do
       assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_size }
     end
+
+    should 'prevent you from attaching a file that violates that validation' do
+      Dummy.class_eval{ validate(:name) { raise "DO NOT RUN THIS" } }
+      dummy = Dummy.new(:avatar => File.new(fixture_file("12k.png")))
+      assert_equal [:avatar_content_type, :avatar, :avatar_file_size], dummy.errors.keys
+      assert_raise(RuntimeError){ dummy.valid? }
+    end
   end
 end