paperclip 2.8.0 → 3.0.2

data/test/geometry_test.rb

@@ -117,30 +117,30 @@ class GeometryTest < Test::Unit::TestCase
 
     should "not generate from a bad file" do
       file = "/home/This File Does Not Exist.omg"
-      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::Errors::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     should "not generate from a blank filename" do
       file = ""
-      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::Errors::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     should "not generate from a nil file" do
       file = nil
-      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::Errors::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     should "not generate from a file with no path" do
       file = mock("file", :path => "")
       file.stubs(:respond_to?).with(:path).returns(true)
-      assert_raise(Paperclip::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
+      assert_raise(Paperclip::Errors::NotIdentifiedByImageMagickError){ @geo = Paperclip::Geometry.from_file(file) }
     end
 
     should "let us know when a command isn't found versus a processing error" do
       old_path = ENV['PATH']
       begin
         ENV['PATH'] = ''
-        assert_raises(Paperclip::CommandNotFoundError) do
+        assert_raises(Paperclip::Errors::CommandNotFoundError) do
           file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
           @geo = Paperclip::Geometry.from_file(file)
         end

data/test/helper.rb

@@ -5,14 +5,15 @@ require 'test/unit'
 
 require 'shoulda'
 require 'mocha'
+require 'bourne'
 
 require 'active_record'
 require 'active_record/version'
 require 'active_support'
+require 'active_support/core_ext'
 require 'mime/types'
 require 'pathname'
-
-require 'pathname'
+require 'ostruct'
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 
@@ -26,13 +27,6 @@ end
 
 ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 
-def silence_warnings
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  yield
-ensure
-  $VERBOSE = old_verbose
-end
-
 class Test::Unit::TestCase
   def setup
     silence_warnings do
@@ -66,7 +60,11 @@ def reset_class class_name
   ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, class_name) rescue nil
   klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
-  klass.class_eval{ include Paperclip::Glue }
+
+  klass.class_eval do
+    include Paperclip::Glue
+  end
+
   klass
 end
 
@@ -121,7 +119,7 @@ class FakeModel
 
 end
 
-def attachment options
+def attachment(options={})
   Paperclip::Attachment.new(:avatar, FakeModel.new, options)
 end
 

data/test/identity_adapter_test.rb

@@ -0,0 +1,8 @@
+require './test/helper'
+
+class IdentityAdapterTest < Test::Unit::TestCase
+  should "respond to #new by returning the argument" do
+    adapter = Paperclip::IdentityAdapter.new
+    assert_equal :target, adapter.new(:target)
+  end
+end

data/test/integration_test.rb

@@ -40,12 +40,16 @@ class IntegrationTest < Test::Unit::TestCase
 
       should "not raise an error" do
         assert_nothing_raised do
-          @dummy.avatar.reprocess!
+          silence_stream(STDERR) do
+            @dummy.avatar.reprocess!
+          end
         end
       end
 
       should "return false" do
-        assert ! @dummy.avatar.reprocess!
+        silence_stream(STDERR) do
+          assert !@dummy.avatar.reprocess!
+        end
       end
 
       teardown { File.chmod(0644, @dummy.avatar.path) }
@@ -54,7 +58,6 @@ class IntegrationTest < Test::Unit::TestCase
     context "redefining its attachment styles" do
       setup do
         Dummy.class_eval do
-          has_attached_file :avatar, :styles => { :thumb => "150x25#" }
           has_attached_file :avatar, :styles => { :thumb => "150x25#", :dynamic => lambda { |a| '50x50#' } }
         end
         @d2 = Dummy.find(@dummy.id)
@@ -71,26 +74,12 @@ class IntegrationTest < Test::Unit::TestCase
       should "change the timestamp" do
         assert_not_equal @original_timestamp, @d2.avatar_updated_at
       end
