Merge pull request #482 from hashwin/hashwin/after_commit

Fix after_commit for Rails 6

lib/paranoia.rb

@@ -69,6 +69,7 @@ module Paranoia
           next unless send(association.reflection.name)
           next unless send(association.reflection.name)
           association.decrement_counters
           association.decrement_counters
         end
         end
+        @_trigger_destroy_callback = true
         @_disable_counter_cache = false
         @_disable_counter_cache = false
         result
         result
       end
       end
@@ -81,6 +82,10 @@ module Paranoia
       raise(ActiveRecord::RecordNotDestroyed.new("Failed to destroy the record", self))
       raise(ActiveRecord::RecordNotDestroyed.new("Failed to destroy the record", self))
   end
   end
 
 
+  def trigger_transactional_callbacks?
+    super || @_trigger_destroy_callback && paranoia_destroyed?
+  end
+
   def paranoia_delete
   def paranoia_delete
     raise ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
     raise ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
     if persisted?
     if persisted?

test/paranoia_test.rb

@@ -131,6 +131,21 @@ class ParanoiaTest < test_framework
     assert model.instance_variable_get(:@after_commit_callback_called)
     assert model.instance_variable_get(:@after_commit_callback_called)
   end
   end
 
 
+  def test_destroy_behavior_for_freshly_loaded_plain_models_callbacks
+    model = CallbackModel.new
+    model.save
+
+    model = CallbackModel.find(model.id)
+    model.destroy
+
+    assert_nil model.instance_variable_get(:@update_callback_called)
+    assert_nil model.instance_variable_get(:@save_callback_called)
+    assert_nil model.instance_variable_get(:@validate_called)
+
+    assert model.instance_variable_get(:@destroy_callback_called)
+    assert model.instance_variable_get(:@after_destroy_callback_called)
+    assert model.instance_variable_get(:@after_commit_callback_called)
+  end
 
 
   def test_delete_behavior_for_plain_models_callbacks
   def test_delete_behavior_for_plain_models_callbacks
     model = CallbackModel.new
     model = CallbackModel.new