Work with @output_buffer instead of _erbout

13 files changed, 220 insertions, 206 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 5fae2d4dd6..7a603f150f 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -156,10 +156,12 @@ module ActionView #:nodoc:
     attr_reader   :finder
     attr_accessor :base_path, :assigns, :template_extension, :first_render
     attr_accessor :controller
-    
+
     attr_writer :template_format
     attr_accessor :current_render_extension
 
+    attr_accessor :output_buffer
+
     # Specify trim mode for the ERB compiler. Defaults to '-'.
     # See ERb documentation for suitable values.
     @@erb_trim_mode = '-'
@@ -313,9 +315,10 @@ If you are rendering a subtemplate, you must now use controller-like partial syn
 
     private
       def wrap_content_for_layout(content)
-        original_content_for_layout = @content_for_layout
-        @content_for_layout = content
-        returning(yield) { @content_for_layout = original_content_for_layout }
+        original_content_for_layout, @content_for_layout = @content_for_layout, content
+        yield
+      ensure
+        @content_for_layout = original_content_for_layout
       end
 
       # Evaluate the local assigns and pushes them to the view.
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index f9a73a4c8d..837305d96c 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -31,11 +31,11 @@ module ActionView
       #   </body></html>
       #
       def capture(*args, &block)
-        @output_buffer, old_buffer = '', @output_buffer
-        yield *args
-        @output_buffer
-      ensure
-        @output_buffer = old_buffer
+        if @output_buffer
+          with_temporary_output_buffer { yield *args }
+        else
+          block.call(*args)
+        end
       end
 
       # Calling content_for stores a block of markup in an identifier for later use.
@@ -119,6 +119,14 @@ module ActionView
       end
 
       private
+        def with_temporary_output_buffer
+          @output_buffer, old_buffer = '', @output_buffer
+          yield
+          @output_buffer
+        ensure
+          @output_buffer = old_buffer
+        end
+
         def erb_content_for(name, &block)
           ivar = "@content_for_#{name}"
           instance_variable_set(ivar, "#{instance_variable_get(ivar)}#{capture(&block)}")
diff --git a/actionpack/lib/action_view/template_handlers/builder.rb b/actionpack/lib/action_view/template_handlers/builder.rb
index f76d89777a..ee02ce1a6f 100644
--- a/actionpack/lib/action_view/template_handlers/builder.rb
+++ b/actionpack/lib/action_view/template_handlers/builder.rb
@@ -11,10 +11,11 @@ module ActionView
 
       def compile(template)
         content_type_handler = (@view.send!(:controller).respond_to?(:response) ? "controller.response" : "controller")
+
         "#{content_type_handler}.content_type ||= Mime::XML\n" +
-        "xml = ::Builder::XmlMarkup.new(:indent => 2)\n" +
-        template.source +
-        "\nxml.target!\n"
+          "xml = ::Builder::XmlMarkup.new(:indent => 2)\n" +
+          template.source +
+          "\nxml.target!\n"
       end
 
       def cache_fragment(block, name = {}, options = nil)
diff --git a/actionpack/lib/action_view/template_handlers/erb.rb b/actionpack/lib/action_view/template_handlers/erb.rb
index d1416b89d1..ad4ccc7c42 100644
--- a/actionpack/lib/action_view/template_handlers/erb.rb
+++ b/actionpack/lib/action_view/template_handlers/erb.rb
@@ -47,7 +47,7 @@ module ActionView
       end
 
       def cache_fragment(block, name = {}, options = nil) #:nodoc:
-        @view.fragment_for(block, name, options) { @view.output_buffer }
+        @view.fragment_for(block, name, options) { @view.response.template.output_buffer ||= '' }
       end
     end
   end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index f9b6b87bc6..d0ee93cf3f 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -421,6 +421,8 @@ class FragmentCachingTest < Test::Unit::TestCase
     @controller.request = @request
     @controller.response = @response
     @controller.send(:initialize_current_url)
+    @controller.send(:initialize_template_class, @response)
+    @controller.send(:assign_shortcuts, @request, @response)
   end
 
   def test_fragment_cache_key
@@ -510,7 +512,7 @@ class FragmentCachingTest < Test::Unit::TestCase
 
   def test_cache_erb_fragment
     @store.write('views/expensive', 'fragment content')
