Merge branch '3-2-stable' into 3-2-secmerge

* 3-2-stable:
  fix block.arity raise nil error when not given a block to "content_tag_for"
  removes the Ajax on Rails early draft
  Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present"
  backport #8662, charset should not be appended for `head` responses
  Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options."
  Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.
  backport #8616, quote column names in generated fixture files

1 files changed, 8 insertions, 0 deletions

diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index f33471ab28..3cb5997a83 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -81,6 +81,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.persisted = true }
+    post_2 = RecordTagPost.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }
+    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.tap { |post| post.id = 101; post.body = "Hello!"; post.persisted = true }
     post_2 = RecordTagPost.new.tap { |post| post.id = 102; post.body = "World!"; post.persisted = true }