diff options
| author | Andrew White <andrew.white@unboxedconsulting.com> | 2016-04-23 14:46:50 +0100 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxedconsulting.com> | 2016-04-23 15:03:50 +0100 |
| commit | c9c5788a527b70d7f983e2b4b47e3afd863d9f48 (patch) | |
| tree | 3b06bbd1555d74180ea48ad5a1ec6bbd5284261b /activesupport/test/time_zone_test_helpers.rb | |
| parent | 1ffa1a852e79feee9d4793fb60992a920909c316 (diff) | |
| download | rails-c9c5788a527b70d7f983e2b4b47e3afd863d9f48.tar.gz rails-c9c5788a527b70d7f983e2b4b47e3afd863d9f48.tar.bz2 rails-c9c5788a527b70d7f983e2b4b47e3afd863d9f48.zip | |
Add compatibility for Ruby 2.4 `to_time` changes
In Ruby 2.4 the `to_time` method for both `DateTime` and `Time` will
preserve the timezone of the receiver when converting to an instance
of `Time`. Since Rails 5.0 will support Ruby 2.2, 2.3 and later we
need to introduce a compatibility layer so that apps that upgrade do
not break. New apps will have a config initializer file that defaults
to match the new Ruby 2.4 behavior going forward.
For information about the changes to Ruby see:
https://bugs.ruby-lang.org/issues/12189
https://bugs.ruby-lang.org/issues/12271
Fixes #24617.
Diffstat (limited to 'activesupport/test/time_zone_test_helpers.rb')
| -rw-r--r-- | activesupport/test/time_zone_test_helpers.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activesupport/test/time_zone_test_helpers.rb b/activesupport/test/time_zone_test_helpers.rb index 9632b89d09..eb6f7d0f85 100644 --- a/activesupport/test/time_zone_test_helpers.rb +++ b/activesupport/test/time_zone_test_helpers.rb @@ -13,4 +13,12 @@ module TimeZoneTestHelpers ensure old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ') end + + def with_preserve_timezone(value) + old_preserve_tz = ActiveSupport.to_time_preserves_timezone + ActiveSupport.to_time_preserves_timezone = value + yield + ensure + ActiveSupport.to_time_preserves_timezone = old_preserve_tz + end end |