-    _erbout = 'generated till now -> '
+    @controller.template.output_buffer = 'generated till now -> '
 
     assert_equal( 'generated till now -> fragment content',
                   ActionView::TemplateHandlers::ERB.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 0a7b19ba96..3399b03dd2 100755
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1002,17 +1002,17 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
 
-    _erbout = ''
+    @output_buffer = ''
 
     fields_for :post, @post do |f|
-      _erbout.concat f.date_select(:written_on)
+      @output_buffer.concat f.date_select(:written_on)
     end
 
     expected = "<select id='post_written_on_1i' name='post[written_on(1i)]'>\n<option value='1999'>1999</option>\n<option value='2000'>2000</option>\n<option value='2001'>2001</option>\n<option value='2002'>2002</option>\n<option value='2003'>2003</option>\n<option selected='selected' value='2004'>2004</option>\n<option value='2005'>2005</option>\n<option value='2006'>2006</option>\n<option value='2007'>2007</option>\n<option value='2008'>2008</option>\n<option value='2009'>2009</option>\n</select>\n"
     expected << "<select id='post_written_on_2i' name='post[written_on(2i)]'>\n<option value='1'>January</option>\n<option value='2'>February</option>\n<option value='3'>March</option>\n<option value='4'>April</option>\n<option value='5'>May</option>\n<option selected='selected' value='6'>June</option>\n<option value='7'>July</option>\n<option value='8'>August</option>\n<option value='9'>September</option>\n<option value='10'>October</option>\n<option value='11'>November</option>\n<option value='12'>December</option>\n</select>\n"
     expected << "<select id='post_written_on_3i' name='post[written_on(3i)]'>\n<option value='1'>1</option>\n<option value='2'>2</option>\n<option value='3'>3</option>\n<option value='4'>4</option>\n<option value='5'>5</option>\n<option value='6'>6</option>\n<option value='7'>7</option>\n<option value='8'>8</option>\n<option value='9'>9</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option selected='selected' value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n</select>\n"
 
-    assert_dom_equal(expected, _erbout)
+    assert_dom_equal(expected, @output_buffer)
   end
 
   def test_date_select_with_index
@@ -1287,10 +1287,10 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
 
-    _erbout = ''
+    @output_buffer = ''
 
     fields_for :post, @post do |f|
-      _erbout.concat f.datetime_select(:updated_at)
+      @output_buffer.concat f.datetime_select(:updated_at)
     end
 
     expected = "<select id='post_updated_at_1i' name='post[updated_at(1i)]'>\n<option value='1999'>1999</option>\n<option value='2000'>2000</option>\n<option value='2001'>2001</option>\n<option value='2002'>2002</option>\n<option value='2003'>2003</option>\n<option selected='selected' value='2004'>2004</option>\n<option value='2005'>2005</option>\n<option value='2006'>2006</option>\n<option value='2007'>2007</option>\n<option value='2008'>2008</option>\n<option value='2009'>2009</option>\n</select>\n"
@@ -1299,7 +1299,7 @@ class DateHelperTest < ActionView::TestCase
    expected << " &mdash; <select id='post_updated_at_4i' name='post[updated_at(4i)]'>\n<option value='00'>00</option>\n<option value='01'>01</option>\n<option value='02'>02</option>\n<option value='03'>03</option>\n<option value='04'>04</option>\n<option value='05'>05</option>\n<option value='06'>06</option>\n<option value='07'>07</option>\n<option value='08'>08</option>\n<option value='09'>09</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option value='15'>15</option>\n<option selected='selected' value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n</select>\n"
   expected << " : <select id='post_updated_at_5i' name='post[updated_at(5i)]'>\n<option value='00'>00</option>\n<option value='01'>01</option>\n<option value='02'>02</option>\n<option value='03'>03</option>\n<option value='04'>04</option>\n<option value='05'>05</option>\n<option value='06'>06</option>\n<option value='07'>07</option>\n<option value='08'>08</option>\n<option value='09'>09</option>\n<option value='10'>10</option>\n<option value='11'>11</option>\n<option value='12'>12</option>\n<option value='13'>13</option>\n<option value='14'>14</option>\n<option value='15'>15</option>\n<option value='16'>16</option>\n<option value='17'>17</option>\n<option value='18'>18</option>\n<option value='19'>19</option>\n<option value='20'>20</option>\n<option value='21'>21</option>\n<option value='22'>22</option>\n<option value='23'>23</option>\n<option value='24'>24</option>\n<option value='25'>25</option>\n<option value='26'>26</option>\n<option value='27'>27</option>\n<option value='28'>28</option>\n<option value='29'>29</option>\n<option value='30'>30</option>\n<option value='31'>31</option>\n<option value='32'>32</option>\n<option value='33'>33</option>\n<option value='34'>34</option>\n<option selected='selected' value='35'>35</option>\n<option value='36'>36</option>\n<option value='37'>37</option>\n<option value='38'>38</option>\n<option value='39'>39</option>\n<option value='40'>40</option>\n<option value='41'>41</option>\n<option value='42'>42</option>\n<option value='43'>43</option>\n<option value='44'>44</option>\n<option value='45'>45</option>\n<option value='46'>46</option>\n<option value='47'>47</option>\n<option value='48'>48</option>\n<option value='49'>49</option>\n<option value='50'>50</option>\n<option value='51'>51</option>\n<option value='52'>52</option>\n<option value='53'>53</option>\n<option value='54'>54</option>\n<option value='55'>55</option>\n<option value='56'>56</option>\n<option value='57'>57</option>\n<option value='58'>58</option>\n<option value='59'>59</option>\n</select>\n"
 
-    assert_dom_equal(expected, _erbout)
+    assert_dom_equal(expected, @output_buffer)
   end
 
   def test_date_select_with_zero_value_and_no_start_year
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index af99e6243d..65984fac44 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -337,14 +337,14 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :html => { :id => 'create-post' }) do |f|
-      _erbout.concat f.label(:title)
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
-      _erbout.concat f.submit('Create post')
+      @output_buffer.concat f.label(:title)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
+      @output_buffer.concat f.submit('Create post')
     end
 
     expected =
