paperclip 4.1.1 → 4.2.0

data/test/validators/attachment_file_name_validator_test.rb

@@ -1,162 +0,0 @@
-require './test/helper'
-
-class AttachmentFileNameValidatorTest < Test::Unit::TestCase
-  def setup
-    rebuild_model
-    @dummy = Dummy.new
-    super
-  end
-
-  def build_validator(options)
-    @validator = Paperclip::Validators::AttachmentFileNameValidator.new(options.merge(
-      :attributes => :avatar
-    ))
-  end
-
-  context "with a failing validation" do
-    setup do
-      build_validator :matches => /.*\.png$/, :allow_nil => false
-      @dummy.stubs(:avatar_file_name => "data.txt")
-      @validator.validate(@dummy)
-    end
-
-    should "add error to the base object" do
-      assert @dummy.errors[:avatar].present?,
-        "Error not added to base attribute"
-    end
-
-    should "add error to base object as a string" do
-      assert_kind_of String, @dummy.errors[:avatar].first,
-        "Error added to base attribute as something other than a String"
-    end
-  end
-
-  should "not add error to the base object with a successful validation" do
-    build_validator :matches => /.*\.png$/, :allow_nil => false
-    @dummy.stubs(:avatar_file_name => "image.png")
-    @validator.validate(@dummy)
-
-    assert @dummy.errors[:avatar].blank?, "Error was added to base attribute"
-  end
-
-  context "whitelist format" do
-    context "with an allowed type" do
-      context "as a single regexp" do
-        setup do
-          build_validator :matches => /.*\.jpg$/
-          @dummy.stubs(:avatar_file_name => "image.jpg")
-          @validator.validate(@dummy)
-        end
-
-        should "not set an error message" do
-          assert @dummy.errors[:avatar_file_name].blank?
-        end
-      end
-
-      context "as a list" do
-        setup do
-          build_validator :matches => [/.*\.png$/, /.*\.jpe?g$/]
-          @dummy.stubs(:avatar_file_name => "image.jpg")
-          @validator.validate(@dummy)
-        end
-
-        should "not set an error message" do
-          assert @dummy.errors[:avatar_file_name].blank?
-        end
-      end
-    end
-
-    context "with a disallowed type" do
-      should "set a correct default error message" do
-        build_validator :matches => /^text\/.*/
-        @dummy.stubs(:avatar_file_name => "image.jpg")
-        @validator.validate(@dummy)
-
-        assert @dummy.errors[:avatar_file_name].present?
-        assert_includes @dummy.errors[:avatar_file_name], "is invalid"
-      end
-
-      should "set a correct custom error message" do
-        build_validator :matches => /.*\.png$/, :message => "should be a PNG image"
-        @dummy.stubs(:avatar_file_name => "image.jpg")
-        @validator.validate(@dummy)
-
-        assert_includes @dummy.errors[:avatar_file_name], "should be a PNG image"
-      end
-    end
-  end
-
-  context "blacklist format" do
-    context "with an allowed type" do
-      context "as a single regexp" do
-        setup do
-          build_validator :not => /^text\/.*/
-          @dummy.stubs(:avatar_file_name => "image.jpg")
-          @validator.validate(@dummy)
-        end
-
-        should "not set an error message" do
-          assert @dummy.errors[:avatar_file_name].blank?
-        end
-      end
-
-      context "as a list" do
-        setup do
-          build_validator :not => [/.*\.png$/, /.*\.jpe?g$/]
-          @dummy.stubs(:avatar_file_name => "image.gif")
-          @validator.validate(@dummy)
-        end
-
-        should "not set an error message" do
-          assert @dummy.errors[:avatar_file_name].blank?
-        end
-      end
-    end
-
-    context "with a disallowed type" do
-      should "set a correct default error message" do
-        build_validator :not => /data.*/
-        @dummy.stubs(:avatar_file_name => "data.txt")
-        @validator.validate(@dummy)
-
-        assert @dummy.errors[:avatar_file_name].present?
-        assert_includes @dummy.errors[:avatar_file_name], "is invalid"
-      end
-
-      should "set a correct custom error message" do
-        build_validator :not => /.*\.png$/, :message => "should not be a PNG image"
-        @dummy.stubs(:avatar_file_name => "image.png")
-        @validator.validate(@dummy)
-
-        assert_includes @dummy.errors[:avatar_file_name], "should not be a PNG image"
-      end
-    end
-  end
-
-  context "using the helper" do
-    setup do
-      Dummy.validates_attachment_file_name :avatar, :matches => /.*\.jpg$/
-    end
-
-    should "add the validator to the class" do
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_file_name }
-    end
-  end
-
-  context "given options" do
-    should "raise argument error if no required argument was given" do
-      assert_raises(ArgumentError) do
-        build_validator :message => "Some message"
-      end
-    end
-
-    should "not raise argument error if :matches was given" do
-      build_validator :matches => /.*\.jpg$/
-    end
-
-    should "not raise argument error if :not was given" do
-      build_validator :not => /.*\.jpg$/
-    end
-  end
-end
-

