RubyGems - spree - Versions diffs - 0.9.4 → 0.10.0.beta - Mend

@@ -1,177 +0,0 @@
-require 'test/helper'
-class GeometryTest < Test::Unit::TestCase
-  context "Paperclip::Geometry" do
-    should "correctly report its given dimensions" do
-      assert @geo = Paperclip::Geometry.new(1024, 768)
-      assert_equal 1024, @geo.width
-      assert_equal 768, @geo.height
-    end
-    should "set height to 0 if height dimension is missing" do
-      assert @geo = Paperclip::Geometry.new(1024)
-      assert_equal 1024, @geo.width
-      assert_equal 0, @geo.height
-    end
-    should "set width to 0 if width dimension is missing" do
-      assert @geo = Paperclip::Geometry.new(nil, 768)
-      assert_equal 0, @geo.width
-      assert_equal 768, @geo.height
-    end
-    should "be generated from a WxH-formatted string" do
-      assert @geo = Paperclip::Geometry.parse("800x600")
-      assert_equal 800, @geo.width
-      assert_equal 600, @geo.height
-    end
-    should "be generated from a xH-formatted string" do
-      assert @geo = Paperclip::Geometry.parse("x600")
-      assert_equal 0, @geo.width
-      assert_equal 600, @geo.height
-    end
-    should "be generated from a Wx-formatted string" do
-      assert @geo = Paperclip::Geometry.parse("800x")
-      assert_equal 800, @geo.width
-      assert_equal 0, @geo.height
-    end
-    should "be generated from a W-formatted string" do
-      assert @geo = Paperclip::Geometry.parse("800")
-      assert_equal 800, @geo.width
-      assert_equal 0, @geo.height
-    end
-    should "ensure the modifier is nil if not present" do
-      assert @geo = Paperclip::Geometry.parse("123x456")
-      assert_nil @geo.modifier
-    end
-    should "treat x and X the same in geometries" do
-      @lower = Paperclip::Geometry.parse("123x456")
-      @upper = Paperclip::Geometry.parse("123X456")
-      assert_equal 123, @lower.width
-      assert_equal 123, @upper.width
-      assert_equal 456, @lower.height
-      assert_equal 456, @upper.height
-    end
-    ['>', '<', '#', '@', '%', '^', '!', nil].each do |mod|
-      should "ensure the modifier #{mod.inspect} is preserved" do
-        assert @geo = Paperclip::Geometry.parse("123x456#{mod}")
-        assert_equal mod, @geo.modifier
-        assert_equal "123x456#{mod}", @geo.to_s
-      end
-    end
-    ['>', '<', '#', '@', '%', '^', '!', nil].each do |mod|
-      should "ensure the modifier #{mod.inspect} is preserved with no height" do
-        assert @geo = Paperclip::Geometry.parse("123x#{mod}")
-        assert_equal mod, @geo.modifier
-        assert_equal "123#{mod}", @geo.to_s
-      end
-    end
-    should "make sure the modifier gets passed during transformation_to" do
-      assert @src = Paperclip::Geometry.parse("123x456")
-      assert @dst = Paperclip::Geometry.parse("123x456>")
-      assert_equal "123x456>", @src.transformation_to(@dst).to_s
-    end
-    should "generate correct ImageMagick formatting string for W-formatted string" do
-      assert @geo = Paperclip::Geometry.parse("800")
-      assert_equal "800", @geo.to_s
-    end
-    should "generate correct ImageMagick formatting string for Wx-formatted string" do
-      assert @geo = Paperclip::Geometry.parse("800x")
-      assert_equal "800", @geo.to_s
-    end
-    should "generate correct ImageMagick formatting string for xH-formatted string" do
-      assert @geo = Paperclip::Geometry.parse("x600")
-      assert_equal "x600", @geo.to_s
-    end
-    should "generate correct ImageMagick formatting string for WxH-formatted string" do
-      assert @geo = Paperclip::Geometry.parse("800x600")
-      assert_equal "800x600", @geo.to_s
-    end
-    should "be generated from a file" do
-      file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
-      file = File.new(file, 'rb')
-      assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
-      assert @geo.height > 0
-      assert @geo.width > 0
-    end
-    should "be generated from a file path" do
-      file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
-      assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
-      assert @geo.height > 0
-      assert @geo.width > 0
-    end
-    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) }
-    end
-    [['vertical',   900,  1440, true,  false, false, 1440, 900, 0.625],
-     ['horizontal', 1024, 768,  false, true,  false, 1024, 768, 1.3333],
-     ['square',     100,  100,  false, false, true,  100,  100, 1]].each do |args|
-      context "performing calculations on a #{args[0]} viewport" do
-        setup do
-          @geo = Paperclip::Geometry.new(args[1], args[2])
-        end
-        should "#{args[3] ? "" : "not"} be vertical" do
-          assert_equal args[3], @geo.vertical?
-        end
-        should "#{args[4] ? "" : "not"} be horizontal" do
-          assert_equal args[4], @geo.horizontal?
-        end
-        should "#{args[5] ? "" : "not"} be square" do
-          assert_equal args[5], @geo.square?
-        end
-        should "report that #{args[6]} is the larger dimension" do
-          assert_equal args[6], @geo.larger
-        end
-        should "report that #{args[7]} is the smaller dimension" do
-          assert_equal args[7], @geo.smaller
-        end
-        should "have an aspect ratio of #{args[8]}" do
-          assert_in_delta args[8], @geo.aspect, 0.0001
-        end
-      end
-    end
-    [[ [1000, 100], [64, 64],  "x64", "64x64+288+0" ],
-     [ [100, 1000], [50, 950], "x950", "50x950+22+0" ],
-     [ [100, 1000], [50, 25],  "50x", "50x25+0+237" ]]. each do |args|
-      context "of #{args[0].inspect} and given a Geometry #{args[1].inspect} and sent transform_to" do
-        setup do
-          @geo = Paperclip::Geometry.new(*args[0])
-          @dst = Paperclip::Geometry.new(*args[1])
-          @scale, @crop = @geo.transformation_to @dst, true
-        end
-        should "be able to return the correct scaling transformation geometry #{args[2]}" do
-          assert_equal args[2], @scale
-        end
-        should "be able to return the correct crop transformation geometry #{args[3]}" do
-          assert_equal args[3], @crop
-        end
-      end
-    end
-  end
-end

