Merge pull request #11019 from tkhr/test_case_for_issue_10393

Add test case for issue #10393 and fix warning message

1 files changed, 23 insertions, 0 deletions

diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index 54c9152c06..99a252a389 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -290,3 +290,26 @@ class InheritanceComputeTypeTest < ActiveRecord::TestCase
     ActiveRecord::Base.store_full_sti_class = true
   end
 end
+
+
+class GlobalInheritanceColumnTest < ActiveRecord::TestCase
+  fixtures :companies
+
+  setup do
+    @inheritance_column = ActiveRecord::Base.inheritance_column
+  end
+
+  teardown do
+    ActiveRecord::Base.inheritance_column = @inheritance_column
+  end
+
+  def test_changing_global_inheritance_column
+    ActiveRecord::Base.inheritance_column = 'ruby_type'
+
+    firm = Firm.create('name' => 'FirmWithAltInheritanceColumn')
+    assert_equal 'Firm', firm.ruby_type
+
+    assert_equal 'ruby_type', Company.inheritance_column
+    assert_equal 'ruby_type', Firm.inheritance_column
+  end
+end