Fix tests for validation of default_timezone

Author: rafaelfranca

activerecord/lib/active_record.rb

@@ -185,19 +185,19 @@ module Tasks
   singleton_class.attr_accessor :legacy_connection_handling
   self.legacy_connection_handling = true
 
+  singleton_class.attr_reader :default_timezone
+
   # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling
   # dates and times from the database. This is set to :utc by default.
   def self.default_timezone=(default_timezone)
-    unless %i[local utc].include?(default_timezone)
-      raise ArgumentError, 'default_timezone must be either :utc (default) or :local'
+    unless %i(local utc).include?(default_timezone)
+      raise ArgumentError, "default_timezone must be either :utc (default) or :local."
     end
 
     @default_timezone = default_timezone
   end
 
-  def self.default_timezone
-    @default_timezone ||= :utc
-  end
+  self.default_timezone = :utc
 
   singleton_class.attr_accessor :writing_role
   self.writing_role = :writing

activerecord/test/cases/date_time_test.rb

@@ -9,7 +9,7 @@ class DateTimeTest < ActiveRecord::TestCase
 
   def test_default_timezone_validation
     assert_raises ArgumentError do
-      ActiveRecord.default_timezone = 'UTC'
+      ActiveRecord.default_timezone = "UTC"
     end
 
     # These values should not raise errors

activerecord/test/cases/quoting_test.rb

@@ -60,13 +60,6 @@ def test_quoted_timestamp_local
         end
       end
 
-      def test_quoted_timestamp_nonsense
-        with_timezone_config default: :asdfasdf do
-          t = Time.now.change(usec: 0)
-          assert_equal t.getlocal.to_s(:db), @quoter.quoted_date(t)
-        end
-      end
-
       def test_quoted_time_utc
         with_timezone_config default: :utc do
           t = Time.now.change(usec: 0)
@@ -115,17 +108,6 @@ def test_quoted_time_dst_local
         end
       end
 
-      def test_quoted_time_nonsense
-        with_timezone_config default: :asdfasdf do
-          t = Time.now.change(usec: 0)
-
-          expected = t.change(year: 2000, month: 1, day: 1)
-          expected = expected.getlocal.to_s(:db).sub("2000-01-01 ", "")
-
-          assert_equal expected, @quoter.quoted_time(t)
-        end
-      end
-
       def test_quoted_datetime_utc
         with_timezone_config default: :utc do
           t = Time.now.change(usec: 0).to_datetime