1 files changed, 9 insertions, 4 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index f1459ae125..e0ad9f5ec1 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -117,8 +117,8 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal "The Fourth Topic of the day", records[2].title
   end
 
-  def test_find_passing_active_record_object_is_deprecated
-    assert_deprecated do
+  def test_find_passing_active_record_object_is_not_permitted
+    assert_raises(ArgumentError) do
       Topic.find(Topic.last)
     end
   end
@@ -167,8 +167,8 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal false, relation.exists?(false)
   end
 
-  def test_exists_passing_active_record_object_is_deprecated
-    assert_deprecated do
+  def test_exists_passing_active_record_object_is_not_permitted
+    assert_raises(ArgumentError) do
       Topic.exists?(Topic.new)
     end
   end
@@ -339,6 +339,11 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal author.post, Post.find_by(author_id: Author.where(id: author))
   end
 
+  def test_find_by_and_where_consistency_with_active_record_instance
+    author = authors(:david)
+    assert_equal Post.where(author_id: author).take, Post.find_by(author_id: author)
+  end
+
   def test_take
     assert_equal topics(:first), Topic.take
   end