1 files changed, 43 insertions, 4 deletions

diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 1ba14e8bc9..ec777d15c4 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -4,15 +4,26 @@ require 'controller/fake_models'
 class Post
   extend ActiveModel::Naming
   include ActiveModel::Conversion
+  attr_writer :id, :body
+
+  def initialize
+    @id = nil
+    @body = nil
+    super
+  end
+
   def id
-     45
+     @id || 45
   end
+
   def body
-    super || "What a wonderful world!"
+    super || @body || "What a wonderful world!"
   end
 end
 
 class RecordTagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::RecordTagHelper
 
   def setup
@@ -49,13 +60,41 @@ class RecordTagHelperTest < ActionView::TestCase
 
   def test_block_works_with_content_tag_for_in_erb
     expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
-    actual = content_tag_for(:tr, @post) { concat @post.body }
+    actual = render_erb("<%= content_tag_for(:tr, @post) do %><%= @post.body %><% end %>")
     assert_dom_equal expected, actual
   end
 
   def test_div_for_in_erb
     expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
-    actual = div_for(@post, :class => "bar") { concat @post.body }
+    actual = render_erb("<%= div_for(@post, :class => 'bar') do %><%= @post.body %><% end %>")
+    assert_dom_equal expected, actual
+  end
+
+  def test_content_tag_for_collection
+    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 }
+    expected = %(<li class="post" id="post_101">Hello!</li>\n<li class="post" id="post_102">World!</li>)
+    actual = content_tag_for(:li, [post_1, post_2]) { |post| concat post.body }
+    assert_dom_equal expected, actual
+  end
+
+  def test_div_for_collection
+    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 }
+    expected = %(<div class="post" id="post_101">Hello!</div>\n<div class="post" id="post_102">World!</div>)
+    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