aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-25 12:11:46 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-25 12:12:31 -0300
commit2abed7af6e4b87da7277952e9ad73681ac337f2e (patch)
tree4d547390e31bc464781dc5c46758ba6ac3e0b9d3 /activesupport/test
parentd6c34ce59f57c6ef4101ba76efdb4df6893d6f9c (diff)
parentece0d25c2b64b1bc1f1b4b6343a7f5b909d75f06 (diff)
downloadrails-2abed7af6e4b87da7277952e9ad73681ac337f2e.tar.gz
rails-2abed7af6e4b87da7277952e9ad73681ac337f2e.tar.bz2
rails-2abed7af6e4b87da7277952e9ad73681ac337f2e.zip
Merge pull request #19076 from nygrenh/truncate-words-fix
Fix a backtracking problem in String#truncate_words
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/core_ext/string_ext_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 24037c665a..cb24147ab3 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -249,6 +249,15 @@ class StringInflectionsTest < ActiveSupport::TestCase
assert_equal "Hello<br>Big<br>World!", "Hello<br>Big<br>World!".truncate_words(3, :omission => "[...]", :separator => '<br>')
end
+ def test_truncate_words_with_complex_string
+ Timeout.timeout(10) do
+ complex_string = "aa aa aaa aa aaa aaa aaa aa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaa aaaa aaaaa aaaaa aaaaaa aa aa aa aaa aa aaa aa aa aa aa a aaa aaa \n a aaa <<s"
+ assert_equal complex_string.truncate_words(80), complex_string
+ end
+ rescue Timeout::Error
+ assert false
+ end
+
def test_truncate_multibyte
assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding(Encoding::UTF_8),
"\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding(Encoding::UTF_8).truncate(10)