diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-10-01 19:17:31 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-10-01 19:17:31 +0200 |
| commit | f78650d56e75ee266a17e12cd97a136d10484a67 (patch) | |
| tree | deed1044692fa672ae1a9f74ed4164be8cd4337e /activesupport/test | |
| parent | 7db7b287ecd616d61dd09147888d02b74d219dd1 (diff) | |
| parent | e2b3ccd1aa56ae467b0fe5c7466136a4d18fa7ef (diff) | |
| download | rails-f78650d56e75ee266a17e12cd97a136d10484a67.tar.gz rails-f78650d56e75ee266a17e12cd97a136d10484a67.tar.bz2 rails-f78650d56e75ee266a17e12cd97a136d10484a67.zip | |
Merge pull request #21760 from repinel/refactor-as-callbacks-halt-config
Refactor AS::Callbacks halt config and fix the documentation
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/callbacks_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb index 4f47e0519f..3b00ff87a0 100644 --- a/activesupport/test/callbacks_test.rb +++ b/activesupport/test/callbacks_test.rb @@ -776,7 +776,7 @@ module CallbacksTest class CallbackFalseTerminatorWithConfigTrueTest < ActiveSupport::TestCase def setup - ActiveSupport::Callbacks::CallbackChain.halt_and_display_warning_on_return_false = true + ActiveSupport::Callbacks.halt_and_display_warning_on_return_false = true end def test_returning_false_does_not_halt_callback_if_config_variable_is_true @@ -789,7 +789,7 @@ module CallbacksTest class CallbackFalseTerminatorWithConfigFalseTest < ActiveSupport::TestCase def setup - ActiveSupport::Callbacks::CallbackChain.halt_and_display_warning_on_return_false = false + ActiveSupport::Callbacks.halt_and_display_warning_on_return_false = false end def test_returning_false_does_not_halt_callback_if_config_variable_is_false |