aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-02-10 16:03:10 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2016-02-10 16:03:10 -0800
commitab4708c9a25fb2a113a9c95697055fd79cdfc63a (patch)
treee787ab6fe5118ff3f90ab21b639736b47b4d4a65
parent2db347bebc9d3f39b3c5e274b7c9beecfce73913 (diff)
parent03980b2a0e7797d8e24b9fb6ebd96693bc95b326 (diff)
downloadrails-ab4708c9a25fb2a113a9c95697055fd79cdfc63a.tar.gz
rails-ab4708c9a25fb2a113a9c95697055fd79cdfc63a.tar.bz2
rails-ab4708c9a25fb2a113a9c95697055fd79cdfc63a.zip
Merge pull request #23596 from afn/issue-23058
Converting backtrace to strings before calling set_backtrace
-rw-r--r--activesupport/lib/active_support/deprecation/behaviors.rb2
-rw-r--r--activesupport/test/deprecation_test.rb4
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