Do not trigger *_will_change! when file is not to be removed. Fixes #…

…2323
carrierwaveuploader · Jun 19, 2019 · eab8267 · eab8267
1 parent 0f733d2
commit eab8267
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/carrierwave/orm/activerecord.rb b/lib/carrierwave/orm/activerecord.rb
@@ -77,8 +77,9 @@ def #{column}=(new_file)
 
         def remove_#{column}=(value)
           column = _mounter(:#{column}).serialization_column
-          __send__(:"\#{column}_will_change!")
-          super
+          result = super
+          __send__(:"\#{column}_will_change!") if _mounter(:#{column}).remove?
+          result
         end
 
         def remove_#{column}!

diff --git a/spec/orm/activerecord_spec.rb b/spec/orm/activerecord_spec.rb
@@ -1249,6 +1249,13 @@ def monkey
         @event.remove_images = "1"
         expect(@event.images_changed?).to be_truthy
       end
+
+      it "should not mark the images as changed if falsey value is assigned" do
+        @event.remove_images = "0"
+        expect(@event.images_changed?).to be_falsey
+        @event.remove_images = "false"
+        expect(@event.images_changed?).to be_falsey
+      end
     end
 
     describe "#remote_images_urls=" do