Merge branch 'master' of git@github.com:rails/rails

1 files changed, 2 insertions, 7 deletions

diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 0afbb54f57..441dc6b720 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -17,37 +17,32 @@ class RecordTagHelperTest < ActionView::TestCase
   end
   
   def test_content_tag_for
-    _erbout = ''
     expected = %(<li class="post bar" id="post_45"></li>)
     actual = content_tag_for(:li, @post, :class => 'bar') { }
     assert_dom_equal expected, actual
   end
   
   def test_content_tag_for_prefix
-    _erbout = ''
     expected = %(<ul class="post" id="archived_post_45"></ul>)
     actual = content_tag_for(:ul, @post, :archived) { }
     assert_dom_equal expected, actual    
   end
   
   def test_content_tag_for_with_extra_html_tags
-    _erbout = ''
     expected = %(<tr class="post bar" id="post_45" style='background-color: #f0f0f0'></tr>)
     actual = content_tag_for(:tr, @post, {:class => "bar", :style => "background-color: #f0f0f0"}) { }
     assert_dom_equal expected, actual        
   end
   
   def test_block_works_with_content_tag_for
-    _erbout = ''
     expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
-    actual = content_tag_for(:tr, @post) { _erbout.concat @post.body }
+    actual = content_tag_for(:tr, @post) { concat @post.body }
     assert_dom_equal expected, actual            
   end
   
   def test_div_for    
-    _erbout = ''    
     expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
-    actual = div_for(@post, :class => "bar") { _erbout.concat @post.body }
+    actual = div_for(@post, :class => "bar") { concat @post.body }
     assert_dom_equal expected, actual
   end