Merge pull request #18024 from carpodaster/fix/actionview/capture-non-strings

Re-enable capture'ing non-String values

2 files changed, 7 insertions, 2 deletions

diff --git a/actionview/test/template/capture_helper_test.rb b/actionview/test/template/capture_helper_test.rb
index f213da5934..b2b8513d4f 100644
--- a/actionview/test/template/capture_helper_test.rb
+++ b/actionview/test/template/capture_helper_test.rb
@@ -24,8 +24,8 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', string
   end
 
-  def test_capture_returns_nil_if_the_returned_value_is_not_a_string
-    assert_nil @av.capture { 1 }
+  def test_capture_returns_value_even_if_the_returned_value_is_not_a_string
+    assert_equal '1', @av.capture { 1 }
   end
 
   def test_capture_escapes_html
diff --git a/actionview/test/template/tag_helper_test.rb b/actionview/test/template/tag_helper_test.rb
index ce89d5728e..2b3915edcd 100644
--- a/actionview/test/template/tag_helper_test.rb
+++ b/actionview/test/template/tag_helper_test.rb
@@ -64,6 +64,11 @@ class TagHelperTest < ActionView::TestCase
                  content_tag("a", "href" => "create") { "Create" }
   end
 
+  def test_content_tag_with_block_and_non_string_outside_out_of_erb
+    assert_equal content_tag("p", "1.0", nil, false),
+                 content_tag("p") { 1.0 }
+  end
+
   def test_content_tag_nested_in_content_tag_out_of_erb
     assert_equal content_tag("p", content_tag("b", "Hello")),
                  content_tag("p") { content_tag("b", "Hello") },