diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-13 12:05:22 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-13 12:05:22 -0700 |
| commit | 19b9f7ba334108bd669ec6ae3bdf11d707a7d689 (patch) | |
| tree | 4ed1ad2883bb8d23cdd4f909ca337ddf8cee257a | |
| parent | d53b5f073924e8b397ec86f7ad092aa0b5ed3fe4 (diff) | |
| download | rails-19b9f7ba334108bd669ec6ae3bdf11d707a7d689.tar.gz rails-19b9f7ba334108bd669ec6ae3bdf11d707a7d689.tar.bz2 rails-19b9f7ba334108bd669ec6ae3bdf11d707a7d689.zip | |
pass the actual filter, not a string
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/callbacks_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index e733257b67..4819fe71de 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -171,7 +171,7 @@ module ActiveSupport result = user_callback.call target, value env.halted = halted_lambda.call result if env.halted - target.send :halted_callback_hook, @filter.inspect + target.send :halted_callback_hook, @filter end end next_callback.call env diff --git a/activesupport/test/callbacks_test.rb b/activesupport/test/callbacks_test.rb index 091fe90bcc..68878c0189 100644 --- a/activesupport/test/callbacks_test.rb +++ b/activesupport/test/callbacks_test.rb @@ -718,7 +718,7 @@ module CallbacksTest def test_termination_invokes_hook terminator = CallbackTerminator.new terminator.save - assert_equal ":second", terminator.halted + assert_equal :second, terminator.halted end def test_block_never_called_if_terminated |