Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix invalid time test. Closes #10632 [Dirkjan Bussink]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8518 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 42622f23b4a1f0c0879d932ac460953f028686b5 1 parent 438b108
Jeremy Kemper jeremy authored
2  activesupport/CHANGELOG
View
@@ -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]
2  activesupport/test/core_ext/time_ext_test.rb
View
@@ -277,7 +277,7 @@ def test_utc_advance
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)
9 activesupport/test/multibyte_chars_test.rb
View
@@ -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'
Please sign in to comment.
Something went wrong with that request. Please try again.