diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2011-07-19 14:11:03 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2011-07-19 14:11:03 -0700 |
| commit | b8a4e9fc6d4b7020d1fdeaa39e935330c5dadccd (patch) | |
| tree | 415906835c0d052ab2ef811993bc4c2123a71b70 | |
| parent | 37418e546834a034d1ad923f3f46f9b14f87d7a6 (diff) | |
| parent | 322393f8cb724c6a0533be61ffca8c42de0b352d (diff) | |
| download | rails-b8a4e9fc6d4b7020d1fdeaa39e935330c5dadccd.tar.gz rails-b8a4e9fc6d4b7020d1fdeaa39e935330c5dadccd.tar.bz2 rails-b8a4e9fc6d4b7020d1fdeaa39e935330c5dadccd.zip | |
Merge pull request #2160 from joshk/patch-5
Changed the year of a date used in a test which fails when using 1.8.7
| -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 4000cc913a..18a86e08f5 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -158,7 +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_equal Time.utc(2011, 2, 27, 23, 50), "2011-02-27 22:50 -0100".to_time assert_nil "".to_time end |