Merge pull request #2342 from dosuken123/if-no-space-then-remove-old-…

…cache

If no space left then remove old cache

lib/carrierwave/storage/file.rb

@@ -66,7 +66,7 @@ def retrieve!(identifier)
       #
       def cache!(new_file)
         new_file.move_to(::File.expand_path(uploader.cache_path, uploader.root), uploader.permissions, uploader.directory_permissions, true)
-      rescue Errno::EMLINK => e
+      rescue Errno::EMLINK, Errno::ENOSPC => e
         raise(e) if @cache_called
         @cache_called = true
 

spec/storage/file_spec.rb

@@ -40,7 +40,14 @@
 
   describe '#cache!' do
     context "when FileUtils.mkdir_p raises Errno::EMLINK" do
-      before { fake_failed_mkdir_p }
+      before { fake_failed_mkdir_p(Errno::EMLINK) }
+      after { storage.cache!(sanitized_temp_file) }
+
+      it { is_expected.to receive(:clean_cache!).with(600) }
+    end
+
+    context "when FileUtils.mkdir_p raises Errno::ENOSPC" do
+      before { fake_failed_mkdir_p(Errno::ENOSPC) }
       after { storage.cache!(sanitized_temp_file) }
 
       it { is_expected.to receive(:clean_cache!).with(600) }

spec/support/file_utils_helper.rb

@@ -1,14 +1,14 @@
 module FileUtilsHelper
-  # NOTE: Make FileUtils.mkdir_p to raise `Errno::EMLINK` only once
-  def fake_failed_mkdir_p
+  # NOTE: Make FileUtils.mkdir_p to raise error only once
+  def fake_failed_mkdir_p(error)
     original_mkdir_p = FileUtils.method(:mkdir_p)
     mkdir_p_called = false
     allow(FileUtils).to receive(:mkdir_p) do |args|
       if mkdir_p_called
         original_mkdir_p.call(*args)
       else
         mkdir_p_called = true
-        raise Errno::EMLINK
+        raise error
       end
     end
   end