aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-18 13:43:44 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-18 13:43:44 -0700
commit3e2f0800e33cc056d344a45557815b19463ab416 (patch)
tree617b18720b5ce1beda64c478845538756509cb2c /actionpack/test
parent87adecfef59577be17a9731245cb201ecb1b477f (diff)
parentcef76c8af4705dc60f85a721e3a14adb99418d33 (diff)
downloadrails-3e2f0800e33cc056d344a45557815b19463ab416.tar.gz
rails-3e2f0800e33cc056d344a45557815b19463ab416.tar.bz2
rails-3e2f0800e33cc056d344a45557815b19463ab416.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/template/text_helper_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index a780bfc606..706b5085f4 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -49,6 +49,9 @@ class TextHelperTest < ActionView::TestCase
assert_equal "This is a string that wil[...]", truncate("This is a string that will go longer then the default truncate length of 30", :omission => "[...]")
assert_equal "Hello W...", truncate("Hello World!", :length => 10)
assert_equal "Hello[...]", truncate("Hello World!", :omission => "[...]", :length => 10)
+ assert_equal "Hello[...]", truncate("Hello Big World!", :omission => "[...]", :length => 13, :separator => ' ')
+ assert_equal "Hello Big[...]", truncate("Hello Big World!", :omission => "[...]", :length => 14, :separator => ' ')
+ assert_equal "Hello Big[...]", truncate("Hello Big World!", :omission => "[...]", :length => 15, :separator => ' ')
end
if RUBY_VERSION < '1.9.0'