diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index ee4d11d29e..9603e66017 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ env: - "GEM=ac" - "GEM=ac FAYE=1" - "GEM=am,amo,as,av,aj" + - "GEM=as PRESERVE_TIMEZONES=1" - "GEM=ar:mysql2" - "GEM=ar:sqlite3" - "GEM=ar:postgresql" diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 7f0fcd6996..bab7440397 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -18,6 +18,9 @@ Thread.abort_on_exception = true # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true +# Default to old to_time behavior but allow running tests with new behavior +ActiveSupport.to_time_preserves_timezone = ENV['PRESERVE_TIMEZONES'] == '1' + # Disable available locale checks to avoid warnings running the test suite. I18n.enforce_available_locales = false |