@@ -357,16 +357,16 @@ class FormHelperTest < ActionView::TestCase
       "<input name='commit' id='post_submit' type='submit' value='Create post' />" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_method
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :html => { :id => 'create-post', :method => :put }) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -378,16 +378,16 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[secret]' type='hidden' value='0' />" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_without_object
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, :html => { :id => 'create-post' }) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -398,17 +398,17 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[secret]' type='hidden' value='0' />" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_index
-    _erbout = ''
+    @output_buffer = ''
 
     form_for("post[]", @post) do |f|
-      _erbout.concat f.label(:title)
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.label(:title)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -420,16 +420,16 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[123][secret]' type='hidden' value='0' />" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_nil_index_option_override
-    _erbout = ''
+    @output_buffer = ''
 
     form_for("post[]", @post, :index => nil) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -440,14 +440,14 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[][secret]' type='hidden' value='0' />" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_nested_fields_for
-    _erbout = ''
+    @output_buffer = ''
     form_for(:post, @post) do |f|
       f.fields_for(:comment, @post) do |c|
-        _erbout.concat c.text_field(:title)
+        @output_buffer.concat c.text_field(:title)
       end
     end
 
@@ -455,16 +455,16 @@ class FormHelperTest < ActionView::TestCase
                "<input name='post[comment][title]' size='30' type='text' id='post_comment_title' value='Hello World' />" +
                "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_fields_for