data/vendor/plugins/paperclip/test/helper.rb DELETED

@@ -1,100 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-gem 'thoughtbot-shoulda', ">= 2.9.0"
-require 'shoulda'
-require 'mocha'
-require 'tempfile'
-gem 'sqlite3-ruby'
-require 'active_record'
-require 'active_support'
-begin
-  require 'ruby-debug'
-rescue LoadError
-  puts "ruby-debug not loaded"
-end
-ROOT       = File.join(File.dirname(__FILE__), '..')
-RAILS_ROOT = ROOT
-RAILS_ENV  = "test"
-$LOAD_PATH << File.join(ROOT, 'lib')
-$LOAD_PATH << File.join(ROOT, 'lib', 'paperclip')
-require File.join(ROOT, 'lib', 'paperclip.rb')
-require 'shoulda_macros/paperclip'
-FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config['test'])
-def reset_class class_name
-  ActiveRecord::Base.send(:include, Paperclip)
-  Object.send(:remove_const, class_name) rescue nil
-  klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
-  klass.class_eval{ include Paperclip }
-  klass
-end
-def reset_table table_name, &block
-  block ||= lambda{ true }
-  ActiveRecord::Base.connection.create_table :dummies, {:force => true}, &block
-end
-def modify_table table_name, &block
-  ActiveRecord::Base.connection.change_table :dummies, &block
-end
-def rebuild_model options = {}
-  ActiveRecord::Base.connection.create_table :dummies, :force => true do |table|
-    table.column :other, :string
-    table.column :avatar_file_name, :string
-    table.column :avatar_content_type, :string
-    table.column :avatar_file_size, :integer
-    table.column :avatar_updated_at, :datetime
-  end
-  rebuild_class options
-end
-def rebuild_class options = {}
-  ActiveRecord::Base.send(:include, Paperclip)
-  Object.send(:remove_const, "Dummy") rescue nil
-  Object.const_set("Dummy", Class.new(ActiveRecord::Base))
-  Dummy.class_eval do
-    include Paperclip
-    has_attached_file :avatar, options
-  end
-end
-def temporary_rails_env(new_env)
-  old_env = Object.const_defined?("RAILS_ENV") ? RAILS_ENV : nil
-  silence_warnings do
-    Object.const_set("RAILS_ENV", new_env)
-  end
-  yield
-  silence_warnings do
-    Object.const_set("RAILS_ENV", old_env)
-  end
-end
-class FakeModel
-  attr_accessor :avatar_file_name,
-                :avatar_file_size,
-                :avatar_last_updated,
-                :avatar_content_type,
-                :id
-  def errors
-    @errors ||= []
-  end
-  def run_callbacks name, *args
-  end
-end
-def attachment options
-  Paperclip::Attachment.new(:avatar, FakeModel.new, options)
-end

