summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:22:13 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:22:13 +0000
commit303d9d972abfd73e5738d3e7eeb142b9689f0eb6 (patch)
treeba366a3cd65dae5edd10b70ec7136436bf712cca /test
parentb2bfcf403c2d3d379061f6ea115cb889f5a90de8 (diff)
merges r20342 from trunk to ruby_1_9_1.
* strftime.c (rb_strftime): The # flag should work with %a, %A, %b, %B, and %h. [ruby-dev:37162] * test/ruby/test_time.rb (test_strftime): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_time.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 2f37d57871..a1a5bfc7fb 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -461,5 +461,12 @@ class TestTime < Test::Unit::TestCase
assert_equal("\n", T2000.strftime("%1n"))
assert_equal(" \n", T2000.strftime("%3n"))
assert_equal("00\n", T2000.strftime("%03n"))
+
+ # [ruby-dev:37162]
+ assert_equal("SAT", T2000.strftime("%#a"))
+ assert_equal("SATURDAY", T2000.strftime("%#A"))
+ assert_equal("JAN", T2000.strftime("%#b"))
+ assert_equal("JANUARY", T2000.strftime("%#B"))
+ assert_equal("JAN", T2000.strftime("%#h"))
end
end