-    _erbout = ''
+    @output_buffer = ''
 
     fields_for(:post, @post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -473,16 +473,16 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_fields_for_with_index
-    _erbout = ''
+    @output_buffer = ''
 
     fields_for("post[]", @post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -491,16 +491,16 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
       "<input name='post[123][secret]' type='hidden' value='0' />"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_fields_for_with_nil_index_option_override
-    _erbout = ''
+    @output_buffer = ''
 
     fields_for("post[]", @post, :index => nil) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -509,16 +509,16 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
       "<input name='post[][secret]' type='hidden' value='0' />"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_fields_for_with_index_option_override
-    _erbout = ''
+    @output_buffer = ''
 
     fields_for("post[]", @post, :index => "abc") do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -527,15 +527,15 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[abc][secret]' checked='checked' type='checkbox' id='post_abc_secret' value='1' />" +
       "<input name='post[abc][secret]' type='hidden' value='0' />"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_fields_for_without_object
-    _erbout = ''
+    @output_buffer = ''
     fields_for(:post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -544,15 +544,15 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_fields_for_with_only_object
-    _erbout = ''
+    @output_buffer = ''
     fields_for(@post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -561,31 +561,31 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' />"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_fields_for_object_with_bracketed_name
-    _erbout = ''
+    @output_buffer = ''
     fields_for("author[post]", @post) do |f|
-      _erbout.concat f.label(:title)
-      _erbout.concat f.text_field(:title)
+      @output_buffer.concat f.label(:title)
+      @output_buffer.concat f.text_field(:title)
     end
 
     assert_dom_equal "<label for=\"author_post_title\">Title</label>" +
     "<input name='author[post][title]' size='30' type='text' id='author_post_title' value='Hello World' />",
-      _erbout
+      @output_buffer
   end
 
   def test_fields_for_object_with_bracketed_name_and_index
-    _erbout = ''
+    @output_buffer = ''
     fields_for("author[post]", @post, :index => 1) do |f|
-      _erbout.concat f.label(:title)
-      _erbout.concat f.text_field(:title)
+      @output_buffer.concat f.label(:title)
+      @output_buffer.concat f.text_field(:title)
     end
 
     assert_dom_equal "<label for=\"author_post_1_title\">Title</label>" +
       "<input name='author[post][1][title]' size='30' type='text' id='author_post_1_title' value='Hello World' />",
-      _erbout
+      @output_buffer
   end
 
   def test_form_builder_does_not_have_form_for_method
@@ -593,14 +593,14 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_and_fields_for
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :html => { :id => 'create-post' }) do |post_form|
-      _erbout.concat post_form.text_field(:title)
-      _erbout.concat post_form.text_area(:body)
+      @output_buffer.concat post_form.text_field(:title)
+      @output_buffer.concat post_form.text_area(:body)
 
       fields_for(:parent_post, @post) do |parent_fields|
-        _erbout.concat parent_fields.check_box(:secret)
+        @output_buffer.concat parent_fields.check_box(:secret)
       end
     end
 
@@ -612,18 +612,18 @@ class FormHelperTest < ActionView::TestCase
       "<input name='parent_post[secret]' type='hidden' value='0' />" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_and_fields_for_with_object
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :html => { :id => 'create-post' }) do |post_form|
-      _erbout.concat post_form.text_field(:title)
-      _erbout.concat post_form.text_area(:body)
+      @output_buffer.concat post_form.text_field(:title)
+      @output_buffer.concat post_form.text_area(:body)
 
       post_form.fields_for(@comment) do |comment_fields|
-        _erbout.concat comment_fields.text_field(:name)
+        @output_buffer.concat comment_fields.text_field(:name)
       end
     end
 
@@ -634,7 +634,7 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' size='30' />" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   class LabelledFormBuilder < ActionView::Helpers::FormBuilder
@@ -649,12 +649,12 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_labelled_builder
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -665,18 +665,18 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[secret]' type='hidden' value='0' /><br/>" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_default_form_builder
     old_default_form_builder, ActionView::Base.default_form_builder =
       ActionView::Base.default_form_builder, LabelledFormBuilder
 
-    _erbout = ''
+    @output_buffer = ''
     form_for(:post, @post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -687,17 +687,17 @@ class FormHelperTest < ActionView::TestCase
       "<input name='post[secret]' type='hidden' value='0' /><br/>" +
       "</form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   ensure
     ActionView::Base.default_form_builder = old_default_form_builder
   end
 
   def test_default_form_builder_with_active_record_helpers
 
-    _erbout = ''
+    @output_buffer = ''
     form_for(:post, @post) do |f|
-       _erbout.concat f.error_message_on('author_name')
-       _erbout.concat f.error_messages
+       @output_buffer.concat f.error_message_on('author_name')
+       @output_buffer.concat f.error_messages
     end
 
     expected = %(<form action='http://www.example.com' method='post'>) +
@@ -705,7 +705,7 @@ class FormHelperTest < ActionView::TestCase
                %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>) +
                %(</form>)
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
 
   end
 
@@ -713,10 +713,10 @@ class FormHelperTest < ActionView::TestCase
     post = @post
     @post = nil
 
-    _erbout = ''
+    @output_buffer = ''
     form_for(:post, post) do |f|
-       _erbout.concat f.error_message_on('author_name')
-       _erbout.concat f.error_messages
+       @output_buffer.concat f.error_message_on('author_name')
+       @output_buffer.concat f.error_messages
     end
 
     expected = %(<form action='http://www.example.com' method='post'>) +
@@ -724,19 +724,19 @@ class FormHelperTest < ActionView::TestCase
                %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>) +
                %(</form>)
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
 
   end
 
   # Perhaps this test should be moved to prototype helper tests.
   def test_remote_form_for_with_labelled_builder
     self.extend ActionView::Helpers::PrototypeHelper
-     _erbout = ''
+     @output_buffer = ''
 
      remote_form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
-       _erbout.concat f.text_field(:title)
-       _erbout.concat f.text_area(:body)
-       _erbout.concat f.check_box(:secret)
+       @output_buffer.concat f.text_field(:title)
+       @output_buffer.concat f.text_area(:body)
+       @output_buffer.concat f.check_box(:secret)
      end
 
      expected =
@@ -747,16 +747,16 @@ class FormHelperTest < ActionView::TestCase
        "<input name='post[secret]' type='hidden' value='0' /><br/>" +
        "</form>"
 
-     assert_dom_equal expected, _erbout
+     assert_dom_equal expected, @output_buffer
   end
 
   def test_fields_for_with_labelled_builder
-    _erbout = ''
+    @output_buffer = ''
 
     fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      @output_buffer.concat f.text_field(:title)
+      @output_buffer.concat f.text_area(:body)
+      @output_buffer.concat f.check_box(:secret)
     end
 
     expected =
@@ -765,28 +765,28 @@ class FormHelperTest < ActionView::TestCase
       "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
       "<input name='post[secret]' type='hidden' value='0' /><br/>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_html_options_adds_options_to_form_tag
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
     expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\"></form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_string_url_option
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :url => 'http://www.otherdomain.com') do |f| end
 