-
-      should "clean up the old original if it is a tempfile" do
-        original = @d2.avatar.to_file(:original)
-        tf = Paperclip::Tempfile.new('original')
-        tf.binmode
-        original.binmode
-        tf.write(original.read)
-        original.close
-        tf.rewind
-
-        @d2.avatar.expects(:to_file).with(:original).returns(tf)
-
-        @d2.avatar.reprocess!
-      end
     end
   end
 
   context "Attachment" do
     setup do
-      @thumb_path = "./test/../public/system/avatars/1/thumb/5k.png"
+      @thumb_path = "./test/../public/system/dummies/avatars/000/000/001/thumb/5k.png"
       File.delete(@thumb_path) if File.exists?(@thumb_path)
       rebuild_model :styles => { :thumb => "50x50#" }
       @dummy = Dummy.new
@@ -119,8 +108,8 @@ class IntegrationTest < Test::Unit::TestCase
 
   context "Attachment with no generated thumbnails" do
     setup do
-      @thumb_small_path = "./test/../public/system/avatars/1/thumb_small/5k.png"
-      @thumb_large_path = "./test/../public/system/avatars/1/thumb_large/5k.png"
+      @thumb_small_path = "./test/../public/system/dummies/avatars/000/000/001/thumb_small/5k.png"
+      @thumb_large_path = "./test/../public/system/dummies/avatars/000/000/001/thumb_large/5k.png"
       File.delete(@thumb_small_path) if File.exists?(@thumb_small_path)
       File.delete(@thumb_large_path) if File.exists?(@thumb_large_path)
       rebuild_model :styles => { :thumb_small => "50x50#", :thumb_large => "60x60#" }
@@ -171,7 +160,7 @@ class IntegrationTest < Test::Unit::TestCase
     end
 
     should "report the file size of the processed file and not the original" do
-      assert_not_equal @file.size, @dummy.avatar.size
+      assert_not_equal File.size(@file.path), @dummy.avatar.size
     end
 
     teardown { @file.close }
@@ -223,48 +212,6 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
-  context "A model with no attachment validation" do
-    setup do
-      rebuild_model :styles => { :large => "300x300>",
-                                 :medium => "100x100",
-                                 :thumb => ["32x32#", :gif] },
-                    :default_style => :medium,
-                    :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                    :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
-      @dummy     = Dummy.new
-    end
-
-    should "have its definition return false when asked about whiny_thumbnails" do
-      assert ! Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
-    end
-
-    context "when validates_attachment_thumbnails is called" do
-      setup do
-        Dummy.validates_attachment_thumbnails :avatar
-      end
-
-      should "have its definition return true when asked about whiny_thumbnails" do
-        assert_equal true, Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
-      end
-    end
-
-    context "redefined to have attachment validations" do
-      setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
-                      :whiny_thumbnails => true,
-                      :default_style => :medium,
-                      :url => "/:attachment/:class/:style/:id/:basename.:extension",
-                      :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
-      end
-
-      should "have its definition return true when asked about whiny_thumbnails" do
-        assert_equal true, Dummy.attachment_definitions[:avatar][:whiny_thumbnails]
-      end
-    end
-  end
-
   context "A model with no convert_options setting" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
@@ -329,12 +276,32 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
+  [000,002,022].each do |umask|
+    context "when the umask is #{umask}" do
+      setup do
+        rebuild_model
+        @dummy = Dummy.new
+        @file  = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+        @umask = File.umask(umask)
+      end
+
+      teardown do
+        File.umask @umask
+      end
+
+      should "respect the current umask" do
+        @dummy.avatar = @file
+        @dummy.save
+        assert_equal 0666&~umask, 0666&File.stat(@dummy.avatar.path).mode
+      end
+    end
+  end
+
   context "A model with a filesystem attachment" do
     setup do
       rebuild_model :styles => { :large => "300x300>",
                                  :medium => "100x100",
                                  :thumb => ["32x32#", :gif] },
-                    :whiny_thumbnails => true,
                     :default_style => :medium,
                     :url => "/:attachment/:class/:style/:id/:basename.:extension",
                     :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
