Make content_tag_for work without block

This is version of #8640 for master

3 files changed, 17 insertions, 1 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 16c0978aa4..c43906612c 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Fix a bug in `content_tag_for` that prevents it for work without a block.
+
+    *Jasl*
+
 *   Change the stylesheet of exception pages for development mode.
     Additionally display also the line of code and fragment that raised
     the exception in all exceptions pages.
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index 33194250b7..6d99d43fb8 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -95,7 +95,11 @@ module ActionView
           options[:class] = "#{dom_class(record, prefix)} #{options[:class]}".rstrip
           options[:id]    = dom_id(record, prefix)
 
-          content_tag(tag_name, capture(record, &block), options)
+          if block_given?
+            content_tag(tag_name, capture(record, &block), options)
+          else
+            content_tag(tag_name, "", options)
+          end
         end
     end
   end
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index a84034c02e..1ba3e70d2c 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -75,6 +75,14 @@ class RecordTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_content_tag_for_collection_without_given_block
+    post_1 = RecordTagPost.new.tap { |post| post.id = 101; post.body = "Hello!" }
+    post_2 = RecordTagPost.new.tap { |post| post.id = 102; post.body = "World!" }
+    expected = %(<li class="record_tag_post" id="record_tag_post_101"></li>\n<li class="record_tag_post" id="record_tag_post_102"></li>)
+    actual = content_tag_for(:li, [post_1, post_2])
+    assert_dom_equal expected, actual
+  end
+
   def test_div_for_collection
     post_1 = RecordTagPost.new { |post| post.id = 101; post.body = "Hello!" }
     post_2 = RecordTagPost.new { |post| post.id = 102; post.body = "World!" }