Merge pull request #2674 from y-yagi/fix-NoMethodError-from-remove_added

Fix a `NoMethodError` when a record is rollbacked

lib/carrierwave/mounter.rb

@@ -202,7 +202,7 @@ def remove_previous
     end
 
     def remove_added
-      current_paths = (@removed_uploaders + @uploaders.select(&:staged)).map(&:path)
+      current_paths = (@removed_uploaders + uploaders.select(&:staged)).map(&:path)
       @added_uploaders
         .reject {|uploader| current_paths.include?(uploader.path) }
         .each { |uploader| uploader.remove! }

spec/orm/activerecord_spec.rb

@@ -947,6 +947,18 @@ def filename
       expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
     end
 
+    it 'should not remove a file if transaction is rollback' do
+      @event.image = stub_file('new.jpeg')
+      @event.save
+
+      Event.transaction do
+        @event.destroy
+        raise ActiveRecord::Rollback
+      end
+
+      expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+    end
+
     it "should clear @added_uploaders on commit" do
       # Simulate the commit behavior, since we're using the transactional fixture
       @event.run_callbacks(:commit) do