1 files changed, 5 insertions, 24 deletions

diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 85fbe01416..e2439b9a24 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -53,28 +53,28 @@ module ActiveRecord
       end
 
       def test_quoted_time_utc
-        with_active_record_default_timezone :utc do
+        with_timezone_config default: :utc do
           t = Time.now
           assert_equal t.getutc.to_s(:db), @quoter.quoted_date(t)
         end
       end
 
       def test_quoted_time_local
-        with_active_record_default_timezone :local do
+        with_timezone_config default: :local do
           t = Time.now
           assert_equal t.getlocal.to_s(:db), @quoter.quoted_date(t)
         end
       end
 
       def test_quoted_time_crazy
-        with_active_record_default_timezone :asdfasdf do
+        with_timezone_config default: :asdfasdf do
           t = Time.now
           assert_equal t.getlocal.to_s(:db), @quoter.quoted_date(t)
         end
       end
 
       def test_quoted_datetime_utc
-        with_active_record_default_timezone :utc do
+        with_timezone_config default: :utc do
           t = DateTime.now
           assert_equal t.getutc.to_s(:db), @quoter.quoted_date(t)
         end
@@ -83,7 +83,7 @@ module ActiveRecord
       ###
       # DateTime doesn't define getlocal, so make sure it does nothing
       def test_quoted_datetime_local
-        with_active_record_default_timezone :local do
+        with_timezone_config default: :local do
           t = DateTime.now
           assert_equal t.to_s(:db), @quoter.quoted_date(t)
         end
@@ -184,25 +184,6 @@ module ActiveRecord
         assert_equal "'lo\\\\l'", @quoter.quote('lo\l', FakeColumn.new(:binary))
       end
 
-      def test_quote_binary_with_string_to_binary
-        col = Class.new(FakeColumn) {
-          def string_to_binary(value)
-            'foo'
-          end
-        }.new(:binary)
-        assert_equal "'foo'", @quoter.quote('lo\l', col)
-      end
-
-      def test_quote_as_mb_chars_binary_column_with_string_to_binary
-        col = Class.new(FakeColumn) {
-          def string_to_binary(value)
-            'foo'
-          end
-        }.new(:binary)
-        string = ActiveSupport::Multibyte::Chars.new('lo\l')
-        assert_equal "'foo'", @quoter.quote(string, col)
-      end
-
       def test_string_with_crazy_column
         assert_equal "'lo\\\\l'", @quoter.quote('lo\l', FakeColumn.new(:foo))
       end