data/test/validators_test.rb

@@ -1,101 +0,0 @@
-require './test/helper'
-
-class ValidatorsTest < Test::Unit::TestCase
-  include ActiveSupport::Testing::Deprecation
-
-  def setup
-    rebuild_model
-  end
-
-  context "using the helper" do
-    setup do
-      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
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_presence }
-    end
-
-    should "add the attachment_content_type validator to the class" do
-      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_content_type }
-    end
-
-    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
-
-  context "using the helper with a conditional" do
-    setup do
-      Dummy.validates_attachment :avatar, :presence => true,
-        :content_type => { :content_type => "image/jpeg" },
-        :size => { :in => 0..10.kilobytes },
-        :if => :title_present?
-    end
-
-    should "validate the attachment if title is present" do
-      Dummy.class_eval do
-        def title_present?
-          true
-        end
-      end
-      dummy = Dummy.new(:avatar => File.new(fixture_file("12k.png")))
-      assert_equal [:avatar_content_type, :avatar, :avatar_file_size], dummy.errors.keys
-    end
-
-    should "not validate attachment if tile is not present" do
-      Dummy.class_eval do
-        def title_present?
-          false
-        end
-      end
-      dummy = Dummy.new(:avatar => File.new(fixture_file("12k.png")))
-      assert_equal [], dummy.errors.keys
-    end
-  end
-
-  context 'with no other validations on the Dummy#avatar attachment' do
-    setup do
-      reset_class("Dummy")
-      Dummy.has_attached_file :avatar
-      Paperclip.reset_duplicate_clash_check!
-    end
-
-    should 'raise an error when no content_type validation exists' do
-      assert_raises(Paperclip::Errors::MissingRequiredValidatorError) do
-        Dummy.new(:avatar => File.new(fixture_file("12k.png")))
-      end
-    end
-
-    should 'not raise an error when a content_type validation exists' do
-      Dummy.validates_attachment :avatar, :content_type => { :content_type => "image/jpeg" }
-
-      assert_nothing_raised(Paperclip::Errors::MissingRequiredValidatorError) do 
-        Dummy.new(:avatar => File.new(fixture_file("12k.png")))
-      end
-    end
-
-    should 'not raise an error when a file_name validation exists' do
-      Dummy.validates_attachment :avatar, :file_name => { :matches => /png$/ }
-
-      assert_nothing_raised(Paperclip::Errors::MissingRequiredValidatorError) do 
-        Dummy.new(:avatar => File.new(fixture_file("12k.png")))
-      end
-    end
-
-    should 'not raise an error when a the validation has been explicitly rejected' do
-      Dummy.validates_attachment :avatar, :file_type_ignorance => true
-
-      assert_nothing_raised(Paperclip::Errors::MissingRequiredValidatorError) do
-        Dummy.new(:avatar => File.new(fixture_file("12k.png")))
-      end
-    end
-  end
-end