Remove unnecessary mv/unlink from Filesystem#flush_writes, complicate…

…s some failure modes
thoughtbot · Feb 6, 2012 · f8c2444 · f8c2444
1 parent 772c8e9
commit f8c2444
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/lib/paperclip/storage/filesystem.rb b/lib/paperclip/storage/filesystem.rb
@@ -38,12 +38,7 @@ def flush_writes #:nodoc:
           file.close
           FileUtils.mkdir_p(File.dirname(path(style_name)))
           log("saving #{path(style_name)}")
-          begin
-            FileUtils.mv(file.path, path(style_name))
-          rescue SystemCallError
-            FileUtils.cp(file.path, path(style_name))
-            FileUtils.rm(file.path)
-          end
+          FileUtils.cp(file.path, path(style_name))
           FileUtils.chmod(0666&~File.umask, path(style_name))
         end
 

diff --git a/test/integration_test.rb b/test/integration_test.rb
@@ -81,8 +81,6 @@ class IntegrationTest < Test::Unit::TestCase
         original.close
         tf.rewind
 
-        File.expects(:unlink).with(tf.instance_variable_get(:@tmpname))
-
         @d2.avatar.expects(:to_file).with(:original).returns(tf)
 
         @d2.avatar.reprocess!