kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

invalid sti error message contains the full class name.

Browse source 
This can resolve confusing situation when a top level constant exists
but a namespaced version is identified.

Related to #19531.
This commit is contained in:
Yves Senn 2015-05-13 11:35:34 +02:00
parent 15354b6fd0
commit f7881d3e2b
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/inheritance.rb
View file

@ -203,7 +203,7 @@ module ActiveRecord
if subclass.name != self.name
unless descendants.include?(subclass)
raise ActiveRecord::SubclassNotFound.new("Invalid single-table inheritance type: #{subclass_name} is not a subclass of #{name}")
raise ActiveRecord::SubclassNotFound.new("Invalid single-table inheritance type: #{subclass.name} is not a subclass of #{name}")
end
subclass

11
activerecord/test/cases/inheritance_test.rb
View file

@ -213,6 +213,17 @@ class InheritanceTest < ActiveRecord::TestCase
assert_raise(ActiveRecord::SubclassNotFound) { Company.new(:type => 'Account') }
end
def test_new_with_unrelated_namespaced_type
without_store_full_sti_class do
e = assert_raises ActiveRecord::SubclassNotFound do
Namespaced::Company.new(type: 'Firm')
end
assert_equal "Invalid single-table inheritance type: Namespaced::Firm is not a subclass of Namespaced::Company", e.message
end
end
def test_new_with_complex_inheritance
assert_nothing_raised { Client.new(type: 'VerySpecialClient') }
end