diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 07:13:13 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-30 07:13:13 +0000 |
commit | d65000915192052ea5a54ece9b001a0a84aa6c4c (patch) | |
tree | 7761223ad3558aabd4d6c21ee3f844fb0f5c8a79 /test | |
parent | 8d4aeb83454fa4ae5f48b06973867ec0b4771153 (diff) |
merge revision(s) 49223: [Backport #10732]
* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
CR. should check if substitution occurred too.
[ruby-dev:48813] [Bug #10732]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/rdoc/test_rdoc_text.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb index 473bd3cadd..9e0ec6fe94 100644 --- a/test/rdoc/test_rdoc_text.rb +++ b/test/rdoc/test_rdoc_text.rb @@ -63,6 +63,9 @@ class TestRDocText < RDoc::TestCase assert_equal('. .', expand_tabs(".\t\t."), 'dot tab tab dot') + + assert_equal('a a', + Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return") end def test_expand_tabs_encoding |