paperclip 4.1.1 → 4.2.0

data/{test/has_attached_file_test.rb → spec/paperclip/has_attached_file_spec.rb}

@@ -1,45 +1,44 @@
-require './test/helper'
-require 'paperclip/has_attached_file'
+require 'spec_helper'
 
-class HasAttachedFileTest < Test::Unit::TestCase
+describe Paperclip::HasAttachedFile do
   context '#define_on' do
-    should 'define a setter on the class object' do
+    it 'defines a setter on the class object' do
       assert_adding_attachment('avatar').defines_method('avatar=')
     end
 
-    should 'define a getter on the class object' do
+    it 'defines a getter on the class object' do
       assert_adding_attachment('avatar').defines_method('avatar')
     end
 
-    should 'define a query on the class object' do
+    it 'defines a query on the class object' do
       assert_adding_attachment('avatar').defines_method('avatar?')
     end
 
-    should 'define a method on the class to get all of its attachments' do
+    it 'defines a method on the class to get all of its attachments' do
       assert_adding_attachment('avatar').defines_class_method('attachment_definitions')
     end
 
-    should 'flush errors as part of validations' do
+    it 'flushes errors as part of validations' do
       assert_adding_attachment('avatar').defines_validation
     end
 
-    should 'register the attachment with Paperclip::AttachmentRegistry' do
+    it 'registers the attachment with Paperclip::AttachmentRegistry' do
       assert_adding_attachment('avatar').registers_attachment
     end
 
-    should 'define an after_save callback' do
+    it 'defines an after_save callback' do
       assert_adding_attachment('avatar').defines_callback('after_save')
     end
 
-    should 'define a before_destroy callback' do
+    it 'defines a before_destroy callback' do
       assert_adding_attachment('avatar').defines_callback('before_destroy')
     end
 
-    should 'define an after_commit callback' do
+    it 'defines an after_commit callback' do
       assert_adding_attachment('avatar').defines_callback('after_commit')
     end
 
-    should 'define the Paperclip-specific callbacks' do
+    it 'defines the Paperclip-specific callbacks' do
       assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
     end
   end
@@ -52,7 +51,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
   class AttachmentAdder
     include Mocha::API
-    include Test::Unit::Assertions
+    include RSpec::Matchers
 
     def initialize(attachment_name)
       @attachment_name = attachment_name
@@ -63,9 +62,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
-      assert_received(a_class, :define_method) do |expect|
-        expect.with(method_name)
-      end
+      expect(a_class).to have_received(:define_method).with(method_name)
     end
 
     def defines_class_method(method_name)
@@ -74,9 +71,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
-      assert_received(a_class, :extend) do |expect|
-        expect.with(Paperclip::HasAttachedFile::ClassMethods)
-      end
+      expect(a_class).to have_received(:extend).with(Paperclip::HasAttachedFile::ClassMethods)
     end
 
     def defines_validation
@@ -84,9 +79,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
-      assert_received(a_class, :validates_each) do |expect|
-        expect.with(@attachment_name)
-      end
+      expect(a_class).to have_received(:validates_each).with(@attachment_name)
     end
 
     def registers_attachment
@@ -95,9 +88,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {size: 1})
 
-      assert_received(Paperclip::AttachmentRegistry, :register) do |expect|
-        expect.with(a_class, @attachment_name, {size: 1})
-      end
+      expect(Paperclip::AttachmentRegistry).to have_received(:register).with(a_class, @attachment_name, {size: 1})
     end
 
     def defines_callback(callback_name)
@@ -105,7 +96,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
-      assert_received(a_class, callback_name.to_sym)
+      expect(a_class).to have_received(callback_name.to_sym)
     end
 
     private

data/{test/integration_test.rb → spec/paperclip/integration_spec.rb}

@@ -1,21 +1,20 @@
 # encoding: utf-8
-
-require './test/helper'
+require 'spec_helper'
 require 'open-uri'
 