data/vendor/plugins/paperclip/test/integration_test.rb DELETED

@@ -1,481 +0,0 @@
-require 'test/helper'
-class IntegrationTest < Test::Unit::TestCase
-  context "Many models at once" do
-    setup do
-      rebuild_model
-      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
-      300.times do |i|
-        Dummy.create! :avatar => @file
-      end
-    end
-    should "not exceed the open file limit" do
-       assert_nothing_raised do
-         dummies = Dummy.find(:all)
-         dummies.each { |dummy| dummy.avatar }
-       end
-    end
-  end
-  context "An attachment" do
-    setup do
-      rebuild_model :styles => { :thumb => "50x50#" }
-      @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
-      @dummy.avatar = @file
-      assert @dummy.save
-    end
-    teardown { @file.close }
-    should "create its thumbnails properly" do
-      assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
-    end
-    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)
-        @d2.avatar.reprocess!
-        @d2.save
-      end
-      should "create its thumbnails properly" do
-        assert_match /\b150x25\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
-        assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:dynamic)}"`
-      end
-    end
-  end
-  context "A model that modifies its original" do
-    setup do
-      rebuild_model :styles => { :original => "2x2#" }
-      @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
-      @dummy.avatar = @file
-    end
-    should "report the file size of the processed file and not the original" do
-      assert_not_equal @file.size, @dummy.avatar.size
-    end
-    teardown { @file.close }
-  end
-  context "A model with attachments scoped under an id" do
-    setup do
-      rebuild_model :styles => { :large => "100x100",
-                                 :medium => "50x50" },
-                    :path => ":rails_root/tmp/:id/:attachments/:style.:extension"
-      @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
-      @dummy.avatar = @file
-    end
-    teardown { @file.close }
-    context "when saved" do
-      setup do
-        @dummy.save
-        @saved_path = @dummy.avatar.path(:large)
-      end
-      should "have a large file in the right place" do
-        assert File.exists?(@dummy.avatar.path(:large))
-      end
-      context "and deleted" do
-        setup do
-          @dummy.avatar.clear
-          @dummy.save
-        end
-        should "not have a large file in the right place anymore" do
-          assert ! File.exists?(@saved_path)
-        end
-        should "not have its next two parent directories" do
-          assert ! File.exists?(File.dirname(@saved_path))
-          assert ! File.exists?(File.dirname(File.dirname(@saved_path)))
-        end
-        before_should "not die if an unexpected SystemCallError happens" do
-          FileUtils.stubs(:rmdir).raises(Errno::EPIPE)
-        end
-      end
-    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>",
-                                 :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 nil when asked about convert_options" do
-      assert ! Dummy.attachment_definitions[:avatar][:convert_options]
-    end
-    context "redefined to have convert_options setting" do
-      setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
-                      :convert_options => "-strip -depth 8",
-                      :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 convert_options value when asked about convert_options" do
-        assert_equal "-strip -depth 8", Dummy.attachment_definitions[:avatar][:convert_options]
-      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"
-      @dummy     = Dummy.new
-      @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
-      @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
-      assert @dummy.avatar = @file
-      assert @dummy.valid?
-      assert @dummy.save
-    end
-    should "write and delete its files" do
-      [["434x66", :original],
-       ["300x46", :large],
-       ["100x15", :medium],
-       ["32x32", :thumb]].each do |geo, style|
-        cmd = %Q[identify -format "%wx%h" "#{@dummy.avatar.path(style)}"]
-        assert_equal geo, `#{cmd}`.chomp, cmd
-      end
-      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.path(s) }
-      @d2 = Dummy.find(@dummy.id)
-      assert_equal "100x15", `identify -format "%wx%h" "#{@d2.avatar.path}"`.chomp
-      assert_equal "434x66", `identify -format "%wx%h" "#{@d2.avatar.path(:original)}"`.chomp
-      assert_equal "300x46", `identify -format "%wx%h" "#{@d2.avatar.path(:large)}"`.chomp
-      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
-      saved_paths.each do |p|
-        assert File.exists?(p)
-      end
-      @dummy.avatar.clear
-      assert_nil @dummy.avatar_file_name
-      assert @dummy.valid?
-      assert @dummy.save
-      saved_paths.each do |p|
-        assert ! File.exists?(p)
-      end
-      @d2 = Dummy.find(@dummy.id)
-      assert_nil @d2.avatar_file_name
-    end
-    should "work exactly the same when new as when reloaded" do
-      @d2 = Dummy.find(@dummy.id)
-      assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
-      [:thumb, :medium, :large, :original].each do |style|
-        assert_equal @dummy.avatar.path(style), @d2.avatar.path(style)
-      end
-      saved_paths = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.path(s) }
-      @d2.avatar.clear
-      assert @d2.save
-      saved_paths.each do |p|
-        assert ! File.exists?(p)
-      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
-      @dummy.avatar = @bad_file
-      assert ! @dummy.valid?
-    end
-    should "know the difference between good files, bad files, and not files when validating" do
-      Dummy.validates_attachment_presence :avatar
-      @d2 = Dummy.find(@dummy.id)
-      @d2.avatar = @file
-      assert   @d2.valid?, @d2.errors.full_messages.inspect
-      @d2.avatar = @bad_file
-      assert ! @d2.valid?
-    end
-    should "be able to reload without saving and not have the file disappear" do
-      @dummy.avatar = @file
-      assert @dummy.save
-      @dummy.avatar.clear
-      assert_nil @dummy.avatar_file_name
-      @dummy.reload
-      assert_equal "5k.png", @dummy.avatar_file_name
-    end
-    context "that is assigned its file from another Paperclip attachment" do
-      setup do
-        @dummy2 = Dummy.new
-        @file2  = File.new(File.join(FIXTURES_DIR, "12k.png"), 'rb')
-        assert  @dummy2.avatar = @file2
-        @dummy2.save
-      end
-      should "work when assigned a file" do
-        assert_not_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
-                         `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
-        assert @dummy.avatar = @dummy2.avatar
-        @dummy.save
-        assert_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
-                     `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
-      end
-    end
-  end
-  context "A model with an attachments association and a Paperclip attachment" do
-    setup do
-      Dummy.class_eval do
-        has_many :attachments, :class_name => 'Dummy'
-      end
-      @dummy = Dummy.new
-      @dummy.avatar = File.new(File.join(File.dirname(__FILE__),
-                               "fixtures",
-                               "5k.png"), 'rb')
-    end
-    should "should not error when saving" do
-      assert_nothing_raised do
-        @dummy.save!
-      end
-    end
-  end
-  if ENV['S3_TEST_BUCKET']
-    def s3_files_for attachment
-      [:thumb, :medium, :large, :original].inject({}) do |files, style|
-        data = `curl "#{attachment.url(style)}" 2>/dev/null`.chomp
-        t = Tempfile.new("paperclip-test")
-        t.binmode
-        t.write(data)
-        t.rewind
-        files[style] = t
-        files
-      end
-    end
-    def s3_headers_for attachment, style
-      `curl --head "#{attachment.url(style)}" 2>/dev/null`.split("\n").inject({}) do |h,head|
-        split_head = head.chomp.split(/\s*:\s*/, 2)
-        h[split_head.first.downcase] = split_head.last unless split_head.empty?
-        h
-      end
-    end
-    context "A model with an S3 attachment" do
-      setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif] },
-                      :storage => :s3,
-                      :whiny_thumbnails => true,
-                      # :s3_options => {:logger => Logger.new(StringIO.new)},
-                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "s3.yml")),
-                      :default_style => :medium,
-                      :bucket => ENV['S3_TEST_BUCKET'],
-                      :path => ":class/:attachment/:id/:style/:basename.:extension"
-        @dummy     = Dummy.new
-        @file      = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
-        @bad_file  = File.new(File.join(FIXTURES_DIR, "bad.png"), 'rb')
-        assert @dummy.avatar = @file
-        assert @dummy.valid?
-        assert @dummy.save
-        @files_on_s3 = s3_files_for @dummy.avatar
-      end
-      should "write and delete its files" do
-        [["434x66", :original],
-         ["300x46", :large],
-         ["100x15", :medium],
-         ["32x32", :thumb]].each do |geo, style|
-          cmd = %Q[identify -format "%wx%h" "#{@files_on_s3[style].path}"]
-          assert_equal geo, `#{cmd}`.chomp, cmd
-        end
-        @d2 = Dummy.find(@dummy.id)
-        @d2_files = s3_files_for @d2.avatar
-        [["434x66", :original],
-         ["300x46", :large],
-         ["100x15", :medium],
-         ["32x32", :thumb]].each do |geo, style|
-          cmd = %Q[identify -format "%wx%h" "#{@d2_files[style].path}"]
-          assert_equal geo, `#{cmd}`.chomp, cmd
-        end
-        @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
-        saved_keys = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s) }
-        saved_keys.each do |key|
-          assert key.exists?
-        end
-        @dummy.avatar.clear
-        assert_nil @dummy.avatar_file_name
-        assert @dummy.valid?
-        assert @dummy.save
-        saved_keys.each do |key|
-          assert ! key.exists?
-        end
-        @d2 = Dummy.find(@dummy.id)
-        assert_nil @d2.avatar_file_name
-      end
-      should "work exactly the same when new as when reloaded" do
-        @d2 = Dummy.find(@dummy.id)
-        assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
-        [:thumb, :medium, :large, :original].each do |style|
-          assert_equal @dummy.avatar.to_file(style).to_s, @d2.avatar.to_file(style).to_s
-        end
-        saved_keys = [:thumb, :medium, :large, :original].collect{|s| @dummy.avatar.to_file(s) }
-        @d2.avatar.clear
-        assert @d2.save
-        saved_keys.each do |key|
-          assert ! key.exists?
-        end
-      end
-      should "know the difference between good files, bad files, not files, and nil" do
-        expected = @dummy.avatar.to_file
-        @dummy.avatar = "not a file"
-        assert @dummy.valid?
-        assert_equal expected.full_name, @dummy.avatar.to_file.full_name
-        @dummy.avatar = @bad_file
-        assert ! @dummy.valid?
-        @dummy.avatar = nil
-        assert @dummy.valid?
-        Dummy.validates_attachment_presence :avatar
-        @d2 = Dummy.find(@dummy.id)
-        @d2.avatar = @file
-        assert   @d2.valid?
-        @d2.avatar = @bad_file
-        assert ! @d2.valid?
-        @d2.avatar = nil
-        assert ! @d2.valid?
-      end
-      should "be able to reload without saving and not have the file disappear" do
-        @dummy.avatar = @file
-        assert @dummy.save
-        @dummy.avatar = nil
-        assert_nil @dummy.avatar_file_name
-        @dummy.reload
-        assert_equal "5k.png", @dummy.avatar_file_name
-      end
-      should "have the right content type" do
-        headers = s3_headers_for(@dummy.avatar, :original)
-        p headers
-        assert_equal 'image/png', headers['content-type']
-      end
-    end
-  end
-end