diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2014-12-15 21:20:54 -0200 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-12-15 21:20:54 -0200 |
commit | e4627edf87a1f0cb575287f200df3f67335dd84c (patch) | |
tree | 96a7d45075bc3a03219a16533232d86e6a4c1aab /actionview/test/template | |
parent | 488aefe7426bbd6f071019dff4c4cd1fbfd56742 (diff) | |
download | rails-e4627edf87a1f0cb575287f200df3f67335dd84c.tar.gz rails-e4627edf87a1f0cb575287f200df3f67335dd84c.tar.bz2 rails-e4627edf87a1f0cb575287f200df3f67335dd84c.zip |
Revert "Re-enable capture'ing non-String values"
This reverts commit c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.
Diffstat (limited to 'actionview/test/template')
-rw-r--r-- | actionview/test/template/capture_helper_test.rb | 4 | ||||
-rw-r--r-- | actionview/test/template/tag_helper_test.rb | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/actionview/test/template/capture_helper_test.rb b/actionview/test/template/capture_helper_test.rb index b2b8513d4f..f213da5934 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_value_even_if_the_returned_value_is_not_a_string - assert_equal '1', @av.capture { 1 } + def test_capture_returns_nil_if_the_returned_value_is_not_a_string + assert_nil @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 2b3915edcd..ce89d5728e 100644 --- a/actionview/test/template/tag_helper_test.rb +++ b/actionview/test/template/tag_helper_test.rb @@ -64,11 +64,6 @@ 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") }, |