diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-06 12:36:47 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-06 12:36:47 -0700 |
| commit | d10d93225c6d9d4948400c22df4169075758ff8c (patch) | |
| tree | cc7a0764839e5604a84fc6fd2af8db8ceadaaef6 /activesupport/test/core_ext/string_ext_test.rb | |
| parent | d5bd7030e56d3531a1ee7949ddaac691f6b27ed2 (diff) | |
| parent | f449da53ac69495e736c7f1ce0f1bc6ebe356081 (diff) | |
| download | rails-d10d93225c6d9d4948400c22df4169075758ff8c.tar.gz rails-d10d93225c6d9d4948400c22df4169075758ff8c.tar.bz2 rails-d10d93225c6d9d4948400c22df4169075758ff8c.zip | |
Merge pull request #1463 from psanford/master
Fix timezone handling in String.to_time
Diffstat (limited to 'activesupport/test/core_ext/string_ext_test.rb')
| -rw-r--r-- | activesupport/test/core_ext/string_ext_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 0360cf2901..4000cc913a 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -158,6 +158,7 @@ class StringInflectionsTest < Test::Unit::TestCase assert_equal Time.local(2005, 2, 27, 23, 50, 19, 275038), "2005-02-27T23:50:19.275038".to_time(:local) assert_equal DateTime.civil(2039, 2, 27, 23, 50), "2039-02-27 23:50".to_time assert_equal Time.local_time(2039, 2, 27, 23, 50), "2039-02-27 23:50".to_time(:local) + assert_equal Time.utc(2039, 2, 27, 23, 50), "2039-02-27 22:50 -0100".to_time assert_nil "".to_time end |