From 19b9f7ba334108bd669ec6ae3bdf11d707a7d689 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 13 May 2013 12:05:22 -0700 Subject: pass the actual filter, not a string --- activesupport/lib/active_support/callbacks.rb | 2 +- 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 -- cgit v1.2.3