diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-02 08:26:37 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-02 08:26:37 +0000 |
| commit | 42622f23b4a1f0c0879d932ac460953f028686b5 (patch) | |
| tree | 1018ba566a3b01341b6545017029a80958c8ebd5 | |
| parent | 438b108c6bea3d9781c0ecd5e53d362b29fe7f6b (diff) | |
| download | rails-42622f23b4a1f0c0879d932ac460953f028686b5.tar.gz rails-42622f23b4a1f0c0879d932ac460953f028686b5.tar.bz2 rails-42622f23b4a1f0c0879d932ac460953f028686b5.zip | |
Fix invalid time test. Closes #10632 [Dirkjan Bussink]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8518 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/test/core_ext/time_ext_test.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/multibyte_chars_test.rb | 9 |
3 files changed, 3 insertions, 10 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 059a3ebbe0..ad3b76aa48 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -6,7 +6,7 @@ * Hash#symbolize_keys skips keys that can't be symbolized. #10500 [Brad Greenlee] -* Ruby 1.9 compatibility. #1689, #10466, #10468, #10554 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink] +* Ruby 1.9 compatibility. #1689, #10466, #10468, #10554, #10632 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink] * TimeZone#to_s uses UTC rather than GMT. #1689 [Cheah Chu Yeow] diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb index c0bd12d2ae..be847a317d 100644 --- a/activesupport/test/core_ext/time_ext_test.rb +++ b/activesupport/test/core_ext/time_ext_test.rb @@ -277,7 +277,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase def test_next_week with_timezone 'US/Eastern' do assert_equal Time.local(2005,2,28), Time.local(2005,2,22,15,15,10).next_week - assert_equal Time.local(2005,2,29), Time.local(2005,2,22,15,15,10).next_week(:tuesday) + assert_equal Time.local(2005,3,1), Time.local(2005,2,22,15,15,10).next_week(:tuesday) assert_equal Time.local(2005,3,4), Time.local(2005,2,22,15,15,10).next_week(:friday) assert_equal Time.local(2006,10,30), Time.local(2006,10,23,0,0,0).next_week assert_equal Time.local(2006,11,1), Time.local(2006,10,23,0,0,0).next_week(:wednesday) diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb index 4afb63b949..4e4a3e2d90 100644 --- a/activesupport/test/multibyte_chars_test.rb +++ b/activesupport/test/multibyte_chars_test.rb @@ -1,13 +1,6 @@ require 'abstract_unit' -if RUBY_VERSION >= '1.9' - class CharsTest < Test::Unit::TestCase - def test_chars_returns_self - str = 'abc' - assert_equal str.object_id, str.chars.object_id - end - end -else +if RUBY_VERSION < '1.9' $KCODE = 'UTF8' |