Merge branch 'master' of https://github.com/rails/rails

1 files changed, 13 insertions, 9 deletions

diff --git a/activerecord/test/cases/date_time_test.rb b/activerecord/test/cases/date_time_test.rb
index a8b4b7a096..3deb0dac99 100644
--- a/activerecord/test/cases/date_time_test.rb
+++ b/activerecord/test/cases/date_time_test.rb
@@ -4,17 +4,21 @@ require 'models/task'
 
 class DateTimeTest < ActiveRecord::TestCase
   def test_saves_both_date_and_time
-    time_values = [1807, 2, 10, 15, 30, 45]
-    # create DateTime value with local time zone offset
-    local_offset = Rational(Time.local_time(*time_values).utc_offset, 86400)
-    now = DateTime.civil(*(time_values + [local_offset]))
+    with_env_tz 'America/New_York' do
+      with_active_record_default_timezone :utc do
+        time_values = [1807, 2, 10, 15, 30, 45]
+        # create DateTime value with local time zone offset
+        local_offset = Rational(Time.local_time(*time_values).utc_offset, 86400)
+        now = DateTime.civil(*(time_values + [local_offset]))
 
-    task = Task.new
-    task.starting = now
-    task.save!
+        task = Task.new
+        task.starting = now
+        task.save!
 
-    # check against Time.local_time, since some platforms will return a Time instead of a DateTime
-    assert_equal Time.local_time(*time_values), Task.find(task.id).starting
+        # check against Time.local_time, since some platforms will return a Time instead of a DateTime
+        assert_equal Time.local_time(*time_values), Task.find(task.id).starting
+      end
+    end
   end
 
   def test_assign_empty_date_time