Merge pull request #1746 from Bonias/fix-mounter-blank-method

Fix `Mounter.blank?` method
carrierwaveuploader · Nov 27, 2015 · a8ee3f3 · a8ee3f3
2 parents 5217412 + 8f0539c
commit a8ee3f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/carrierwave/mounter.rb b/lib/carrierwave/mounter.rb
@@ -105,7 +105,7 @@ def urls(*args)
     end
 
     def blank?
-      uploaders.empty?
+      uploaders.none?(&:present?)
     end
 
     def remove?

diff --git a/spec/mount_multiple_spec.rb b/spec/mount_multiple_spec.rb
@@ -183,12 +183,12 @@ def monkey
     describe '#images?' do
 
       it "should be false when nothing has been assigned" do
-        expect(@instance).to receive(:read_uploader).with(:images).and_return(nil)
+        @instance.images = nil
         expect(@instance.images?).to be_falsey
       end
 
       it "should be false when an empty string has been assigned" do
-        expect(@instance).to receive(:read_uploader).with(:images).and_return('')
+        @instance.images = ''
         expect(@instance.images?).to be_falsey
       end
 

diff --git a/spec/mount_single_spec.rb b/spec/mount_single_spec.rb
@@ -177,12 +177,12 @@ def monkey
     describe '#image?' do
 
       it "should be false when nothing has been assigned" do
-        expect(@instance).to receive(:read_uploader).with(:image).and_return(nil)
+        @instance.image = nil
         expect(@instance.image?).to be_falsey
       end
 
       it "should be false when an empty string has been assigned" do
-        expect(@instance).to receive(:read_uploader).with(:image).and_return('')
+        @instance.image = ''
         expect(@instance.image?).to be_falsey
       end