diff options
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/attribute_methods_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/dirty_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/helper.rb | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index 059dc8cff3..e0cde4f7f3 100644 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -12,7 +12,7 @@ require 'models/contact' 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 ac1ab801da..d4fc5f204b 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 cb1edc4627..1bff005510 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -135,7 +135,9 @@ module LogIntercepter end end -module InTimeZome +module InTimeZone + private + def in_time_zone(zone) old_zone = Time.zone old_tz = ActiveRecord::Base.time_zone_aware_attributes |