Browse files

Make sure that result from content_tag_for with collection is html_safe

Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe.
  • Loading branch information...
1 parent 499ad11 commit ffe56f3b8c579b5f5dbf47ae1e5bb052a64d9783 @sikachu sikachu committed Sep 5, 2011
View
2 actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -84,7 +84,7 @@ def content_tag_for(tag_name, single_or_multiple_records, prefix = nil, options
if single_or_multiple_records.respond_to?(:to_ary)
single_or_multiple_records.to_ary.map do |single_record|
capture { content_tag_for_single_record(tag_name, single_record, prefix, options, &block) }
- end.join("\n")
+ end.join("\n").html_safe
else
content_tag_for_single_record(tag_name, single_or_multiple_records, prefix, options, &block)
end
View
12 actionpack/test/template/record_tag_helper_test.rb
@@ -80,4 +80,16 @@ def test_div_for_collection
actual = div_for([post_1, post_2]) { |post| concat post.body }
assert_dom_equal expected, actual
end
+
+ def test_content_tag_for_single_record_is_html_safe
+ result = div_for(@post, :class => "bar") { concat @post.body }
+ assert result.html_safe?
+ end
+
+ def test_content_tag_for_collection_is_html_safe
+ post_1 = Post.new.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
+ post_2 = Post.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
+ result = content_tag_for(:li, [post_1, post_2]) { |post| concat post.body }
+ assert result.html_safe?
+ end
end

0 comments on commit ffe56f3

Please sign in to comment.