aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-05-05 18:07:12 +0930
committerMatthew Draper <matthew@trebex.net>2017-05-05 18:22:16 +0930
commitae73637e35db20d0c4e14959d8c1274e5399278e (patch)
tree3a6103304320d0cd9cfc7f2dbf56eb1f97c181ee /activerecord/test
parent3d890b66c1bfbdcabb7ef66e0774e0f01e2ed5d6 (diff)
downloadrails-ae73637e35db20d0c4e14959d8c1274e5399278e.tar.gz
rails-ae73637e35db20d0c4e14959d8c1274e5399278e.tar.bz2
rails-ae73637e35db20d0c4e14959d8c1274e5399278e.zip
Clarify deprecation message for #quoted_id
In this case, it's the method definition that's more at fault, rather than the current caller.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/quoting_test.rb15
1 files changed, 14 insertions, 1 deletions
diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index f260d043e4..f647526fbc 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -81,8 +81,21 @@ module ActiveRecord
end
end
+ class QuotedOne
+ def quoted_id
+ 1
+ end
+ end
+ class SubQuotedOne < QuotedOne
+ end
def test_quote_with_quoted_id
- assert_deprecated { assert_equal 1, @quoter.quote(Struct.new(:quoted_id).new(1)) }
+ assert_deprecated /defined on \S+::QuotedOne at .*quoting_test\.rb:[0-9]/ do
+ assert_equal 1, @quoter.quote(QuotedOne.new)
+ end
+
+ assert_deprecated /defined on \S+::SubQuotedOne\(\S+::QuotedOne\) at .*quoting_test\.rb:[0-9]/ do
+ assert_equal 1, @quoter.quote(SubQuotedOne.new)
+ end
end
def test_quote_nil