@@ -365,8 +332,6 @@ class IntegrationTest < Test::Unit::TestCase
       assert_equal "100x15", `identify -format "%wx%h" "#{@d2.avatar.path(:medium)}"`.chomp
       assert_equal "32x32",  `identify -format "%wx%h" "#{@d2.avatar.path(:thumb)}"`.chomp
 
-      @dummy.avatar = "not a valid file but not nil"
-      assert_equal File.basename(@file.path), @dummy.avatar_file_name
       assert @dummy.valid?
       assert @dummy.save
 
@@ -405,13 +370,13 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
 
-    should "know the difference between good files, bad files, and not files" do
-      expected = @dummy.avatar.to_file
-      @dummy.avatar = "not a file"
-      assert @dummy.valid?
-      assert_equal expected.path, @dummy.avatar.path
-      expected.close
+    should "not abide things that don't have adapters" do
+      assert_raises(Paperclip::AdapterRegistry::NoHandlerError) do
+        @dummy.avatar = "not a file"
+      end
+    end
 
+    should "not be ok with bad files" do
       @dummy.avatar = @bad_file
       assert ! @dummy.valid?
     end
@@ -427,31 +392,13 @@ class IntegrationTest < Test::Unit::TestCase
 
     should "be able to reload without saving and not have the file disappear" do
       @dummy.avatar = @file
-      assert @dummy.save
+      assert @dummy.save, @dummy.errors.full_messages.inspect
       @dummy.avatar.clear
       assert_nil @dummy.avatar_file_name
       @dummy.reload
       assert_equal "5k.png", @dummy.avatar_file_name
     end
 
-    [000,002,022].each do |umask|
-      context "when the umask is #{umask}" do
-        setup do
-          @umask = File.umask umask
-        end
-
-        teardown do
-          File.umask @umask
-        end
-
-        should "respect the current umask" do
-          @dummy.avatar = @file
-          @dummy.save
-          assert_equal 0666&~umask, 0666&File.stat(@dummy.avatar.path).mode
-        end
-      end
-    end
-
     context "that is assigned its file from another Paperclip attachment" do
       setup do
         @dummy2 = Dummy.new
@@ -466,9 +413,9 @@ class IntegrationTest < Test::Unit::TestCase
 
         assert @dummy.avatar = @dummy2.avatar
         @dummy.save
