Skip to content
This repository
Browse code

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 authored January 02, 2008
2  activesupport/CHANGELOG
@@ -6,7 +6,7 @@
6 6
 
7 7
 * Hash#symbolize_keys skips keys that can't be symbolized.  #10500 [Brad Greenlee]
8 8
 
9  
-* Ruby 1.9 compatibility.  #1689, #10466, #10468, #10554 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink]
  9
+* Ruby 1.9 compatibility.  #1689, #10466, #10468, #10554, #10632 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink]
10 10
 
11 11
 * TimeZone#to_s uses UTC rather than GMT.  #1689 [Cheah Chu Yeow]
12 12
 
2  activesupport/test/core_ext/time_ext_test.rb
@@ -277,7 +277,7 @@ def test_utc_advance
277 277
   def test_next_week
278 278
     with_timezone 'US/Eastern' do
279 279
       assert_equal Time.local(2005,2,28), Time.local(2005,2,22,15,15,10).next_week
280  
-      assert_equal Time.local(2005,2,29), Time.local(2005,2,22,15,15,10).next_week(:tuesday)
  280
+      assert_equal Time.local(2005,3,1), Time.local(2005,2,22,15,15,10).next_week(:tuesday)
281 281
       assert_equal Time.local(2005,3,4), Time.local(2005,2,22,15,15,10).next_week(:friday)
282 282
       assert_equal Time.local(2006,10,30), Time.local(2006,10,23,0,0,0).next_week
283 283
       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
... ...
@@ -1,13 +1,6 @@
1 1
 require 'abstract_unit'
2 2
 
3  
-if RUBY_VERSION >= '1.9'
4  
-  class CharsTest < Test::Unit::TestCase
5  
-    def test_chars_returns_self
6  
-      str = 'abc'
7  
-      assert_equal str.object_id, str.chars.object_id
8  
-    end
9  
-  end
10  
-else
  3
+if RUBY_VERSION < '1.9'
11 4
 
12 5
 $KCODE = 'UTF8'
13 6
 

0 notes on commit 42622f2

Please sign in to comment.
Something went wrong with that request. Please try again.