aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/transaction_callbacks_test.rb
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2015-02-13 21:10:53 -0500
committerArthur Neves <arthurnn@gmail.com>2015-02-24 19:16:28 -0500
commit7d2a87281c7fc8ecfdf6ab7d6beedc49d166424b (patch)
tree06a27b66d511e99176c55ea40fb610bc423b1f5f /activerecord/test/cases/transaction_callbacks_test.rb
parent4a1bb9d0ce985fd105f930078a733601b29ef8a4 (diff)
downloadrails-7d2a87281c7fc8ecfdf6ab7d6beedc49d166424b.tar.gz
rails-7d2a87281c7fc8ecfdf6ab7d6beedc49d166424b.tar.bz2
rails-7d2a87281c7fc8ecfdf6ab7d6beedc49d166424b.zip
Add before_commit
[fixes #18903]
Diffstat (limited to 'activerecord/test/cases/transaction_callbacks_test.rb')
-rw-r--r--activerecord/test/cases/transaction_callbacks_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb
index 60b0fd4112..5cac9ff84b 100644
--- a/activerecord/test/cases/transaction_callbacks_test.rb
+++ b/activerecord/test/cases/transaction_callbacks_test.rb
@@ -407,7 +407,8 @@ class TransactionEnrollmentCallbacksTest < ActiveRecord::TestCase
class TopicWithoutTransactionalEnrollmentCallbacks < ActiveRecord::Base
self.table_name = :topics
- after_commit_without_transaction_enrollment { |r| r.history << :commit }
+ before_commit_without_transaction_enrollment { |r| r.history << :before_commit }
+ after_commit_without_transaction_enrollment { |r| r.history << :after_commit }
after_rollback_without_transaction_enrollment { |r| r.history << :rollback }
def history
@@ -435,7 +436,7 @@ class TransactionEnrollmentCallbacksTest < ActiveRecord::TestCase
end
@topic.class.connection.add_transaction_record(@topic)
end
- assert_equal [:commit], @topic.history
+ assert_equal [:before_commit, :after_commit], @topic.history
end
def test_rollback_dont_enroll_transaction