diff options
author | Brian Durand <bbdurand@gmail.com> | 2018-05-03 17:27:20 -0700 |
---|---|---|
committer | Brian Durand <bbdurand@gmail.com> | 2018-05-04 10:21:17 -0700 |
commit | a779b1a08bb73be2b50d42ae69b3946de98e5af4 (patch) | |
tree | 79ef12cdb86f5730ad2c0d0171bdaf6b609b35ce /activerecord/test/cases | |
parent | 98c1432583d4607af1467425183d8d448a692c5a (diff) | |
download | rails-a779b1a08bb73be2b50d42ae69b3946de98e5af4.tar.gz rails-a779b1a08bb73be2b50d42ae69b3946de98e5af4.tar.bz2 rails-a779b1a08bb73be2b50d42ae69b3946de98e5af4.zip |
Fix logic on disabling commit callbacks
Commit callbacks are intentionally disabled when errors occur when calling the callback chain in order to reset the internal record state. However, the implicit order of operations on the logic for checking if callbacks are disabled is wrong. The result is that callbacks can be unexpectedly when errors occur in transactions.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/transaction_callbacks_test.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb index e89ac53732..05941c75ac 100644 --- a/activerecord/test/cases/transaction_callbacks_test.rb +++ b/activerecord/test/cases/transaction_callbacks_test.rb @@ -367,6 +367,26 @@ class TransactionCallbacksTest < ActiveRecord::TestCase assert_match(/:on conditions for after_commit and after_rollback callbacks have to be one of \[:create, :destroy, :update\]/, e.message) end + def test_after_commit_chain_not_called_on_errors + record_1 = TopicWithCallbacks.create! + record_2 = TopicWithCallbacks.create! + record_3 = TopicWithCallbacks.create! + callbacks = [] + record_1.after_commit_block { raise } + record_2.after_commit_block { callbacks << record_2.id } + record_3.after_commit_block { callbacks << record_3.id } + begin + TopicWithCallbacks.transaction do + record_1.save! + record_2.save! + record_3.save! + end + rescue + # From record_1.after_commit + end + assert_equal [], callbacks + end + def test_saving_a_record_with_a_belongs_to_that_specifies_touching_the_parent_should_call_callbacks_on_the_parent_object pet = Pet.first owner = pet.owner |