Merge pull request #18054 from jonatack/add_content_tag_test

Test to ensure content_tag works when fixing #17661

actionview/test/template/tag_helper_test.rb

@@ -50,6 +50,11 @@ def test_content_tag_with_block_in_erb
     assert_dom_equal "<div>Hello world!</div>", buffer
   end
 
+  def test_content_tag_with_block_in_erb_containing_non_displayed_erb
+    buffer = render_erb("<%= content_tag(:p) do %><% 1 %><% end %>")
+    assert_dom_equal "<p></p>", buffer
+  end
+
   def test_content_tag_with_block_and_options_in_erb
     buffer = render_erb("<%= content_tag(:div, :class => 'green') do %>Hello world!<% end %>")
     assert_dom_equal %(<div class="green">Hello world!</div>), buffer