-    assert_equal '<form action="http://www.otherdomain.com" method="post"></form>', _erbout
+    assert_equal '<form action="http://www.otherdomain.com" method="post"></form>', @output_buffer
   end
 
   def test_form_for_with_hash_url_option
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :url => {:controller => 'controller', :action => 'action'}) do |f| end
 
@@ -795,25 +795,25 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_record_url_option
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(:post, @post, :url => @post) do |f| end
 
     expected = "<form action=\"/posts/123\" method=\"post\"></form>"
-    assert_equal expected, _erbout
+    assert_equal expected, @output_buffer
   end
 
   def test_form_for_with_existing_object
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(@post) do |f| end
 
     expected = "<form action=\"/posts/123\" class=\"edit_post\" id=\"edit_post_123\" method=\"post\"><div style=\"margin:0;padding:0\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
-    assert_equal expected, _erbout
+    assert_equal expected, @output_buffer
   end
 
   def test_form_for_with_new_object
-    _erbout = ''
+    @output_buffer = ''
 
     post = Post.new
     post.new_record = true
@@ -822,64 +822,64 @@ class FormHelperTest < ActionView::TestCase
     form_for(post) do |f| end
 
     expected = "<form action=\"/posts\" class=\"new_post\" id=\"new_post\" method=\"post\"></form>"
-    assert_equal expected, _erbout
+    assert_equal expected, @output_buffer
   end
 
   def test_form_for_with_existing_object_in_list
     @post.new_record = false
     @comment.save
