diff options
author | Tony Novak <tony@amitree.com> | 2016-02-10 13:02:18 -0500 |
---|---|---|
committer | Tony Novak <tony@amitree.com> | 2016-02-10 13:02:18 -0500 |
commit | 03980b2a0e7797d8e24b9fb6ebd96693bc95b326 (patch) | |
tree | d4cbde83c85a954ac084532bf347515dba77c1cc | |
parent | 688996da7b25080a1a2ef74f5b4789f3e5eb670d (diff) | |
download | rails-03980b2a0e7797d8e24b9fb6ebd96693bc95b326.tar.gz rails-03980b2a0e7797d8e24b9fb6ebd96693bc95b326.tar.bz2 rails-03980b2a0e7797d8e24b9fb6ebd96693bc95b326.zip |
Converting backtrace to strings before calling set_backtrace
Fixes #23058
-rw-r--r-- | activesupport/lib/active_support/deprecation/behaviors.rb | 2 | ||||
-rw-r--r-- | activesupport/test/deprecation_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/deprecation/behaviors.rb b/activesupport/lib/active_support/deprecation/behaviors.rb index 0de891f1a2..dc24e2d0e1 100644 --- a/activesupport/lib/active_support/deprecation/behaviors.rb +++ b/activesupport/lib/active_support/deprecation/behaviors.rb @@ -11,7 +11,7 @@ module ActiveSupport DEFAULT_BEHAVIORS = { raise: ->(message, callstack) { e = DeprecationException.new(message) - e.set_backtrace(callstack) + e.set_backtrace(callstack.map(&:to_s)) raise e }, diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb index 58a0a3964d..45c88b79cb 100644 --- a/activesupport/test/deprecation_test.rb +++ b/activesupport/test/deprecation_test.rb @@ -105,13 +105,13 @@ class DeprecationTest < ActiveSupport::TestCase ActiveSupport::Deprecation.behavior = :raise message = 'Revise this deprecated stuff now!' - callstack = %w(foo bar baz) + callstack = caller_locations e = assert_raise ActiveSupport::DeprecationException do ActiveSupport::Deprecation.behavior.first.call(message, callstack) end assert_equal message, e.message - assert_equal callstack, e.backtrace + assert_equal callstack.map(&:to_s), e.backtrace.map(&:to_s) end def test_default_stderr_behavior |