summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-19 02:45:40 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-19 02:45:40 +0000
commit9dd9feab8adb54e813a87205977962c61030e3eb (patch)
tree05ea63f000b305ae9cf932288890a5012b3dbc8c /test
parent459c590ca881a80af4583ce4e9fde52c2bf1faf2 (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_2@49327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/rdoc/test_rdoc_text.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb
index b0c464a659..a69989d15d 100644
--- a/test/rdoc/test_rdoc_text.rb
+++ b/test/rdoc/test_rdoc_text.rb
@@ -56,6 +56,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