diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-11-05 10:29:20 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-11-05 10:29:20 +0100 |
| commit | 38a7d801bae9fa62328cd65a7edd83d75aa58484 (patch) | |
| tree | 5a99a2fb97a23e9d829389cb4e2d4e6935b62dec | |
| parent | a9d199016969d42a4cea44a7b44d4a0724100788 (diff) | |
| parent | e130a0e7b476553c538075239554247e4196dd05 (diff) | |
| download | rails-38a7d801bae9fa62328cd65a7edd83d75aa58484.tar.gz rails-38a7d801bae9fa62328cd65a7edd83d75aa58484.tar.bz2 rails-38a7d801bae9fa62328cd65a7edd83d75aa58484.zip | |
Merge pull request #17518 from prathamesh-sonpatki/fix-activesupport
Fix broken string_ext_test due to change in timezone
| -rw-r--r-- | activesupport/test/core_ext/string_ext_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 35095f2b2d..b97aa56aef 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -418,7 +418,7 @@ class StringConversionsTest < ActiveSupport::TestCase now = Time.now assert_equal Time.local(now.year, now.month, now.day, 23, 50), "23:50".to_time assert_equal Time.utc(now.year, now.month, now.day, 23, 50), "23:50".to_time(:utc) - assert_equal Time.local(now.year, now.month, now.day, 18, 50), "13:50 -0100".to_time + assert_equal Time.local(now.year, now.month, now.day, 17, 50), "13:50 -0100".to_time assert_equal Time.utc(now.year, now.month, now.day, 23, 50), "22:50 -0100".to_time(:utc) end end |