diff options
| author | Roque Pinel <repinel@gmail.com> | 2015-08-12 20:49:23 -0400 |
|---|---|---|
| committer | Roque Pinel <repinel@gmail.com> | 2015-09-22 22:32:56 -0400 |
| commit | 35cd3656218f800aaf2500c23945cf7fe084d1a7 (patch) | |
| tree | 39e98c98fd29286651061ad6f6858081a9a0ce4c /activerecord | |
| parent | eb52c8979b4e8023f8415e5f8a568e8933ecbd38 (diff) | |
| download | rails-35cd3656218f800aaf2500c23945cf7fe084d1a7.tar.gz rails-35cd3656218f800aaf2500c23945cf7fe084d1a7.tar.bz2 rails-35cd3656218f800aaf2500c23945cf7fe084d1a7.zip | |
Fix the AS::Callbacks terminator regression from 4.2.3
Rails 4.2.3 AS::Callbacks will not halt chain if `false` is returned.
That is the behavior of specific callbacks like AR::Callbacks and
AM::Callbacks.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/attribute_test.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 4a569fc242..1a2988ea77 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -11,6 +11,7 @@ module ActiveRecord :before_commit_without_transaction_enrollment, :commit_without_transaction_enrollment, :rollback_without_transaction_enrollment, + terminator: deprecated_false_terminator, scope: [:kind, :name] end diff --git a/activerecord/test/cases/attribute_test.rb b/activerecord/test/cases/attribute_test.rb index 0ec368f51d..c69782d93f 100644 --- a/activerecord/test/cases/attribute_test.rb +++ b/activerecord/test/cases/attribute_test.rb @@ -4,7 +4,6 @@ module ActiveRecord class AttributeTest < ActiveRecord::TestCase setup do @type = Minitest::Mock.new - @type.expect(:==, false, [false]) end teardown do |