-class IntegrationTest < Test::Unit::TestCase
+describe 'Paperclip' do
   context "Many models at once" do
-    setup do
+    before do
       rebuild_model
-      @file      = File.new(fixture_file("5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       300.times do |i|
-        Dummy.create! :avatar => @file
+        Dummy.create! avatar: @file
       end
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "not exceed the open file limit" do
+    it "does not exceed the open file limit" do
        assert_nothing_raised do
          Dummy.all.each { |dummy| dummy.avatar }
        end
@@ -23,24 +22,24 @@ class IntegrationTest < Test::Unit::TestCase
   end
 
   context "An attachment" do
-    setup do
-      rebuild_model :styles => { :thumb => "50x50#" }
+    before do
+      rebuild_model styles: { thumb: "50x50#" }
       @dummy = Dummy.new
       @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
       assert @dummy.save
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "create its thumbnails properly" do
+    it "creates its thumbnails properly" do
       assert_match(/\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`)
     end
 
     context 'reprocessing with unreadable original' do
-      setup { File.chmod(0000, @dummy.avatar.path) }
+      before { File.chmod(0000, @dummy.avatar.path) }
 
-      should "not raise an error" do
+      it "does not raise an error" do
         assert_nothing_raised do
           silence_stream(STDERR) do
             @dummy.avatar.reprocess!
@@ -48,19 +47,19 @@ class IntegrationTest < Test::Unit::TestCase
         end
       end
 
-      should "return false" do
+      it "returns false" do
         silence_stream(STDERR) do
           assert !@dummy.avatar.reprocess!
         end
       end
 
-      teardown { File.chmod(0644, @dummy.avatar.path) }
+      after { File.chmod(0644, @dummy.avatar.path) }
     end
 
     context "redefining its attachment styles" do
-      setup do
+      before do
         Dummy.class_eval do
-          has_attached_file :avatar, :styles => { :thumb => "150x25#", :dynamic => lambda { |a| '50x50#' } }
+          has_attached_file :avatar, styles: { thumb: "150x25#", dynamic: lambda { |a| '50x50#' } }
         end
         @d2 = Dummy.find(@dummy.id)
         @original_timestamp = @d2.avatar_updated_at
@@ -68,37 +67,37 @@ class IntegrationTest < Test::Unit::TestCase
         @d2.save
       end
 
-      should "create its thumbnails properly" do
+      it "creates its thumbnails properly" do
         assert_match(/\b150x25\b/, `identify "#{@dummy.avatar.path(:thumb)}"`)
         assert_match(/\b50x50\b/, `identify "#{@dummy.avatar.path(:dynamic)}"`)
       end
 
-      should "change the timestamp" do
+      it "changes the timestamp" do
         assert_not_equal @original_timestamp, @d2.avatar_updated_at
       end
     end
   end
 
   context "Attachment" do
-    setup do
+    before do
       @thumb_path = "tmp/public/system/dummies/avatars/000/000/001/thumb/5k.png"
-      File.delete(@thumb_path) if File.exists?(@thumb_path)
-      rebuild_model :styles => { :thumb => "50x50#" }
+      File.delete(@thumb_path) if File.exist?(@thumb_path)
+      rebuild_model styles: { thumb: "50x50#" }
       @dummy = Dummy.new
       @file = File.new(fixture_file("5k.png"), 'rb')
 
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "not create the thumbnails upon saving when post-processing is disabled" do
+    it "does not create the thumbnails upon saving when post-processing is disabled" do
       @dummy.avatar.post_processing = false
       @dummy.avatar = @file
       assert @dummy.save
       assert_file_not_exists @thumb_path
     end
 
-    should "create the thumbnails upon saving when post_processing is enabled" do
+    it "creates the thumbnails upon saving when post_processing is enabled" do
       @dummy.avatar.post_processing = true
       @dummy.avatar = @file
       assert @dummy.save
@@ -107,12 +106,12 @@ class IntegrationTest < Test::Unit::TestCase
   end
 
   context "Attachment with no generated thumbnails" do
-    setup do
+    before do
       @thumb_small_path = "tmp/public/system/dummies/avatars/000/000/001/thumb_small/5k.png"
       @thumb_large_path = "tmp/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#" }
+      File.delete(@thumb_small_path) if File.exist?(@thumb_small_path)
+      File.delete(@thumb_large_path) if File.exist?(@thumb_large_path)
+      rebuild_model styles: { thumb_small: "50x50#", thumb_large: "60x60#" }
       @dummy = Dummy.new
       @file = File.new(fixture_file("5k.png"), 'rb')
 
@@ -122,9 +121,9 @@ class IntegrationTest < Test::Unit::TestCase
       @dummy.avatar.post_processing = true
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "allow us to create all thumbnails in one go" do
+    it "allows us to create all thumbnails in one go" do
       assert_file_not_exists(@thumb_small_path)
       assert_file_not_exists(@thumb_large_path)
 
@@ -134,7 +133,7 @@ class IntegrationTest < Test::Unit::TestCase
       assert_file_exists(@thumb_large_path)
     end
 
-    should "allow us to selectively create each thumbnail" do
+    it "allows us to selectively create each thumbnail" do
       assert_file_not_exists(@thumb_small_path)
       assert_file_not_exists(@thumb_large_path)
 
@@ -148,59 +147,65 @@ class IntegrationTest < Test::Unit::TestCase
   end
 
   context "A model that modifies its original" do
-    setup do
-      rebuild_model :styles => { :original => "2x2#" }
+    before do
+      rebuild_model styles: { original: "2x2#" }
       @dummy = Dummy.new
       @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
     end
 
-    should "report the file size of the processed file and not the original" do
+    it "reports the file size of the processed file and not the original" do
       assert_not_equal File.size(@file.path), @dummy.avatar.size
     end
 
-    teardown { @file.close }
+    after { @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"
+    before do
+      rebuild_model styles: { large: "100x100",
+                                 medium: "50x50" },
+                    path: ":rails_root/tmp/:id/:attachments/:style.:extension"
       @dummy = Dummy.new
       @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
     context "when saved" do
-      setup do
+      before do
         @dummy.save
         @saved_path = @dummy.avatar.path(:large)
       end
 
-      should "have a large file in the right place" do
+      it "has a large file in the right place" do
         assert_file_exists(@dummy.avatar.path(:large))
       end
 
       context "and deleted" do
-        setup do
+        before do
           @dummy.avatar.clear
           @dummy.save
         end
 
-        should "not have a large file in the right place anymore" do
+        it "does not have a large file in the right place anymore" do
           assert_file_not_exists(@saved_path)
         end
 
-        should "not have its next two parent directories" do
+        it "does not have its next two parent directories" do
           assert_file_not_exists(File.dirname(@saved_path))
           assert_file_not_exists(File.dirname(File.dirname(@saved_path)))
         end
+      end
 
-        before_should "not die if an unexpected SystemCallError happens" do
+      context 'and deleted where the delete fails' do
+        it "does not die if an unexpected SystemCallError happens" do
           FileUtils.stubs(:rmdir).raises(Errno::EPIPE)
+          assert_nothing_raised do
+            @dummy.avatar.clear
+            @dummy.save
+          end
         end
       end
     end
@@ -208,19 +213,19 @@ class IntegrationTest < Test::Unit::TestCase
 
   [000,002,022].each do |umask|
     context "when the umask is #{umask}" do
-      setup do
+      before do
         rebuild_model
         @dummy = Dummy.new
         @file  = File.new(fixture_file("5k.png"), 'rb')
         @umask = File.umask(umask)
       end
 
-      teardown do
+      after do
         File.umask @umask
         @file.close
       end
 
-      should "respect the current umask" do
+      it "respects the current umask" do
         @dummy.avatar = @file
         @dummy.save
         assert_equal 0666&~umask, 0666&File.stat(@dummy.avatar.path).mode
@@ -230,17 +235,17 @@ class IntegrationTest < Test::Unit::TestCase
 
   [0666,0664,0640].each do |perms|
     context "when the perms are #{perms}" do
-      setup do
-        rebuild_model :override_file_permissions => perms
+      before do
+        rebuild_model override_file_permissions: perms
         @dummy = Dummy.new
         @file  = File.new(fixture_file("5k.png"), 'rb')
       end
 
-      teardown do
+      after do
         @file.close
       end
 
-      should "respect the current perms" do
+      it "respects the current perms" do
         @dummy.avatar = @file
         @dummy.save
         assert_equal perms, File.stat(@dummy.avatar.path).mode & 0777
@@ -248,23 +253,23 @@ class IntegrationTest < Test::Unit::TestCase
     end
   end
 
-  should "skip chmod operation, when override_file_permissions is set to false (e.g. useful when using CIFS mounts)" do
+  it "skips chmod operation, when override_file_permissions is set to false (e.g. useful when using CIFS mounts)" do
     FileUtils.expects(:chmod).never
 
-    rebuild_model :override_file_permissions => false
+    rebuild_model override_file_permissions: false
     dummy = Dummy.create!
     dummy.avatar = @file
     dummy.save
   end
 
   context "A model with a filesystem attachment" 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"
+    before 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
       @file      = File.new(fixture_file("5k.png"), 'rb')
       @bad_file  = File.new(fixture_file("bad.png"), 'rb')
@@ -274,9 +279,9 @@ class IntegrationTest < Test::Unit::TestCase
       assert @dummy.save
     end
 
-    teardown { [@file, @bad_file].each(&:close) }
+    after { [@file, @bad_file].each(&:close) }
 
-    should "write and delete its files" do
+    it "writes and delete its files" do
       [["434x66", :original],
        ["300x46", :large],
        ["100x15", :medium],
@@ -314,7 +319,7 @@ class IntegrationTest < Test::Unit::TestCase
       assert_nil @d2.avatar_file_name
     end
 
-    should "work exactly the same when new as when reloaded" do
+    it "works exactly the same when new as when reloaded" do
       @d2 = Dummy.find(@dummy.id)
 
       assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
@@ -332,18 +337,18 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
 
-    should "not abide things that don't have adapters" do
+    it "does 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
+    it "is not ok with bad files" do
       @dummy.avatar = @bad_file
       assert ! @dummy.valid?
     end
 
-    should "know the difference between good files, bad files, and not files when validating" do
+    it "knows 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
@@ -352,7 +357,7 @@ class IntegrationTest < Test::Unit::TestCase
       assert ! @d2.valid?
     end
 
-    should "be able to reload without saving and not have the file disappear" do
+    it "is able to reload without saving and not have the file disappear" do
       @dummy.avatar = @file
       assert @dummy.save, @dummy.errors.full_messages.inspect
       @dummy.avatar.clear
@@ -362,33 +367,33 @@ class IntegrationTest < Test::Unit::TestCase
     end
 
     context "that is assigned its file from another Paperclip attachment" do
-      setup do
+      before do
         @dummy2 = Dummy.new
-        @file2  = File.new(fixture_file("12k.png"), 'rb')
-        assert  @dummy2.avatar = @file2
+        @file2 = File.new(fixture_file("12k.png"), 'rb')
+        assert @dummy2.avatar = @file2
         @dummy2.save
       end
 
-      teardown { @file2.close }
+      after { @file2.close }
 
-      should "work when assigned a file" do
+      it "works when assigned a file" do
         assert_not_equal `identify -format "%wx%h" "#{@dummy.avatar.path(:original)}"`,
-                         `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
+          `identify -format "%wx%h" "#{@dummy2.avatar.path(:original)}"`
 
         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)}"`
+          `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
+    before do
       Dummy.class_eval do
-        has_many :attachments, :class_name => 'Dummy'
+        has_many :attachments, class_name: 'Dummy'
       end
 
       @file = File.new(fixture_file("5k.png"), 'rb')
@@ -396,45 +401,45 @@ class IntegrationTest < Test::Unit::TestCase
       @dummy.avatar = @file
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "should not error when saving" do
+    it "does not error when saving" do
       @dummy.save!
     end
   end
 
   context "A model with an attachment with hash in file name" do
-    setup do
-      @settings = { :styles => { :thumb => "50x50#" },
-        :path => ":rails_root/public/system/:attachment/:id_partition/:style/:hash.:extension",
-        :url => "/system/:attachment/:id_partition/:style/:hash.:extension",
-        :hash_secret => "somesecret" }
+    before do
+      @settings = { styles: { thumb: "50x50#" },
+        path: ":rails_root/public/system/:attachment/:id_partition/:style/:hash.:extension",
+        url: "/system/:attachment/:id_partition/:style/:hash.:extension",
+        hash_secret: "somesecret" }
 
       rebuild_model @settings
 
       @file = File.new(fixture_file("5k.png"), 'rb')
-      @dummy = Dummy.create! :avatar => @file
+      @dummy = Dummy.create! avatar: @file
     end
 
-    teardown do
+    after do
       @file.close
     end
 
-    should "be accessible" do
+    it "is accessible" do
       assert_file_exists(@dummy.avatar.path(:original))
       assert_file_exists(@dummy.avatar.path(:thumb))
     end
 
     context "when new style is added" do
-      setup do
+      before do
         @dummy.avatar.options[:styles][:mini] = "25x25#"
         @dummy.avatar.instance_variable_set :@normalized_styles, nil
-        Time.stubs(:now => Time.now + 10)
+        Time.stubs(now: Time.now + 10)
         @dummy.avatar.reprocess!
         @dummy.reload
       end
 
-      should "make all the styles accessible" do
+      it "makes all the styles accessible" do
         assert_file_exists(@dummy.avatar.path(:original))
         assert_file_exists(@dummy.avatar.path(:thumb))
         assert_file_exists(@dummy.avatar.path(:mini))
@@ -464,22 +469,25 @@ class IntegrationTest < Test::Unit::TestCase
     end
 
     context "A model with an S3 attachment" do
-      setup do
-        rebuild_model :styles => { :large => "300x300>",
-                                   :medium => "100x100",
-                                   :thumb => ["32x32#", :gif],
-                                   :custom => {
-                                     :geometry => "32x32#",
-                                     :s3_headers => { 'Cache-Control' => 'max-age=31557600' },
-                                     :s3_metadata => { 'foo' => 'bar'}
-                                   }
-                                 },
-                      :storage => :s3,
-                      :s3_credentials => File.new(fixture_file('s3.yml')),
-                      :s3_options => { :logger => Paperclip.logger },
-                      :default_style => :medium,
-                      :bucket => ENV['S3_BUCKET'],
-                      :path => ":class/:attachment/:id/:style/:basename.:extension"
+      before do
+        rebuild_model(
+          styles: {
+            large: "300x300>",
+            medium: "100x100",
+            thumb: ["32x32#", :gif],
+            custom: {
+              geometry: "32x32#",
+              s3_headers: { 'Cache-Control' => 'max-age=31557600' },
+              s3_metadata: { 'foo' => 'bar'}
+            }
+          },
+          storage: :s3,
+          s3_credentials: File.new(fixture_file('s3.yml')),
+          s3_options: { logger: Paperclip.logger },
+          default_style: :medium,
+          bucket: ENV['S3_BUCKET'],
+          path: ":class/:attachment/:id/:style/:basename.:extension"
+        )
 
         @dummy     = Dummy.new
         @file      = File.new(fixture_file('5k.png'), 'rb')
@@ -492,29 +500,29 @@ class IntegrationTest < Test::Unit::TestCase
         @files_on_s3 = s3_files_for(@dummy.avatar)
       end
 
-      teardown do
+      after do
         @file.close
         @bad_file.close
         @files_on_s3.values.each(&:close) if @files_on_s3
       end
 
       context 'assigning itself to a new model' do
-        setup do
+        before do
           @d2 = Dummy.new
           @d2.avatar = @dummy.avatar
           @d2.save
         end
 
-        should "have the same name as the old file" do
+        it "has the same name as the old file" do
           assert_equal @d2.avatar.original_filename, @dummy.avatar.original_filename
         end
       end
 
-      should "have the same contents as the original" do
+      it "has the same contents as the original" do
         assert_equal @file.read, @files_on_s3[:original].read
       end
 
-      should "write and delete its files" do
+      it "writes and delete its files" do
         [["434x66", :original],
          ["300x46", :large],
          ["100x15", :medium],
@@ -546,7 +554,7 @@ class IntegrationTest < Test::Unit::TestCase
         assert_nil @d2.avatar_file_name
       end
 
-      should "work exactly the same when new as when reloaded" do
+      it "works exactly the same when new as when reloaded" do
         @d2 = Dummy.find(@dummy.id)
 
         assert_equal @dummy.avatar_file_name, @d2.avatar_file_name
@@ -570,7 +578,7 @@ class IntegrationTest < Test::Unit::TestCase
         end
       end
 
-      should "know the difference between good files, bad files, and nil" do
+      it "knows the difference between good files, bad files, and nil" do
         @dummy.avatar = @bad_file
         assert ! @dummy.valid?
         @dummy.avatar = nil
@@ -586,7 +594,7 @@ class IntegrationTest < Test::Unit::TestCase
         assert ! @d2.valid?
       end
 
-      should "be able to reload without saving and not have the file disappear" do
+      it "is able to reload without saving and not have the file disappear" do
         @dummy.avatar = @file
         assert @dummy.save
         @dummy.avatar = nil
@@ -595,28 +603,28 @@ class IntegrationTest < Test::Unit::TestCase
         assert_equal "5k.png", @dummy.avatar_file_name
       end
 
-      should "have the right content type" do
+      it "has the right content type" do
         headers = s3_headers_for(@dummy.avatar, :original)
         assert_equal 'image/png', headers['content-type']
       end
 
-      should "have the right style-specific headers" do
+      it "has the right style-specific headers" do
         headers = s3_headers_for(@dummy.avatar, :custom)
         assert_equal 'max-age=31557600', headers['cache-control']
       end
 
-      should "have the right style-specific metadata" do
+      it "has the right style-specific metadata" do
         headers = s3_headers_for(@dummy.avatar, :custom)
         assert_equal 'bar', headers['x-amz-meta-foo']
       end
 
       context "with non-english character in the file name" do
-        setup do
+        before do
           @file.stubs(:original_filename).returns("クリップ.png")
           @dummy.avatar = @file
         end
 
-        should "not raise any error" do
+        it "does not raise any error" do
           @dummy.save!
         end
       end
@@ -624,14 +632,14 @@ class IntegrationTest < Test::Unit::TestCase
   end
 
   context "Copying attachments between models" do
-    setup do
+    before do
       rebuild_model
       @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "succeed when original attachment is a file" do
+    it "succeeds when original attachment is a file" do
       original = Dummy.new
       original.avatar = @file
       assert original.save
@@ -643,7 +651,7 @@ class IntegrationTest < Test::Unit::TestCase
       assert copy.avatar.present?
     end
 
-    should "succeed when original attachment is empty" do
+    it "succeeds when original attachment is empty" do
       original = Dummy.create!
 
       copy = Dummy.new