paperclip 3.5.4 → 4.0.0

data/test/io_adapters/abstract_adapter_test.rb

@@ -13,6 +13,7 @@ class AbstractAdapterTest < Test::Unit::TestCase
     setup do
       @adapter = TestAdapter.new
       @adapter.stubs(:path).returns("image.png")
+      Paperclip.stubs(:run).returns("image/png\n")
     end
 
     should "return the content type without newline" do

data/test/io_adapters/attachment_adapter_test.rb

@@ -75,7 +75,7 @@ class AttachmentAdapterTest < Test::Unit::TestCase
     end
 
     should "not generate paths that include restricted characters" do
-      assert_no_match /:/, @subject.path
+      assert_no_match(/:/, @subject.path)
     end
 
     should "not generate filenames that include restricted characters" do

data/test/io_adapters/data_uri_adapter_test.rb

@@ -14,8 +14,8 @@ class DataUriAdapterTest < Test::Unit::TestCase
       @subject = Paperclip.io_adapters.for(@contents)
     end
 
-    should "return a file name" do
-      assert_equal "base64.txt", @subject.original_filename
+    should "returns a file name based on the content type" do
+      assert_equal "data.png", @subject.original_filename
     end
 
     should "return a content type" do

data/test/io_adapters/file_adapter_test.rb

@@ -69,17 +69,6 @@ class FileAdapterTest < Test::Unit::TestCase
         end
       end
 
-      context "file with multiple possible x-types but no official type" do
-        setup do
-          MIME::Types.stubs(:type_for).returns([MIME::Type.new('image/x-mp4'), MIME::Type.new('image/x-video')])
-          @subject = Paperclip.io_adapters.for(@file)
-        end
-
-        should "return the first" do
-          assert_equal "image/x-mp4", @subject.content_type
-        end
-      end
-
       context "file with content type derived from file command on *nix" do
         setup do
           MIME::Types.stubs(:type_for).returns([])

data/test/io_adapters/http_url_proxy_adapter_test.rb

@@ -84,8 +84,7 @@ class HttpUrlProxyAdapterTest < Test::Unit::TestCase
     teardown do
       begin
         @subject.close
-      rescue Exception => e
-        binding.pry
+      rescue Exception
         true
       end
     end
@@ -95,7 +94,7 @@ class HttpUrlProxyAdapterTest < Test::Unit::TestCase
     end
 
     should "not generate paths that include restricted characters" do
-      assert_no_match /:/, @subject.path
+      assert_no_match(/:/, @subject.path)
     end
   end
 

data/test/io_adapters/stringio_adapter_test.rb

@@ -9,7 +9,7 @@ class StringioFileProxyTest < Test::Unit::TestCase
     end
 
     should "return a file name" do
-      assert_equal "stringio.txt", @subject.original_filename
+      assert_equal "data.txt", @subject.original_filename
     end
 
     should "return a content type" do

data/test/matchers/have_attached_file_matcher_test.rb

@@ -3,7 +3,7 @@ require './test/helper'
 class HaveAttachedFileMatcherTest < Test::Unit::TestCase
   context "have_attached_file" do
     setup do
-      @dummy_class = reset_class "Dummy"
+      reset_class "Dummy"
       reset_table "dummies"
       @matcher     = self.class.have_attached_file(:avatar)
     end
@@ -15,7 +15,8 @@ class HaveAttachedFileMatcherTest < Test::Unit::TestCase
     context "given a class with an attachment" do
       setup do
         modify_table("dummies"){|d| d.string :avatar_file_name }
-        @dummy_class.has_attached_file :avatar
+        Dummy.has_attached_file :avatar
+        Dummy.do_not_validate_attachment_file_type :avatar
       end
 
       should_accept_dummy_class

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -8,8 +8,9 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
         d.string :avatar_file_name
         d.string :avatar_content_type
       end
-      @dummy_class = reset_class "Dummy"
-      @dummy_class.has_attached_file :avatar
+      reset_class "Dummy"
+      Dummy.do_not_validate_attachment_file_type :avatar
+      Dummy.has_attached_file :avatar
       @matcher     = self.class.validate_attachment_content_type(:avatar).
                        allowing(%w(image/png image/jpeg)).
                        rejecting(%w(audio/mp3 application/octet-stream))
