3 files changed, 21 insertions, 38 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index d8bc0653a1..51a8a13d04 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -876,11 +876,4 @@ class FinderTest < ActiveRecord::TestCase
     ensure
       old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
     end
-
-    def with_active_record_default_timezone(zone)
-      old_zone, ActiveRecord::Base.default_timezone = ActiveRecord::Base.default_timezone, zone
-      yield
-    ensure
-      ActiveRecord::Base.default_timezone = old_zone
-    end
 end
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 7dbb6616f8..f96978aff8 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -124,7 +124,7 @@ module LogIntercepter
   def self.extended(base)
     base.logged = []
   end
-  def log(sql, name, binds = [], &block)
+  def log(sql, name = 'SQL', binds = [], &block)
     if @intercepted
       @logged << [sql, name, binds]
       yield
diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 3dd11ae89d..85fbe01416 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -53,50 +53,40 @@ module ActiveRecord
       end
 
       def test_quoted_time_utc
-        before = ActiveRecord::Base.default_timezone
-        ActiveRecord::Base.default_timezone = :utc
-        t = Time.now
-        assert_equal t.getutc.to_s(:db), @quoter.quoted_date(t)
-      ensure
-        ActiveRecord::Base.default_timezone = before
+        with_active_record_default_timezone :utc do
+          t = Time.now
+          assert_equal t.getutc.to_s(:db), @quoter.quoted_date(t)
+        end
       end
 
       def test_quoted_time_local
-        before = ActiveRecord::Base.default_timezone
-        ActiveRecord::Base.default_timezone = :local
-        t = Time.now
-        assert_equal t.getlocal.to_s(:db), @quoter.quoted_date(t)
-      ensure
-        ActiveRecord::Base.default_timezone = before
+        with_active_record_default_timezone :local do
+          t = Time.now
+          assert_equal t.getlocal.to_s(:db), @quoter.quoted_date(t)
+        end
       end
 
       def test_quoted_time_crazy
-        before = ActiveRecord::Base.default_timezone
-        ActiveRecord::Base.default_timezone = :asdfasdf
-        t = Time.now
-        assert_equal t.getlocal.to_s(:db), @quoter.quoted_date(t)
-      ensure
-        ActiveRecord::Base.default_timezone = before
+        with_active_record_default_timezone :asdfasdf do
+          t = Time.now
+          assert_equal t.getlocal.to_s(:db), @quoter.quoted_date(t)
+        end
       end
 
       def test_quoted_datetime_utc
-        before = ActiveRecord::Base.default_timezone
-        ActiveRecord::Base.default_timezone = :utc
-        t = DateTime.now
-        assert_equal t.getutc.to_s(:db), @quoter.quoted_date(t)
-      ensure
-        ActiveRecord::Base.default_timezone = before
+        with_active_record_default_timezone :utc do
+          t = DateTime.now
+          assert_equal t.getutc.to_s(:db), @quoter.quoted_date(t)
+        end
       end
 
       ###
       # DateTime doesn't define getlocal, so make sure it does nothing
       def test_quoted_datetime_local
-        before = ActiveRecord::Base.default_timezone
-        ActiveRecord::Base.default_timezone = :local
-        t = DateTime.now
-        assert_equal t.to_s(:db), @quoter.quoted_date(t)
-      ensure
-        ActiveRecord::Base.default_timezone = before
+        with_active_record_default_timezone :local do
+          t = DateTime.now
+          assert_equal t.to_s(:db), @quoter.quoted_date(t)
+        end
       end
 
       def test_quote_with_quoted_id