diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-18 20:01:06 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-18 20:01:06 -0300 |
| commit | 1cc44599397e061901cd59233397129625839a60 (patch) | |
| tree | 235108ce6a9d270bdfe3264a8f5f5a7c99c3ae5c /actionpack/test/template/text_helper_test.rb | |
| parent | 3db44e938fc6b5a5d272c4df4cf06dd6b5715782 (diff) | |
| parent | ee5520a0a5ea83843ce88f6b9550e3c36b8cdd49 (diff) | |
| download | rails-1cc44599397e061901cd59233397129625839a60.tar.gz rails-1cc44599397e061901cd59233397129625839a60.tar.bz2 rails-1cc44599397e061901cd59233397129625839a60.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record.rb
Updated:
Arel submodule
Diffstat (limited to 'actionpack/test/template/text_helper_test.rb')
| -rw-r--r-- | actionpack/test/template/text_helper_test.rb | 3 |
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' |