diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index 059dc8cff3f5e28fcf673d66b275256081439171..e0cde4f7f3c5ecea642a54a8d5327b6ce4dc49ba 100644 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -12,7 +12,7 @@ require 'models/keyboard' class AttributeMethodsTest < ActiveRecord::TestCase - include InTimeZome + include InTimeZone fixtures :topics, :developers, :companies, :computers diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb index ac1ab801daa18ce6606063e3d3797d802506fa61..d4fc5f204b8a47893d29ba86165322c03730688b 100644 --- a/activerecord/test/cases/dirty_test.rb +++ b/activerecord/test/cases/dirty_test.rb @@ -27,7 +27,7 @@ class NumericData < ActiveRecord::Base end class DirtyTest < ActiveRecord::TestCase - include InTimeZome + include InTimeZone # Dummy to force column loads so query counts are clean. def setup diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index cb1edc46278ec7f74b8ed59cbab45cf269c6018a..1bff0055109d4773f5c20fe134f47b2def15a808 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -135,7 +135,9 @@ def log(sql, name, binds = [], &block) end end -module InTimeZome +module InTimeZone + private + def in_time_zone(zone) old_zone = Time.zone old_tz = ActiveRecord::Base.time_zone_aware_attributes