-    _erbout = ''
+    @output_buffer = ''
     form_for([@post, @comment]) {}
 
     expected = %(<form action="#{comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0"><input name="_method" type="hidden" value="put" /></div></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_new_object_in_list
     @post.new_record = false
-    _erbout = ''
+    @output_buffer = ''
     form_for([@post, @comment]) {}
 
     expected = %(<form action="#{comments_path(@post)}" class="new_comment" id="new_comment" method="post"></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_existing_object_and_namespace_in_list
     @post.new_record = false
     @comment.save
-    _erbout = ''
+    @output_buffer = ''
     form_for([:admin, @post, @comment]) {}
 
     expected = %(<form action="#{admin_comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0"><input name="_method" type="hidden" value="put" /></div></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_new_object_and_namespace_in_list
     @post.new_record = false
-    _erbout = ''
+    @output_buffer = ''
     form_for([:admin, @post, @comment]) {}
 
     expected = %(<form action="#{admin_comments_path(@post)}" class="new_comment" id="new_comment" method="post"></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_for_with_existing_object_and_custom_url
-    _erbout = ''
+    @output_buffer = ''
 
     form_for(@post, :url => "/super_posts") do |f| end
 
     expected = "<form action=\"/super_posts\" class=\"edit_post\" id=\"edit_post_123\" method=\"post\"><div style=\"margin:0;padding:0\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
-    assert_equal expected, _erbout
+    assert_equal expected, @output_buffer
   end
 
   def test_remote_form_for_with_html_options_adds_options_to_form_tag
     self.extend ActionView::Helpers::PrototypeHelper
-    _erbout = ''
+    @output_buffer = ''
 
     remote_form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
     expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\" onsubmit=\"new Ajax.Request('http://www.example.com', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\"></form>"
 
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
 
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 48a26deea9..3c9fb297c3 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -231,15 +231,15 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.category = "<mus>"
     
-    _erbout = ''
+    @output_buffer = ''
     
     fields_for :post, @post do |f|
-      _erbout.concat f.select(:category, %w( abe <mus> hest))
+      @output_buffer.concat f.select(:category, %w( abe <mus> hest))
     end
     
     assert_dom_equal(
       "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
-      _erbout
+      @output_buffer
     )
   end
 
@@ -353,15 +353,15 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.author_name = "Babe"
     
-    _erbout = ''
+    @output_buffer = ''
     
     fields_for :post, @post do |f|
-      _erbout.concat f.collection_select(:author_name, @posts, :author_name, :author_name)
+      @output_buffer.concat f.collection_select(:author_name, @posts, :author_name, :author_name)
     end
     
     assert_dom_equal(
       "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
-      _erbout
+      @output_buffer
     )
   end
 
@@ -1195,10 +1195,10 @@ COUNTRIES
   def test_time_zone_select_under_fields_for
     @firm = Firm.new("D")
     
-    _erbout = ''
+    @output_buffer = ''
     
     fields_for :firm, @firm do |f|
-      _erbout.concat f.time_zone_select(:time_zone)
+      @output_buffer.concat f.time_zone_select(:time_zone)
     end
     
     assert_dom_equal(
@@ -1209,7 +1209,7 @@ COUNTRIES
       "<option value=\"D\" selected=\"selected\">D</option>\n" +
       "<option value=\"E\">E</option>" +
       "</select>",
-      _erbout
+      @output_buffer
     )
   end
 
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 73a8bd4d87..b281db18bd 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -43,19 +43,19 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_form_tag_with_block
-    _erbout = ''
-    form_tag("http://example.com") { _erbout.concat "Hello world!" }
+    @output_buffer = ''
+    form_tag("http://example.com") { @output_buffer.concat "Hello world!" }
 
     expected = %(<form action="http://example.com" method="post">Hello world!</form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_form_tag_with_block_and_method
-    _erbout = ''
-    form_tag("http://example.com", :method => :put) { _erbout.concat "Hello world!" }
+    @output_buffer = ''
+    form_tag("http://example.com", :method => :put) { @output_buffer.concat "Hello world!" }
 
     expected = %(<form action="http://example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="put" /></div>Hello world!</form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_hidden_field_tag
@@ -234,23 +234,23 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_field_set_tag
-    _erbout = ''
-    field_set_tag("Your details") { _erbout.concat "Hello world!" }
+    @output_buffer = ''
+    field_set_tag("Your details") { @output_buffer.concat "Hello world!" }
 
     expected = %(<fieldset><legend>Your details</legend>Hello world!</fieldset>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
 
-    _erbout = ''
-    field_set_tag { _erbout.concat "Hello world!" }
+    @output_buffer = ''
+    field_set_tag { @output_buffer.concat "Hello world!" }
 
     expected = %(<fieldset>Hello world!</fieldset>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
     
-    _erbout = ''
-    field_set_tag('') { _erbout.concat "Hello world!" }
+    @output_buffer = ''
+    field_set_tag('') { @output_buffer.concat "Hello world!" }
 
     expected = %(<fieldset>Hello world!</fieldset>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def protect_against_forgery?
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index f18adb990c..f136f56777 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -92,15 +92,15 @@ class JavaScriptHelperTest < ActionView::TestCase
   end
 
   def test_javascript_tag_with_block
-    _erbout = ''
-    javascript_tag { _erbout.concat "alert('hello')" }
-    assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", _erbout
+    @output_buffer = ''
+    javascript_tag { @output_buffer.concat "alert('hello')" }
+    assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", @output_buffer
   end
 
   def test_javascript_tag_with_block_and_options
-    _erbout = ''
-    javascript_tag(:id => "the_js_tag") { _erbout.concat "alert('hello')" }
-    assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", _erbout
+    @output_buffer = ''
+    javascript_tag(:id => "the_js_tag") { @output_buffer.concat "alert('hello')" }
+    assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", @output_buffer
   end
 
   def test_javascript_cdata_section
diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb
index 53a250f9d5..dd6f6ab741 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -118,52 +118,52 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
   end
 
   def test_form_remote_tag_with_block
-    _erbout = ''
-    form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }) { _erbout.concat "Hello world!" }
-    assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\">Hello world!</form>), _erbout
+    @output_buffer = ''
+    form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }) { @output_buffer.concat "Hello world!" }
+    assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\">Hello world!</form>), @output_buffer
   end
 
   def test_remote_form_for_with_record_identification_with_new_record
-    _erbout = ''
+    @output_buffer = ''
     remote_form_for(@record, {:html => { :id => 'create-author' }}) {}
     
     expected = %(<form action='#{authors_path}' onsubmit="new Ajax.Request('#{authors_path}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='new_author' id='create-author' method='post'></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_remote_form_for_with_record_identification_without_html_options
-    _erbout = ''
+    @output_buffer = ''
     remote_form_for(@record) {}
     
     expected = %(<form action='#{authors_path}' onsubmit="new Ajax.Request('#{authors_path}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='new_author' method='post' id='new_author'></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_remote_form_for_with_record_identification_with_existing_record
     @record.save
-    _erbout = ''
+    @output_buffer = ''
     remote_form_for(@record) {}
     
     expected = %(<form action='#{author_path(@record)}' id='edit_author_1' method='post' onsubmit="new Ajax.Request('#{author_path(@record)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_author'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_remote_form_for_with_new_object_in_list
-    _erbout = ''
+    @output_buffer = ''
     remote_form_for([@author, @article]) {}
     
     expected = %(<form action='#{author_articles_path(@author)}' onsubmit="new Ajax.Request('#{author_articles_path(@author)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='new_article' method='post' id='new_article'></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
   
   def test_remote_form_for_with_existing_object_in_list
     @author.save
     @article.save
-    _erbout = ''
+    @output_buffer = ''
     remote_form_for([@author, @article]) {}
     
     expected = %(<form action='#{author_article_path(@author, @article)}' id='edit_article_1' method='post' onsubmit="new Ajax.Request('#{author_article_path(@author, @article)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_article'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
-    assert_dom_equal expected, _erbout
+    assert_dom_equal expected, @output_buffer
   end
 
   def test_on_callbacks
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 0afbb54f57..c39e5c69bf 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -17,37 +17,37 @@ class RecordTagHelperTest < ActionView::TestCase
   end
   
   def test_content_tag_for
-    _erbout = ''
+    @output_buffer = ''
     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 = ''
+    @output_buffer = ''
     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 = ''
+    @output_buffer = ''
     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 = ''
+    @output_buffer = ''
     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) { @output_buffer.concat @post.body }
     assert_dom_equal expected, actual            
   end
   
   def test_div_for    
-    _erbout = ''    
+    @output_buffer = ''
     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") { @output_buffer.concat @post.body }
     assert_dom_equal expected, actual
   end  
   
diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
index 4da6116095..7db04d178f 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -35,15 +35,15 @@ class TagHelperTest < ActionView::TestCase
   end
   
   def test_content_tag_with_block
-    _erbout = ''
-    content_tag(:div) { _erbout.concat "Hello world!" }
-    assert_dom_equal "<div>Hello world!</div>", _erbout
+    @output_buffer = ''
+    content_tag(:div) { @output_buffer.concat "Hello world!" }
+    assert_dom_equal "<div>Hello world!</div>", @output_buffer
   end
   
   def test_content_tag_with_block_and_options
-    _erbout = ''
-    content_tag(:div, :class => "green") { _erbout.concat "Hello world!" }
-    assert_dom_equal %(<div class="green">Hello world!</div>), _erbout
+    @output_buffer = ''
+    content_tag(:div, :class => "green") { @output_buffer.concat "Hello world!" }
+    assert_dom_equal %(<div class="green">Hello world!</div>), @output_buffer
   end
   
   def test_content_tag_with_block_and_options_outside_of_action_view