+        assert_equal @dummy.avatar_file_name, @dummy2.avatar_file_name
         assert_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
                      `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
-        assert_equal @dummy.avatar_file_name, @dummy2.avatar_file_name
       end
     end
 
@@ -520,7 +467,6 @@ class IntegrationTest < Test::Unit::TestCase
                                    :medium => "100x100",
                                    :thumb => ["32x32#", :gif] },
                       :storage => :s3,
-                      :whiny_thumbnails => true,
                       :s3_credentials => File.new(File.join(File.dirname(__FILE__), "s3.yml")),
                       :default_style => :medium,
                       :bucket => ENV['S3_TEST_BUCKET'],
@@ -549,7 +495,6 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       should "have the same contents as the original" do
-        @file.rewind
         assert_equal @file.read, @files_on_s3[:original].read
       end
 

data/test/interpolations_test.rb

@@ -77,6 +77,13 @@ class InterpolationsTest < Test::Unit::TestCase
     assert_equal "found", interpolations.content_type_extension(attachment, :style)
   end
 
+  should "be able to handle numeric style names" do
+    attachment = mock(
+      :styles => {:"4" => {:format => :expected_extension}}
+    )
+    assert_equal :expected_extension, Paperclip::Interpolations.extension(attachment, 4)
+  end
+
   should "return the #to_param of the attachment" do
     attachment = mock
     attachment.expects(:to_param).returns("23-awesome")
@@ -148,7 +155,7 @@ class InterpolationsTest < Test::Unit::TestCase
         Paperclip::Interpolations.url(self, :style)
       end
     end
-    assert_raises(Paperclip::InfiniteInterpolationError){ Paperclip::Interpolations.url(attachment, :style) }
+    assert_raises(Paperclip::Errors::InfiniteInterpolationError){ Paperclip::Interpolations.url(attachment, :style) }
   end
 
   should "return the filename as basename.extension" do

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -34,7 +34,7 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
       end
     end
 
-    context "validates_attachment_size with infinite range" do
+    context "allowing anything" do
       setup{ @matcher = self.class.validate_attachment_size(:avatar) }
 
       context "given a class with an upper limit" do
@@ -42,7 +42,7 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
         should_accept_dummy_class
       end
 
-      context "given a class with no upper limit" do
+      context "given a class with a lower limit" do
         setup { @dummy_class.validates_attachment_size :avatar, :greater_than => 1 }
         should_accept_dummy_class
       end
@@ -68,5 +68,19 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
         assert_rejects @matcher, @dummy
       end
     end
+
+    context "post processing" do
+      setup do
+        @dummy_class.validates_attachment_size :avatar, :greater_than => 1024
+
+        @dummy = @dummy_class.new
+        @matcher = self.class.validate_attachment_size(:avatar).greater_than(1024)
+      end
+
+      should "be skipped" do
+        @dummy.avatar.expects(:post_process).never
+        assert_accepts @matcher, @dummy
+      end
+    end
   end
 end

data/test/nil_adapter_test.rb

@@ -0,0 +1,25 @@
+require './test/helper'
+
+class NilAdapterTest < Test::Unit::TestCase
+  context 'a new instance' do
+    setup do
+      @subject = Paperclip.io_adapters.for(nil)
+    end
+
+    should "get the right filename" do
+      assert_equal "", @subject.original_filename
+    end
+
+    should "get the content type" do
+      assert_equal "", @subject.content_type
+    end
+
+    should "get the file's size" do
+      assert_equal 0, @subject.size
+    end
+
+    should "return true for a call to nil?" do
+      assert @subject.nil?
+    end
+  end
+end

data/test/paperclip_test.rb

@@ -22,16 +22,34 @@ class PaperclipTest < Test::Unit::TestCase
       Paperclip.run("convert", "stuff")
       assert_equal [Cocaine::CommandLine.path].flatten.include?("/opt/my_app/bin"), true
     end
-  end
 
-  should 'not raise errors when doing a lot of running' do
-    Paperclip.options[:command_path] = ["/usr/local/bin"] * 1024
-    Cocaine::CommandLine.path = "/something/else"
-    100.times do |x|
-      Paperclip.run("echo", x.to_s)
+    should "not duplicate Cocaine::CommandLine.path on multiple runs" do
+      Cocaine::CommandLine.expects(:new).with("convert", "more_stuff", {}).returns(stub(:run))
+      Cocaine::CommandLine.path = nil
+      Paperclip.options[:command_path] = "/opt/my_app/bin"
+      Paperclip.run("convert", "stuff")
+      Paperclip.run("convert", "more_stuff")
+      assert_equal 1, [Cocaine::CommandLine.path].flatten.size
     end
   end
 
+  context "Calling Paperclip.log without options[:logger] set" do
+    setup do
+      Paperclip.logger = nil
+      Paperclip.options[:logger] = nil
+    end
+
+    teardown do
+      Paperclip.options[:logger] = ActiveRecord::Base.logger
+      Paperclip.logger = ActiveRecord::Base.logger
+    end
+
+    should "not raise an error when log is called" do
+      silence_stream(STDOUT) do
+        Paperclip.log('something')
+      end
+    end
+  end
   context "Calling Paperclip.run with a logger" do
     should "pass the defined logger if :log_command is set" do
       Paperclip.options[:log_command] = true
@@ -48,6 +66,7 @@ class PaperclipTest < Test::Unit::TestCase
       d3 = Dummy.create(:avatar => @file)
       @expected = [d1, d3]
     end
+
     should "yield every instance of a model that has an attachment" do
       actual = []
       Paperclip.each_instance_with_attachment("Dummy", "avatar") do |instance|
@@ -86,12 +105,13 @@ class PaperclipTest < Test::Unit::TestCase
     end
 
     should "generate warning if attachment is redefined with the same url string" do
-      Paperclip.expects(:log).with("Duplicate URL for blah with /system/:attachment/:id/:style/:filename. This will clash with attachment defined in Dummy class")
+      expected_log_msg = "Duplicate URL for blah with /system/:id/:style/:filename. This will clash with attachment defined in Dummy class"
+      Paperclip.expects(:log).with(expected_log_msg)
       Dummy.class_eval do
-        has_attached_file :blah
+        has_attached_file :blah, :url => '/system/:id/:style/:filename'
       end
       Dummy2.class_eval do
-        has_attached_file :blah
+        has_attached_file :blah, :url => '/system/:id/:style/:filename'
       end
     end
 
@@ -164,6 +184,7 @@ class PaperclipTest < Test::Unit::TestCase
       end
 
       teardown do
+        SubDummy.delete_all
         Object.send(:remove_const, "SubDummy") rescue nil
       end
     end
@@ -187,191 +208,11 @@ class PaperclipTest < Test::Unit::TestCase
       end
     end
 
-    context "a validation with an if guard clause" do
-      context "as a lambda" do
-        setup do
-          Dummy.send(:"validates_attachment_presence", :avatar, :if => lambda{|i| i.foo })
-          @dummy = Dummy.new
-          @dummy.stubs(:avatar_file_name).returns(nil)
-        end
-
-        should "attempt validation if the guard returns true" do
-          @dummy.expects(:foo).returns(true)
-          assert ! @dummy.valid?
-        end
-
-        should "not attempt validation if the guard returns false" do
-          @dummy.expects(:foo).returns(false)
-          assert @dummy.valid?
-        end
-      end
-
-      context "as a method name" do
-        setup do
-          Dummy.send(:"validates_attachment_presence", :avatar, :if => :foo)
-          @dummy = Dummy.new
-          @dummy.stubs(:avatar_file_name).returns(nil)
-        end
-
-        should "attempt validation if the guard returns true" do
-          @dummy.expects(:foo).returns(true)
-          assert ! @dummy.valid?
-        end
-
-        should "not attempt validation if the guard returns false" do
-          @dummy.expects(:foo).returns(false)
-          assert @dummy.valid?
-        end
-      end
-    end
-
-    context "a validation with an unless guard clause" do
-      context "as a lambda" do
-        setup do
-          Dummy.send(:"validates_attachment_presence", :avatar, :unless => lambda{|i| i.foo })
-          @dummy = Dummy.new
-          @dummy.stubs(:avatar_file_name).returns(nil)
-        end
-
-        should "attempt validation if the guard returns true" do
-          @dummy.expects(:foo).returns(false)
-          assert ! @dummy.valid?
-        end
-
-        should "not attempt validation if the guard returns false" do
-          @dummy.expects(:foo).returns(true)
-          assert @dummy.valid?
-        end
-      end
-
-      context "as a method name" do
-        setup do
-          Dummy.send(:"validates_attachment_presence", :avatar, :unless => :foo)
-          @dummy = Dummy.new
-          @dummy.stubs(:avatar_file_name).returns(nil)
-        end
-
-        should "attempt validation if the guard returns true" do
-          @dummy.expects(:foo).returns(false)
-          assert ! @dummy.valid?
-        end
-
-        should "not attempt validation if the guard returns false" do
-          @dummy.expects(:foo).returns(true)
-          assert @dummy.valid?
-        end
-      end
-    end
-
     should "not have Attachment in the ActiveRecord::Base namespace" do
       assert_raises(NameError) do
         ActiveRecord::Base::Attachment
       end
     end
-
-    def self.should_validate validation, options, valid_file, invalid_file
-      context "with #{validation} validation and #{options.inspect} options" do
-        setup do
-          rebuild_class
-          Dummy.send(:"validates_attachment_#{validation}", :avatar, options)
-          @dummy = Dummy.new
-        end
-        context "and assigning nil" do
-          setup do
-            @dummy.avatar = nil
-            @dummy.valid?
-          end
-          if validation == :presence
-            should "have an error on the attachment" do
-              assert @dummy.errors[:avatar]
-              assert @dummy.errors[:avatar_file_name]
-            end
-          else
-            should "not have an error on the attachment" do
-              assert @dummy.errors.blank?, @dummy.errors.full_messages.join(", ")
-            end
-          end
-        end
-        context "and assigned a valid file" do
-          setup do
-            @dummy.avatar = valid_file
-            @dummy.valid?
-          end
-          should "not have an error" do
-            assert_equal 0, @dummy.errors.size, @dummy.errors.full_messages.join(", ")
-          end
-        end
-        context "and assigned an invalid file" do
-          setup do
-            @dummy.avatar = invalid_file
-            @dummy.valid?
-          end
-          should "have an error" do
-            assert @dummy.errors.size > 0
-          end
-        end
-      end
-    end
-
-    [[:presence,      {},                              "5k.png",   nil],
-     [:size,          {:in => 1..10240},               "5k.png",   "12k.png"],
-     [:size,          {:less_than => 10240},           "5k.png",   "12k.png"],
-     [:size,          {:greater_than => 8096},         "12k.png",  "5k.png"],
-     [:content_type,  {:content_type => "image/png"},  "5k.png",   "text.txt"],
-     [:content_type,  {:content_type => "text/plain"}, "text.txt", "5k.png"],
-     [:content_type,  {:content_type => %r{image/.*}}, "5k.png",   "text.txt"]].each do |args|
-      validation, options, valid_file, invalid_file = args
-      valid_file   &&= File.open(File.join(FIXTURES_DIR, valid_file), "rb")
-      invalid_file &&= File.open(File.join(FIXTURES_DIR, invalid_file), "rb")
-
-      should_validate validation, options, valid_file, invalid_file
-    end
-
-    context "with content_type validation and lambda message" do
-      context "and assigned an invalid file" do
-        setup do
-          Dummy.send(:"validates_attachment_content_type", :avatar, :content_type => %r{image/.*}, :message => lambda {'lambda content type message'})
-          @dummy = Dummy.new
-          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "text.txt"), "rb")
-          @dummy.valid?
-        end
-
-        should "have a content type error message" do
-          assert [@dummy.errors[:avatar_content_type]].flatten.any?{|error| error =~ %r/lambda content type message/ }
-        end
-      end
-    end
-
-    context "with size validation and less_than 10240 option" do
-      context "and assigned an invalid file" do
-        setup do
-          Dummy.send(:"validates_attachment_size", :avatar, :less_than => 10240)
-          @dummy = Dummy.new
-          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "12k.png"), "rb")
-          @dummy.valid?
-        end
-
-        should "have a file size min/max error message" do
-          assert [@dummy.errors[:avatar_file_size]].flatten.any?{|error| error =~ %r/between 0 and 10240 bytes/ }
-        end
-      end
-    end
-
-    context "with size validation and less_than 10240 option with lambda message" do
-      context "and assigned an invalid file" do
-        setup do
-          Dummy.send(:"validates_attachment_size", :avatar, :less_than => 10240, :message => lambda {'lambda between 0 and 10240 bytes'})
-          @dummy = Dummy.new
-          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "12k.png"), "rb")
-          @dummy.valid?
-        end
-
-        should "have a file size min/max error message" do
-          assert [@dummy.errors[:avatar_file_size]].flatten.any?{|error| error =~ %r/lambda between 0 and 10240 bytes/ }
-        end
-      end
-    end
-
   end
 
   context "configuring a custom processor" do