@@ -21,7 +22,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
     context "given a class with a validation that doesn't match" do
       setup do
-        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
+        Dummy.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
       end
 
       should_reject_dummy_class
@@ -29,7 +30,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
     context "given a class with a matching validation" do
       setup do
-        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
+        Dummy.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
       end
 
       should_accept_dummy_class
@@ -37,8 +38,8 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
     context "given a class with other validations but matching types" do
       setup do
-        @dummy_class.validates_presence_of :title
-        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
+        Dummy.validates_presence_of :title
+        Dummy.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
       end
 
       should_accept_dummy_class
@@ -46,7 +47,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
     context "given a class that matches and a matcher that only specifies 'allowing'" do
       setup do
-        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
+        Dummy.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
         @matcher     = self.class.validate_attachment_content_type(:avatar).
           allowing(%w(image/png image/jpeg))
       end
@@ -56,7 +57,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
     context "given a class that does not match and a matcher that only specifies 'allowing'" do
       setup do
-        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
+        Dummy.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
         @matcher     = self.class.validate_attachment_content_type(:avatar).
           allowing(%w(image/png image/jpeg))
       end
@@ -66,7 +67,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
     context "given a class that matches and a matcher that only specifies 'rejecting'" do
       setup do
-        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
+        Dummy.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
         @matcher     = self.class.validate_attachment_content_type(:avatar).
           rejecting(%w(audio/mp3 application/octet-stream))
       end
@@ -76,7 +77,7 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
     context "given a class that does not match and a matcher that only specifies 'rejecting'" do
       setup do
-        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
+        Dummy.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
         @matcher     = self.class.validate_attachment_content_type(:avatar).
           rejecting(%w(audio/mp3 application/octet-stream))
       end
@@ -86,14 +87,14 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
 
     context "using an :if to control the validation" do
       setup do
