From 82472b3922bda2f337a79cef961b4760d04f9689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 17 Jul 2017 17:46:07 -0400
Subject: Remove deprecated support to `quoted_id` when typecasting an Active
 Record object

---
 activerecord/test/cases/quoting_test.rb  | 37 --------------------------------
 activerecord/test/cases/sanitize_test.rb | 12 -----------
 2 files changed, 49 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 59d3bbb573..897d252cf8 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -83,23 +83,6 @@ module ActiveRecord
         end
       end
 
-      class QuotedOne
-        def quoted_id
-          1
-        end
-      end
-      class SubQuotedOne < QuotedOne
-      end
-      def test_quote_with_quoted_id
-        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
         assert_equal "NULL", @quoter.quote(nil)
       end
@@ -207,26 +190,6 @@ module ActiveRecord
         obj = Class.new.new
         assert_raise(TypeError) { @conn.type_cast(obj) }
       end
-
-      def test_type_cast_object_which_responds_to_quoted_id
-        quoted_id_obj = Class.new {
-          def quoted_id
-            "'zomg'"
-          end
-
-          def id
-            10
-          end
-        }.new
-        assert_equal 10, @conn.type_cast(quoted_id_obj)
-
-        quoted_id_obj = Class.new {
-          def quoted_id
-            "'zomg'"
-          end
-        }.new
-        assert_raise(TypeError) { @conn.type_cast(quoted_id_obj) }
-      end
     end
 
     class QuoteBooleanTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/sanitize_test.rb b/activerecord/test/cases/sanitize_test.rb
index 082d663675..85a555fe35 100644
--- a/activerecord/test/cases/sanitize_test.rb
+++ b/activerecord/test/cases/sanitize_test.rb
@@ -153,18 +153,6 @@ class SanitizeTest < ActiveRecord::TestCase
     assert_equal "name=#{quoted_bambi_and_thumper}", bind("name=?", "Bambi\nand\nThumper".mb_chars)
   end
 
-  def test_bind_record
-    o = Class.new {
-      def quoted_id
-        1
-      end
-    }.new
-    assert_deprecated { assert_equal "1", bind("?", o) }
-
-    os = [o] * 3
-    assert_deprecated { assert_equal "1,1,1", bind("?", os) }
-  end
-
   def test_named_bind_with_postgresql_type_casts
     l = Proc.new { bind(":a::integer '2009-01-01'::date", a: "10") }
     assert_nothing_raised(&l)
-- 
cgit v1.2.3