1 files changed, 37 insertions, 6 deletions
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index a90058e8bb..c1c2efb9c8 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -100,7 +100,13 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_reflection_klass_for_nested_class_name
-    reflection = ActiveRecord::Reflection.create(:has_many, nil, nil, { class_name: "MyApplication::Business::Company" }, ActiveRecord::Base)
+    reflection = ActiveRecord::Reflection.create(
+      :has_many,
+      nil,
+      nil,
+      { class_name: "MyApplication::Business::Company" },
+      Customer
+    )
     assert_nothing_raised do
       assert_equal MyApplication::Business::Company, reflection.klass
     end
@@ -252,7 +258,9 @@ class ReflectionTest < ActiveRecord::TestCase
       [Post.reflect_on_association(:first_taggings).scope],
       [Author.reflect_on_association(:misc_posts).scope]
     ]
-    actual = Author.reflect_on_association(:misc_post_first_blue_tags).scope_chain
+    actual = assert_deprecated do
+      Author.reflect_on_association(:misc_post_first_blue_tags).scope_chain
+    end
     assert_equal expected, actual
 
     expected = [
@@ -264,7 +272,9 @@ class ReflectionTest < ActiveRecord::TestCase
       [],
       []
     ]
-    actual = Author.reflect_on_association(:misc_post_first_blue_tags_2).scope_chain
+    actual = assert_deprecated do
+      Author.reflect_on_association(:misc_post_first_blue_tags_2).scope_chain
+    end
     assert_equal expected, actual
   end
 
@@ -325,6 +335,15 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal "custom_primary_key", Author.reflect_on_association(:tags_with_primary_key).association_primary_key.to_s # nested
   end
 
+  def test_association_primary_key_type
+    # Normal Association
+    assert_equal :integer, Author.reflect_on_association(:posts).association_primary_key_type.type
+    assert_equal :string,  Author.reflect_on_association(:essay).association_primary_key_type.type
+
+    # Through Association
+    assert_equal :string, Author.reflect_on_association(:essay_category).association_primary_key_type.type
+  end
+
   def test_association_primary_key_raises_when_missing_primary_key
     reflection = ActiveRecord::Reflection.create(:has_many, :edge, nil, {}, Author)
     assert_raises(ActiveRecord::UnknownPrimaryKey) { reflection.association_primary_key }
@@ -389,15 +408,27 @@ class ReflectionTest < ActiveRecord::TestCase
   end
 
   def test_through_reflection_scope_chain_does_not_modify_other_reflections
-    orig_conds = Post.reflect_on_association(:first_blue_tags_2).scope_chain.inspect
-    Author.reflect_on_association(:misc_post_first_blue_tags_2).scope_chain
-    assert_equal orig_conds, Post.reflect_on_association(:first_blue_tags_2).scope_chain.inspect
+    orig_conds = assert_deprecated do
+      Post.reflect_on_association(:first_blue_tags_2).scope_chain
+    end.inspect
+    assert_deprecated do
+      Author.reflect_on_association(:misc_post_first_blue_tags_2).scope_chain
+    end
+    assert_equal orig_conds, assert_deprecated {
+      Post.reflect_on_association(:first_blue_tags_2).scope_chain
+    }.inspect
   end
 
   def test_symbol_for_class_name
     assert_equal Client, Firm.reflect_on_association(:unsorted_clients_with_symbol).klass
   end
 
+  def test_class_for_class_name
+    assert_deprecated do
+      assert_predicate ActiveRecord::Reflection.create(:has_many, :clients, nil, { class_name: Client }, Firm), :validate?
+    end
+  end
+
   def test_join_table
     category = Struct.new(:table_name, :pluralize_table_names).new("categories", true)
     product = Struct.new(:table_name, :pluralize_table_names).new("products", true)