test/integration_test.rb in thoughtbot-paperclip-2.3.0 vs test/integration_test.rb in thoughtbot-paperclip-2.3.1

@@ -377,10 +377,15 @@
         assert @dummy.save
 
         @files_on_s3 = s3_files_for @dummy.avatar
       end
 
+      should "have the same contents as the original" do
+        @file.rewind
+        assert_equal @file.read, @files_on_s3[:original].read
+      end
+
       should "write and delete its files" do
         [["434x66", :original],
          ["300x46", :large],
          ["100x15", :medium],
          ["32x32", :thumb]].each do |geo, style|
@@ -401,23 +406,21 @@
         @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?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert @dummy.avatar.exists?(style)
         end
 
         @dummy.avatar.clear
         assert_nil @dummy.avatar_file_name
         assert @dummy.valid?
         assert @dummy.save
 
-        saved_keys.each do |key|
-          assert ! key.exists?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert ! @dummy.avatar.exists?(style)
         end
 
         @d2 = Dummy.find(@dummy.id)
         assert_nil @d2.avatar_file_name
       end
@@ -425,28 +428,28 @@
       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
+          assert_equal @dummy.avatar.to_file(style).read, @d2.avatar.to_file(style).read
         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?
+        [:thumb, :medium, :large, :original].each do |style|
+          assert ! @dummy.avatar.exists?(style)
         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
+        assert_equal expected.read, @dummy.avatar.to_file.read
 
         @dummy.avatar = @bad_file
         assert ! @dummy.valid?
         @dummy.avatar = nil
         assert @dummy.valid?
@@ -470,10 +473,9 @@
         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