diff options
author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-02-10 22:03:53 +0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-02-10 23:47:54 +0800 |
commit | 1a73407b8506b548a5343c66c16897140203472e (patch) | |
tree | 2a8ed779ae295c83dcb886839bf47be0bcdbbee0 /activesupport/test/core_ext | |
parent | f7221f5c7571da50d4d0199c0a7502cc7cd82b6e (diff) | |
download | rails-1a73407b8506b548a5343c66c16897140203472e.tar.gz rails-1a73407b8506b548a5343c66c16897140203472e.tar.bz2 rails-1a73407b8506b548a5343c66c16897140203472e.zip |
Corrected the html_safe implementation for Array. Moved the html safe version of join to its own method (safe_join) as not to degrade the performance of join for unrelated html_safe use. [#6298 state:resolved]
Diffstat (limited to 'activesupport/test/core_ext')
-rw-r--r-- | activesupport/test/core_ext/string_ext_test.rb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 41a23641d4..15e39a06c3 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -435,36 +435,36 @@ class OutputSafetyTest < ActiveSupport::TestCase end test "Joining safe elements without a separator is safe" do - array = 5.times.collect {"some string".html_safe} - assert array.join.html_safe? + array = 5.times.collect { "some string".html_safe } + assert array.safe_join.html_safe? end test "Joining safe elements with a safe separator is safe" do - array = 5.times.collect {"some string".html_safe} - assert array.join("-".html_safe).html_safe? + array = 5.times.collect { "some string".html_safe } + assert array.safe_join("-".html_safe).html_safe? end test "Joining safe elements with an unsafe separator is unsafe" do - array = 5.times.collect {"some string".html_safe} - assert_false array.join("-").html_safe? + array = 5.times.collect { "some string".html_safe } + assert !array.safe_join("-").html_safe? end test "Joining is unsafe if any element is unsafe even with a safe separator" do - array = 5.times.collect {"some string".html_safe} + array = 5.times.collect { "some string".html_safe } array << "some string" - assert_false array.join("-".html_safe).html_safe? + assert !array.safe_join("-".html_safe).html_safe? end test "Joining is unsafe if any element is unsafe and no separator is given" do - array = 5.times.collect {"some string".html_safe} + array = 5.times.collect { "some string".html_safe } array << "some string" - assert_false array.join.html_safe? + assert !array.safe_join.html_safe? end test "Joining is unsafe if any element is unsafe and the separator is unsafe" do - array = 5.times.collect {"some string".html_safe} + array = 5.times.collect { "some string".html_safe } array << "some string" - assert_false array.join("-").html_safe? + assert !array.safe_join("-").html_safe? end test "Array is safe if all elements are safe" do @@ -475,7 +475,7 @@ class OutputSafetyTest < ActiveSupport::TestCase test "Array is unsafe if any element is unsafe" do array = 5.times.collect { "some string".html_safe } array << "some string" - assert_false array.html_safe? + assert !array.html_safe? end test 'emits normal string yaml' do |