-        @dummy_class.class_eval do
+        Dummy.class_eval do
           validates_attachment_content_type :avatar, :content_type => %r{image/*} , :if => :go
           attr_accessor :go
         end
         @matcher = self.class.validate_attachment_content_type(:avatar).
                         allowing(%w(image/png image/jpeg)).
                         rejecting(%w(audio/mp3 application/octet-stream))
-        @dummy = @dummy_class.new
+        @dummy = Dummy.new
       end
 
       should "run the validation if the control is true" do

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -6,8 +6,9 @@ class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
       reset_table("dummies") do |d|
         d.string :avatar_file_name
       end
-      @dummy_class = reset_class "Dummy"
-      @dummy_class.has_attached_file :avatar
+      reset_class "Dummy"
+      Dummy.has_attached_file :avatar
+      Dummy.do_not_validate_attachment_file_type :avatar
       @matcher     = self.class.validate_attachment_presence(:avatar)
     end
 
@@ -17,7 +18,7 @@ class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
 
     context "given a class with a matching validation" do
       setup do
-        @dummy_class.validates_attachment_presence :avatar
+        Dummy.validates_attachment_presence :avatar
       end
 
       should_accept_dummy_class
@@ -30,12 +31,12 @@ class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
           d.string :avatar_content_type
         end
 
-        @dummy_class.class_eval do
+        Dummy.class_eval do
           validates_attachment_presence :avatar
           validates_attachment_content_type :avatar, :content_type => 'image/gif'
         end
 
-        @dummy = @dummy_class.new
+        @dummy = Dummy.new
         @matcher = self.class.validate_attachment_presence(:avatar)
       end
 
@@ -47,11 +48,11 @@ class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
 
     context "using an :if to control the validation" do
       setup do
-        @dummy_class.class_eval do
+        Dummy.class_eval do
           validates_attachment_presence :avatar, :if => :go
           attr_accessor :go
         end
-        @dummy = @dummy_class.new
+        @dummy = Dummy.new
         @dummy.avatar = nil
       end
 

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -7,8 +7,9 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
         d.string :avatar_file_name
         d.integer :avatar_file_size
       end
-      @dummy_class = reset_class "Dummy"
-      @dummy_class.has_attached_file :avatar
+      reset_class "Dummy"
+      Dummy.do_not_validate_attachment_file_type :avatar
+      Dummy.has_attached_file :avatar
     end
 
     context "of limited size" do
@@ -19,17 +20,17 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
       end
 
       context "given a class with a validation that's too high" do
-        setup { @dummy_class.validates_attachment_size :avatar, :in => 256..2048 }
+        setup { Dummy.validates_attachment_size :avatar, :in => 256..2048 }
         should_reject_dummy_class
       end
 
       context "given a class with a validation that's too low" do
-        setup { @dummy_class.validates_attachment_size :avatar, :in => 0..1024 }
+        setup { Dummy.validates_attachment_size :avatar, :in => 0..1024 }
         should_reject_dummy_class
       end
 
       context "given a class with a validation that matches" do
-        setup { @dummy_class.validates_attachment_size :avatar, :in => 256..1024 }
+        setup { Dummy.validates_attachment_size :avatar, :in => 256..1024 }
         should_accept_dummy_class
       end
     end
@@ -38,23 +39,23 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
       setup{ @matcher = self.class.validate_attachment_size(:avatar) }
 
       context "given a class with an upper limit" do
-        setup { @dummy_class.validates_attachment_size :avatar, :less_than => 1 }
+        setup { Dummy.validates_attachment_size :avatar, :less_than => 1 }
         should_accept_dummy_class
       end
 
       context "given a class with a lower limit" do
-        setup { @dummy_class.validates_attachment_size :avatar, :greater_than => 1 }
+        setup { Dummy.validates_attachment_size :avatar, :greater_than => 1 }
         should_accept_dummy_class
       end
     end
 
     context "using an :if to control the validation" do
       setup do
-        @dummy_class.class_eval do
+        Dummy.class_eval do
           validates_attachment_size :avatar, :greater_than => 1024, :if => :go
           attr_accessor :go
         end
-        @dummy = @dummy_class.new
+        @dummy = Dummy.new
         @matcher = self.class.validate_attachment_size(:avatar).greater_than(1024)
       end
 
@@ -71,9 +72,9 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
 
     context "post processing" do
       setup do
-        @dummy_class.validates_attachment_size :avatar, :greater_than => 1024
+        Dummy.validates_attachment_size :avatar, :greater_than => 1024
 
-        @dummy = @dummy_class.new
+        @dummy = Dummy.new
         @matcher = self.class.validate_attachment_size(:avatar).greater_than(1024)
       end
 

data/test/media_type_spoof_detector_test.rb

@@ -0,0 +1,28 @@
+require './test/helper'
+
+class MediaTypeSpoofDetectorTest < Test::Unit::TestCase
+  should 'reject a file that is named .html and identifies as PNG' do
+    file = File.open(fixture_file("5k.png"))
+    assert Paperclip::MediaTypeSpoofDetector.using(file, "5k.html").spoofed?
+  end
+
+  should 'not reject a file that is named .jpg and identifies as PNG' do
+    file = File.open(fixture_file("5k.png"))
+    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "5k.jpg").spoofed?
+  end
+
+  should 'not reject a file that is named .html and identifies as HTML' do
+    file = File.open(fixture_file("empty.html"))
+    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html").spoofed?
+  end
+
+  should 'not reject a file that does not have a name' do
+    file = File.open(fixture_file("empty.html"))
+    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "").spoofed?
+  end
+
+  should 'not reject when the supplied file is an IOAdapter' do
+    adapter = Paperclip.io_adapters.for(File.new(fixture_file("5k.png")))
+    assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename).spoofed?
+  end
+end

data/test/meta_class_test.rb

@@ -16,7 +16,7 @@ class MetaClassTest < Test::Unit::TestCase
       assert_nothing_raised do
         rebuild_meta_class_of(@dummy)
       end
-    end    
+    end
 
     should "work like any other instance" do
       reset_class("Dummy")
@@ -29,4 +29,4 @@ class MetaClassTest < Test::Unit::TestCase
       assert @dummy.save
     end
   end
-end
+end

data/test/schema_test.rb

@@ -15,6 +15,9 @@ class SchemaTest < Test::Unit::TestCase
 
   context "within table definition" do
     context "using #has_attached_file" do
+      setup do
+        ActiveSupport::Deprecation.silenced = false
+      end
       should "create attachment columns" do
         Dummy.connection.create_table :dummies, :force => true do |t|
           ActiveSupport::Deprecation.silence do
@@ -122,6 +125,9 @@ class SchemaTest < Test::Unit::TestCase
       end
 
       context "using #drop_attached_file" do
+        setup do
+          ActiveSupport::Deprecation.silenced = false
+        end
         should "remove the attachment columns" do
           ActiveSupport::Deprecation.silence do
             Dummy.connection.drop_attached_file :dummies, :avatar

data/test/storage/fog_test.rb

@@ -222,12 +222,12 @@ class FogTest < Test::Unit::TestCase
         setup do
           rebuild_model(@options.merge(:fog_host => 'http://example.com'))
           @dummy = Dummy.new
-          @dummy.avatar = StringIO.new('.')
+          @dummy.avatar = StringIO.new(".\n")
           @dummy.save
         end
 
         should "provide a public url" do
-          assert @dummy.avatar.url =~ /^http:\/\/example\.com\/avatars\/stringio\.txt\?\d*$/
+          assert @dummy.avatar.url =~ /^http:\/\/example\.com\/avatars\/data\.txt\?\d*$/
         end
       end
 
@@ -241,12 +241,12 @@ class FogTest < Test::Unit::TestCase
             :storage          => :fog
           )
           @dummy = Dummy.new
-          @dummy.avatar = StringIO.new('.')
+          @dummy.avatar = StringIO.new(".\n")
           @dummy.save
         end
 
         should "provide a public url" do
-          assert @dummy.avatar.url =~ /^http:\/\/img[0123]\.example\.com\/avatars\/stringio\.txt\?\d*$/
+          assert @dummy.avatar.url =~ /^http:\/\/img[0123]\.example\.com\/avatars\/data\.txt\?\d*$/
         end
       end
 

data/test/storage/s3_test.rb

@@ -92,7 +92,7 @@ class S3Test < Test::Unit::TestCase
                     :s3_credentials => {:not => :important}
 
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
 
     end
 
@@ -111,11 +111,11 @@ class S3Test < Test::Unit::TestCase
                     :path => ":attachment/:basename.:extension",
                     :url => ":s3_path_url"
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a url based on an S3 path" do
-      assert_match %r{^http://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^http://s3.amazonaws.com/bucket/avatars/data.txt}, @dummy.avatar.url
     end
 
     should "use the correct bucket" do
@@ -123,7 +123,7 @@ class S3Test < Test::Unit::TestCase
     end
 
     should "use the correct key" do
-      assert_equal "avatars/stringio.txt", @dummy.avatar.s3_object.key
+      assert_equal "avatars/data.txt", @dummy.avatar.s3_object.key
     end
   end
 
@@ -151,11 +151,11 @@ class S3Test < Test::Unit::TestCase
                     :bucket => "bucket",
                     :path => ":attachment/:basename.:extension"
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a url based on an S3 path" do
-      assert_match %r{^https://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^https://s3.amazonaws.com/bucket/avatars/data.txt}, @dummy.avatar.url
     end
   end
 
@@ -167,11 +167,11 @@ class S3Test < Test::Unit::TestCase
                     :bucket => "bucket",
                     :path => ":attachment/:basename.:extension"
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a url based on an S3 path" do
-      assert_match %r{^https://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^https://s3.amazonaws.com/bucket/avatars/data.txt}, @dummy.avatar.url
     end
   end
 
@@ -183,11 +183,11 @@ class S3Test < Test::Unit::TestCase
                     :bucket => "bucket",
                     :path => ":attachment/:basename.:extension"
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a url based on an S3 path" do
-      assert_match %r{^//s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^//s3.amazonaws.com/bucket/avatars/data.txt}, @dummy.avatar.url
     end
   end
 
@@ -205,16 +205,16 @@ class S3Test < Test::Unit::TestCase
                     }
 
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
       @avatar = @dummy.avatar
     end
 
     should "use an S3 object based on the correct path for the default style" do
-      assert_equal("avatars/original/stringio.txt", @dummy.avatar.s3_object.key)
+      assert_equal("avatars/original/data.txt", @dummy.avatar.s3_object.key)
     end
 
     should "use an S3 object based on the correct path for the custom style" do
-      assert_equal("avatars/thumb/stringio.txt", @dummy.avatar.s3_object(:thumb).key)
+      assert_equal("avatars/thumb/data.txt", @dummy.avatar.s3_object(:thumb).key)
     end
   end
 
@@ -226,11 +226,11 @@ class S3Test < Test::Unit::TestCase
                     :path => ":attachment/:basename.:extension",
                     :s3_host_name => "s3-ap-northeast-1.amazonaws.com"
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a url based on an :s3_host_name path" do
-      assert_match %r{^http://s3-ap-northeast-1.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^http://s3-ap-northeast-1.amazonaws.com/bucket/avatars/data.txt}, @dummy.avatar.url
     end
 
     should "use the S3 bucket with the correct host name" do
@@ -249,12 +249,12 @@ class S3Test < Test::Unit::TestCase
       class << @dummy
         attr_accessor :value
       end
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "use s3_host_name as a proc if available" do
       @dummy.value = "s3.something.com"
-      assert_equal "http://s3.something.com/bucket/avatars/stringio.txt", @dummy.avatar.url(:original, :timestamp => false)
+      assert_equal "http://s3.something.com/bucket/avatars/data.txt", @dummy.avatar.url(:original, :timestamp => false)
     end
   end
 
@@ -366,7 +366,7 @@ class S3Test < Test::Unit::TestCase
                       'secret_access_key' => "54321"
                     }
 
-      stringio = StringIO.new(".")
+      stringio = stringy_file
       class << stringio
         def original_filename
           "question?mark.png"
@@ -395,11 +395,11 @@ class S3Test < Test::Unit::TestCase
                     :path => ":attachment/:basename.:extension",
                     :url => ":s3_domain_url"
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a url based on an S3 subdomain" do
-      assert_match %r{^http://bucket.s3.amazonaws.com/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^http://bucket.s3.amazonaws.com/avatars/data.txt}, @dummy.avatar.url
     end
   end
 
@@ -414,11 +414,11 @@ class S3Test < Test::Unit::TestCase
                     :path => ":attachment/:basename.:extension",
                     :url => ":s3_alias_url"
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a url based on the host_alias" do
-      assert_match %r{^http://something.something.com/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^http://something.something.com/avatars/data.txt}, @dummy.avatar.url
     end
   end
 
@@ -437,12 +437,12 @@ class S3Test < Test::Unit::TestCase
         end
       end
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a url based on the host_alias" do
-      assert_match %r{^http://cdn1.example.com/avatars/stringio.txt}, @dummy.avatar.url
-      assert_match %r{^http://cdn2.example.com/avatars/stringio.txt}, @dummy.avatar.url
+      assert_match %r{^http://cdn1.example.com/avatars/data.txt}, @dummy.avatar.url
+      assert_match %r{^http://cdn2.example.com/avatars/data.txt}, @dummy.avatar.url
     end
 
     should "still return the bucket name" do
@@ -459,11 +459,11 @@ class S3Test < Test::Unit::TestCase
                     :path => ":attachment/:basename.:extension",
                     :url => ":asset_host"
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "return a relative URL for Rails to calculate assets host" do
-      assert_match %r{^avatars/stringio\.txt}, @dummy.avatar.url
+      assert_match %r{^avatars/data\.txt}, @dummy.avatar.url
     end
 
   end
@@ -493,7 +493,7 @@ class S3Test < Test::Unit::TestCase
       rails_env("production")
 
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
 
       object = stub
       @dummy.avatar.stubs(:s3_object).returns(object)
@@ -508,7 +508,7 @@ class S3Test < Test::Unit::TestCase
       rails_env("production")
 
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
 
       object = stub
       @dummy.avatar.stubs(:s3_object).returns(object)
@@ -524,8 +524,9 @@ class S3Test < Test::Unit::TestCase
 
       @dummy = Dummy.new
 
-      @file = StringIO.new(".")
+      @file = stringy_file
       @file.stubs(:original_filename).returns("5k.png\n\n")
+      Paperclip.stubs(:run).returns('image/png')
       @file.stubs(:content_type).returns("image/png\n\n")
       @file.stubs(:to_tempfile).returns(@file)
 
@@ -574,7 +575,7 @@ class S3Test < Test::Unit::TestCase
       rails_env("production")
 
       @dummy = Dummy.new
-      @dummy.avatar = StringIO.new(".")
+      @dummy.avatar = stringy_file
     end
 
     should "should generate a url for the thumb" do