Merge commit 'mainstream/master'

Conflicts:

	actionpack/lib/action_view/helpers/javascript_helper.rb
	activesupport/lib/active_support/dependencies.rb
	activesupport/lib/active_support/inflector.rb
	activesupport/lib/active_support/values/time_zone.rb

13 files changed, 422 insertions, 434 deletions

diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 0a7b19ba96..11b3bdb3fa 100755
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1002,17 +1002,15 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
 
-    _erbout = ''
-
     fields_for :post, @post do |f|
-      _erbout.concat f.date_select(:written_on)
+      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 +1285,8 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
 
-    _erbout = ''
-
     fields_for :post, @post do |f|
-      _erbout.concat f.datetime_select(:updated_at)
+      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 +1295,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..39649c3622 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -337,14 +337,12 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for
-    _erbout = ''
-
     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')
+      concat f.label(:title)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
+      concat f.submit('Create post')
     end
 
     expected =
@@ -357,16 +355,14 @@ 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 = ''
-
     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)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -378,16 +374,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_form_for_without_object
-    _erbout = ''
-
     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)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -398,17 +392,15 @@ 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 = ''
-
     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)
+      concat f.label(:title)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -420,16 +412,14 @@ 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 = ''
-
     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)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -440,14 +430,13 @@ 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 = ''
     form_for(:post, @post) do |f|
       f.fields_for(:comment, @post) do |c|
-        _erbout.concat c.text_field(:title)
+        concat c.text_field(:title)
       end
     end
 
@@ -455,16 +444,14 @@ 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 = ''
-
     fields_for(:post, @post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -473,16 +460,14 @@ 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 = ''
-
     fields_for("post[]", @post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -491,16 +476,14 @@ 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 = ''
-
     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)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -509,16 +492,14 @@ 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 = ''
-
     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)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -527,15 +508,14 @@ 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 = ''
     fields_for(:post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -544,15 +524,14 @@ 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 = ''
     fields_for(@post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -561,31 +540,29 @@ 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 = ''
     fields_for("author[post]", @post) do |f|
-      _erbout.concat f.label(:title)
-      _erbout.concat f.text_field(:title)
+      concat f.label(:title)
+      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 = ''
     fields_for("author[post]", @post, :index => 1) do |f|
-      _erbout.concat f.label(:title)
-      _erbout.concat f.text_field(:title)
+      concat f.label(:title)
+      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 +570,12 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_and_fields_for
-    _erbout = ''
-
     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)
+      concat post_form.text_field(:title)
+      concat post_form.text_area(:body)
 
       fields_for(:parent_post, @post) do |parent_fields|
-        _erbout.concat parent_fields.check_box(:secret)
+        concat parent_fields.check_box(:secret)
       end
     end
 
@@ -612,18 +587,16 @@ 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 = ''
-
     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)
+      concat post_form.text_field(:title)
+      concat post_form.text_area(:body)
 
       post_form.fields_for(@comment) do |comment_fields|
-        _erbout.concat comment_fields.text_field(:name)
+        concat comment_fields.text_field(:name)
       end
     end
 
@@ -634,7 +607,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 +622,10 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_labelled_builder
-    _erbout = ''
-
     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)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -665,18 +636,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
   end
 
   def test_default_form_builder
     old_default_form_builder, ActionView::Base.default_form_builder =
       ActionView::Base.default_form_builder, LabelledFormBuilder
 
-    _erbout = ''
     form_for(:post, @post) do |f|
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -687,17 +657,15 @@ 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 = ''
     form_for(:post, @post) do |f|
-       _erbout.concat f.error_message_on('author_name')
-       _erbout.concat f.error_messages
+       concat f.error_message_on('author_name')
+       concat f.error_messages
     end
 
     expected = %(<form action='http://www.example.com' method='post'>) +
@@ -705,7 +673,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 +681,9 @@ class FormHelperTest < ActionView::TestCase
     post = @post
     @post = nil
 
-    _erbout = ''
     form_for(:post, post) do |f|
-       _erbout.concat f.error_message_on('author_name')
-       _erbout.concat f.error_messages
+       concat f.error_message_on('author_name')
+       concat f.error_messages
     end
 
     expected = %(<form action='http://www.example.com' method='post'>) +
@@ -724,19 +691,18 @@ 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 = ''
 
      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)
+       concat f.text_field(:title)
+       concat f.text_area(:body)
+       concat f.check_box(:secret)
      end
 
      expected =
@@ -747,16 +713,14 @@ 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 = ''
-
     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)
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
     end
 
     expected =
@@ -765,29 +729,23 @@ 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 = ''
-
     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 = ''
-
     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 = ''
-
     form_for(:post, @post, :url => {:controller => 'controller', :action => 'action'}) do |f| end
 
     assert_equal 'controller', @controller.url_for_options[:controller]
@@ -795,26 +753,20 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_record_url_option
-    _erbout = ''
-
     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 = ''
-
     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 = ''
-
     post = Post.new
     post.new_record = true
     def post.id() nil end
@@ -822,64 +774,61 @@ 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 = ''
+
     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 = ''
+
     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 = ''
+
     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 = ''
+
     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 = ''
-
     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 = ''
 
     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..3f89a5e426 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -20,8 +20,6 @@ class MockTimeZone
   end
 end
 
-ActionView::Helpers::FormOptionsHelper::TimeZone = MockTimeZone
-
 class FormOptionsHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormOptionsHelper
 
@@ -31,6 +29,8 @@ class FormOptionsHelperTest < ActionView::TestCase
     Country   = Struct.new('Country', :country_id, :country_name)
     Firm      = Struct.new('Firm', :time_zone)
     Album     = Struct.new('Album', :id, :title, :genre)
+
+    ActiveSupport::TimeZone = MockTimeZone
   end
 
   def test_collection_options
@@ -183,7 +183,7 @@ class FormOptionsHelperTest < ActionView::TestCase
   end
 
   def test_time_zone_options_with_priority_zones
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
     opts = time_zone_options_for_select( nil, zones )
     assert_dom_equal "<option value=\"B\">B</option>\n" +
                  "<option value=\"E\">E</option>" +
@@ -195,7 +195,7 @@ class FormOptionsHelperTest < ActionView::TestCase
   end
 
   def test_time_zone_options_with_selected_priority_zones
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
     opts = time_zone_options_for_select( "E", zones )
     assert_dom_equal "<option value=\"B\">B</option>\n" +
                  "<option value=\"E\" selected=\"selected\">E</option>" +
@@ -207,7 +207,7 @@ class FormOptionsHelperTest < ActionView::TestCase
   end
 
   def test_time_zone_options_with_unselected_priority_zones
-    zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
+    zones = [ ActiveSupport::TimeZone.new( "B" ), ActiveSupport::TimeZone.new( "E" ) ]
     opts = time_zone_options_for_select( "C", zones )
     assert_dom_equal "<option value=\"B\">B</option>\n" +
                  "<option value=\"E\">E</option>" +
@@ -230,16 +230,14 @@ class FormOptionsHelperTest < ActionView::TestCase
   def test_select_under_fields_for
     @post = Post.new
     @post.category = "<mus>"
-    
-    _erbout = ''
-    
+
     fields_for :post, @post do |f|
-      _erbout.concat f.select(:category, %w( abe <mus> hest))
+      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
 
@@ -352,16 +350,14 @@ class FormOptionsHelperTest < ActionView::TestCase
 
     @post = Post.new
     @post.author_name = "Babe"
-    
-    _erbout = ''
-    
+
     fields_for :post, @post do |f|
-      _erbout.concat f.collection_select(:author_name, @posts, :author_name, :author_name)
+      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
 
@@ -1194,11 +1190,9 @@ COUNTRIES
 
   def test_time_zone_select_under_fields_for
     @firm = Firm.new("D")
-    
-    _erbout = ''
-    
+
     fields_for :firm, @firm do |f|
-      _erbout.concat f.time_zone_select(:time_zone)
+      concat f.time_zone_select(:time_zone)
     end
     
     assert_dom_equal(
@@ -1209,7 +1203,7 @@ COUNTRIES
       "<option value=\"D\" selected=\"selected\">D</option>\n" +
       "<option value=\"E\">E</option>" +
       "</select>",
-      _erbout
+      output_buffer
     )
   end
 
@@ -1293,7 +1287,7 @@ COUNTRIES
 
   def test_time_zone_select_with_priority_zones
     @firm = Firm.new("D")
-    zones = [ TimeZone.new("A"), TimeZone.new("D") ]
+    zones = [ ActiveSupport::TimeZone.new("A"), ActiveSupport::TimeZone.new("D") ]
     html = time_zone_select("firm", "time_zone", zones )
     assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
                  "<option value=\"A\">A</option>\n" +
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 73a8bd4d87..eabbe9c8a0 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -35,27 +35,27 @@ class FormTagHelperTest < ActionView::TestCase
     expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="put" /></div>)
     assert_dom_equal expected, actual
   end
-  
+
   def test_form_tag_with_method_delete
     actual = form_tag({}, { :method => :delete })
     expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0'><input type="hidden" name="_method" value="delete" /></div>)
     assert_dom_equal expected, actual
   end
 
-  def test_form_tag_with_block
-    _erbout = ''
-    form_tag("http://example.com") { _erbout.concat "Hello world!" }
+  def test_form_tag_with_block_in_erb
+    __in_erb_template = ''
+    form_tag("http://example.com") { 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!" }
+  def test_form_tag_with_block_and_method_in_erb
+    __in_erb_template = ''
+    form_tag("http://example.com", :method => :put) { 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
@@ -90,11 +90,11 @@ class FormTagHelperTest < ActionView::TestCase
     actual = radio_button_tag("gender", "m") + radio_button_tag("gender", "f")
     expected = %(<input id="gender_m" name="gender" type="radio" value="m" /><input id="gender_f" name="gender" type="radio" value="f" />)
     assert_dom_equal expected, actual
-    
+
     actual = radio_button_tag("opinion", "-1") + radio_button_tag("opinion", "1")
     expected = %(<input id="opinion_-1" name="opinion" type="radio" value="-1" /><input id="opinion_1" name="opinion" type="radio" value="1" />)
     assert_dom_equal expected, actual
-    
+
     actual = radio_button_tag("person[gender]", "m")
     expected = %(<input id="person_gender_m" name="person[gender]" type="radio" value="m" />)
     assert_dom_equal expected, actual
@@ -105,13 +105,13 @@ class FormTagHelperTest < ActionView::TestCase
     expected = %(<select id="people" name="people"><option>david</option></select>)
     assert_dom_equal expected, actual
   end
-  
+
   def test_select_tag_with_multiple
     actual = select_tag "colors", "<option>Red</option><option>Blue</option><option>Green</option>", :multiple => :true
     expected = %(<select id="colors" multiple="multiple" name="colors"><option>Red</option><option>Blue</option><option>Green</option></select>)
     assert_dom_equal expected, actual
   end
-  
+
   def test_select_tag_disabled
     actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>", :disabled => :true
     expected = %(<select id="places" disabled="disabled" name="places"><option>Home</option><option>Work</option><option>Pub</option></select>)
@@ -147,37 +147,37 @@ class FormTagHelperTest < ActionView::TestCase
     expected = %(<input class="admin" id="title" name="title" type="text" value="Hello!" />)
     assert_dom_equal expected, actual
   end
-  
+
   def test_text_field_tag_size_symbol
     actual = text_field_tag "title", "Hello!", :size => 75
     expected = %(<input id="title" name="title" size="75" type="text" value="Hello!" />)
     assert_dom_equal expected, actual
   end
-  
+
   def test_text_field_tag_size_string
     actual = text_field_tag "title", "Hello!", "size" => "75"
     expected = %(<input id="title" name="title" size="75" type="text" value="Hello!" />)
     assert_dom_equal expected, actual
   end
-  
+
   def test_text_field_tag_maxlength_symbol
     actual = text_field_tag "title", "Hello!", :maxlength => 75
     expected = %(<input id="title" name="title" maxlength="75" type="text" value="Hello!" />)
     assert_dom_equal expected, actual
   end
-  
+
   def test_text_field_tag_maxlength_string
     actual = text_field_tag "title", "Hello!", "maxlength" => "75"
     expected = %(<input id="title" name="title" maxlength="75" type="text" value="Hello!" />)
     assert_dom_equal expected, actual
   end
-  
+
   def test_text_field_disabled
     actual = text_field_tag "title", "Hello!", :disabled => :true
     expected = %(<input id="title" name="title" disabled="disabled" type="text" value="Hello!" />)
     assert_dom_equal expected, actual
   end
-  
+
   def test_text_field_tag_with_multiple_options
     actual = text_field_tag "title", "Hello!", :size => 70, :maxlength => 80
     expected = %(<input id="title" name="title" size="70" maxlength="80" type="text" value="Hello!" />)
@@ -228,29 +228,29 @@ class FormTagHelperTest < ActionView::TestCase
       submit_tag("Save", :confirm => "Are you sure?")
     )
   end
-  
+
   def test_pass
     assert_equal 1, 1
   end
 
-  def test_field_set_tag
-    _erbout = ''
-    field_set_tag("Your details") { _erbout.concat "Hello world!" }
+  def test_field_set_tag_in_erb
+    __in_erb_template = ''
+    field_set_tag("Your details") { 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!" }
+    self.output_buffer = ''
+    field_set_tag { concat "Hello world!" }
 
     expected = %(<fieldset>Hello world!</fieldset>)
-    assert_dom_equal expected, _erbout
-    
-    _erbout = ''
-    field_set_tag('') { _erbout.concat "Hello world!" }
+    assert_dom_equal expected, output_buffer
+
+    self.output_buffer = ''
+    field_set_tag('') { 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..d6d398d224 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -48,7 +48,7 @@ class JavaScriptHelperTest < ActionView::TestCase
   end
 
   def test_link_to_function_with_href
-    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>), 
+    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
       link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
   end
 
@@ -82,8 +82,12 @@ class JavaScriptHelperTest < ActionView::TestCase
   end
 
   def test_javascript_tag
+    self.output_buffer = 'foo'
+
     assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
       javascript_tag("alert('hello')")
+
+    assert_equal 'foo', output_buffer, 'javascript_tag without a block should not concat to output_buffer'
   end
 
   def test_javascript_tag_with_options
@@ -91,16 +95,16 @@ class JavaScriptHelperTest < ActionView::TestCase
       javascript_tag("alert('hello')", :id => "the_js_tag")
   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
+  def test_javascript_tag_with_block_in_erb
+    __in_erb_template = ''
+    javascript_tag { 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
+  def test_javascript_tag_with_block_and_options_in_erb
+    __in_erb_template = ''
+    javascript_tag(:id => "the_js_tag") { 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..60b83b476d 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -54,7 +54,7 @@ class PrototypeHelperBaseTest < ActionView::TestCase
     end
 
     def create_generator
-      block = Proc.new { |*args| yield *args if block_given? } 
+      block = Proc.new { |*args| yield *args if block_given? }
       JavaScriptGenerator.new self, &block
     end
 end
@@ -70,7 +70,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     assert_dom_equal %(<a class=\"fine\" href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", { :url => { :action => "whatnot"  }}, { :class => "fine"  })
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onComplete:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
-      link_to_remote("Remote outauthor", :complete => "alert(request.responseText)", :url => { :action => "whatnot"  })      
+      link_to_remote("Remote outauthor", :complete => "alert(request.responseText)", :url => { :action => "whatnot"  })
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onSuccess:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", :success => "alert(request.responseText)", :url => { :action => "whatnot"  })
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
@@ -78,12 +78,12 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot?a=10&amp;b=20', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot", :a => '10', :b => '20' })
   end
-  
+
   def test_link_to_remote_html_options
     assert_dom_equal %(<a class=\"fine\" href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true}); return false;\">Remote outauthor</a>),
       link_to_remote("Remote outauthor", { :url => { :action => "whatnot"  }, :html => { :class => "fine" } })
   end
-  
+
   def test_link_to_remote_url_quote_escaping
     assert_dom_equal %(<a href="#" onclick="new Ajax.Request('http://www.example.com/whatnot\\\'s', {asynchronous:true, evalScripts:true}); return false;">Remote</a>),
       link_to_remote("Remote", { :url => { :action => "whatnot's" } })
@@ -93,14 +93,14 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     assert_dom_equal %(<script type="text/javascript">\n//<![CDATA[\nnew PeriodicalExecuter(function() {new Ajax.Updater('schremser_bier', 'http://www.example.com/mehr_bier', {asynchronous:true, evalScripts:true})}, 10)\n//]]>\n</script>),
       periodically_call_remote(:update => "schremser_bier", :url => { :action => "mehr_bier" })
   end
-  
+
   def test_periodically_call_remote_with_frequency
     assert_dom_equal(
       "<script type=\"text/javascript\">\n//<![CDATA[\nnew PeriodicalExecuter(function() {new Ajax.Request('http://www.example.com/', {asynchronous:true, evalScripts:true})}, 2)\n//]]>\n</script>",
       periodically_call_remote(:frequency => 2)
     )
   end
-  
+
   def test_form_remote_tag
     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;\">),
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  })
@@ -117,53 +117,48 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, :html => { :method => :put })
   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
+  def test_form_remote_tag_with_block_in_erb
+    __in_erb_template = ''
+    form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }) { 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 = ''
     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 = ''
     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 = ''
     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 = ''
     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 = ''
     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
@@ -178,18 +173,18 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
       assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater({success:'glass_of_beer',failure:'glass_of_water'}, 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, on#{callback.to_s.capitalize}:function(request){monkeys();}, parameters:Form.serialize(this)}); return false;">),
         form_remote_tag(:update => { :success => "glass_of_beer", :failure => "glass_of_water" }, :url => { :action => :fast  }, callback=>"monkeys();")
     end
-    
+
     #HTTP status codes 200 up to 599 have callbacks
     #these should work
     100.upto(599) do |callback|
       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, on#{callback.to_s.capitalize}:function(request){monkeys();}, parameters:Form.serialize(this)}); return false;">),
         form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, callback=>"monkeys();")
     end
-    
+
     #test 200 and 404
     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, on200:function(request){monkeys();}, on404:function(request){bananas();}, parameters:Form.serialize(this)}); return false;">),
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, 200=>"monkeys();", 404=>"bananas();")
-    
+
     #these shouldn't
     1.upto(99) do |callback|
       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;">),
@@ -199,44 +194,44 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
       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;">),
         form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, callback=>"monkeys();")
     end
-    
+
     #test ultimate combo
     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, on200:function(request){monkeys();}, on404:function(request){bananas();}, onComplete:function(request){c();}, onFailure:function(request){f();}, onLoading:function(request){c1()}, onSuccess:function(request){s()}, parameters:Form.serialize(this)}); return false;\">),
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, :loading => "c1()", :success => "s()", :failure => "f();", :complete => "c();", 200=>"monkeys();", 404=>"bananas();")
-    
+
   end
-  
+
   def test_submit_to_remote
     assert_dom_equal %(<input name=\"More beer!\" onclick=\"new Ajax.Updater('empty_bottle', 'http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this.form)}); return false;\" type=\"button\" value=\"1000000\" />),
       submit_to_remote("More beer!", 1_000_000, :update => "empty_bottle")
   end
-  
+
   def test_observe_field
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/reorder_if_empty', {asynchronous:true, evalScripts:true, parameters:value})})\n//]]>\n</script>),
       observe_field("glass", :frequency => 5.minutes, :url => { :action => "reorder_if_empty" })
   end
-  
+
   def test_observe_field_using_with_option
     expected = %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/check_value', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(value)})})\n//]]>\n</script>)
     assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => 'id')
     assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "'id=' + encodeURIComponent(value)")
   end
-  
+
   def test_observe_field_using_json_in_with_option
     expected = %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/check_value', {asynchronous:true, evalScripts:true, parameters:{'id':value}})})\n//]]>\n</script>)
-    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "{'id':value}")    
+    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "{'id':value}")
   end
-  
+
   def test_observe_field_using_function_for_callback
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {alert('Element changed')})\n//]]>\n</script>),
       observe_field("glass", :frequency => 5.minutes, :function => "alert('Element changed')")
   end
-  
+
   def test_observe_form
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Observer('cart', 2, function(element, value) {new Ajax.Request('http://www.example.com/cart_changed', {asynchronous:true, evalScripts:true, parameters:value})})\n//]]>\n</script>),
       observe_form("cart", :frequency => 2, :url => { :action => "cart_changed" })
   end
-  
+
   def test_observe_form_using_function_for_callback
     assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Observer('cart', 2, function(element, value) {alert('Form changed')})\n//]]>\n</script>),
       observe_form("cart", :frequency => 2, :function => "alert('Form changed')")
@@ -251,7 +246,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     block = Proc.new { |page| page.replace_html('foo', 'bar') }
     assert_equal create_generator(&block).to_s, update_page(&block)
   end
-  
+
   def test_update_page_tag
     block = Proc.new { |page| page.replace_html('foo', 'bar') }
     assert_equal javascript_tag(create_generator(&block).to_s), update_page_tag(&block)
@@ -267,15 +262,15 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     def author_path(record)
       "/authors/#{record.id}"
     end
-    
+
     def authors_path
       "/authors"
     end
-    
+
     def author_articles_path(author)
       "/authors/#{author.id}/articles"
     end
-    
+
     def author_article_path(author, article)
       "/authors/#{author.id}/articles/#{article.id}"
     end
@@ -286,7 +281,7 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     super
     @generator = create_generator
   end
-  
+
   def test_insert_html_with_string
     assert_equal 'new Insertion.Top("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");',
       @generator.insert_html(:top, 'element', '<p>This is a test</p>')
@@ -297,70 +292,75 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     assert_equal 'new Insertion.After("element", "\\u003Cp\u003EThis is a test\\u003C/p\u003E");',
       @generator.insert_html(:after, 'element', '<p>This is a test</p>')
   end
-  
+
   def test_replace_html_with_string
     assert_equal 'Element.update("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");',
       @generator.replace_html('element', '<p>This is a test</p>')
   end
-  
+
   def test_replace_element_with_string
     assert_equal 'Element.replace("element", "\\u003Cdiv id=\"element\"\\u003E\\u003Cp\\u003EThis is a test\\u003C/p\\u003E\\u003C/div\\u003E");',
       @generator.replace('element', '<div id="element"><p>This is a test</p></div>')
   end
-  
+
   def test_remove
     assert_equal 'Element.remove("foo");',
       @generator.remove('foo')
     assert_equal '["foo", "bar", "baz"].each(Element.remove);',
       @generator.remove('foo', 'bar', 'baz')
   end
-  
+
   def test_show
     assert_equal 'Element.show("foo");',
       @generator.show('foo')
     assert_equal '["foo", "bar", "baz"].each(Element.show);',
-      @generator.show('foo', 'bar', 'baz')  
+      @generator.show('foo', 'bar', 'baz')
   end
-  
+
   def test_hide
     assert_equal 'Element.hide("foo");',
       @generator.hide('foo')
     assert_equal '["foo", "bar", "baz"].each(Element.hide);',
-      @generator.hide('foo', 'bar', 'baz')  
+      @generator.hide('foo', 'bar', 'baz')
   end
-  
+
   def test_toggle
     assert_equal 'Element.toggle("foo");',
       @generator.toggle('foo')
     assert_equal '["foo", "bar", "baz"].each(Element.toggle);',
-      @generator.toggle('foo', 'bar', 'baz')  
+      @generator.toggle('foo', 'bar', 'baz')
   end
-    
+
   def test_alert
     assert_equal 'alert("hello");', @generator.alert('hello')
   end
-  
+
   def test_redirect_to
     assert_equal 'window.location.href = "http://www.example.com/welcome";',
       @generator.redirect_to(:action => 'welcome')
     assert_equal 'window.location.href = "http://www.example.com/welcome?a=b&c=d";',
       @generator.redirect_to("http://www.example.com/welcome?a=b&c=d")
   end
-  
+
+  def test_reload
+    assert_equal 'window.location.reload();',
+      @generator.reload
+  end
+
   def test_delay
     @generator.delay(20) do
       @generator.hide('foo')
     end
-    
+
     assert_equal "setTimeout(function() {\n;\nElement.hide(\"foo\");\n}, 20000);", @generator.to_s
   end
-  
+
   def test_to_s
     @generator.insert_html(:top, 'element', '<p>This is a test</p>')
     @generator.insert_html(:bottom, 'element', '<p>This is a test</p>')
     @generator.remove('foo', 'bar')
     @generator.replace_html('baz', '<p>This is a test</p>')
-    
+
     assert_equal <<-EOS.chomp, @generator.to_s
 new Insertion.Top("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
 new Insertion.Bottom("element", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
@@ -382,12 +382,12 @@ Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     @generator['hello'].hide
     assert_equal %($("hello").hide();), @generator.to_s
   end
-  
+
   def test_element_proxy_variable_access
     @generator['hello']['style']
     assert_equal %($("hello").style;), @generator.to_s
   end
-  
+
   def test_element_proxy_variable_access_with_assignment
     @generator['hello']['style']['color'] = 'red'
     assert_equal %($("hello").style.color = "red";), @generator.to_s
@@ -402,7 +402,7 @@ Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     @generator['hello'].hide("first").clean_whitespace
     assert_equal %($("hello").hide("first").cleanWhitespace();), @generator.to_s
   end
-  
+
   def test_select_access
     assert_equal %($$("div.hello");), @generator.select('div.hello')
   end
@@ -411,29 +411,29 @@ Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     @generator.select('p.welcome b').first.hide
     assert_equal %($$("p.welcome b").first().hide();), @generator.to_s
   end
-  
+
   def test_visual_effect
-    assert_equal %(new Effect.Puff("blah",{});), 
+    assert_equal %(new Effect.Puff("blah",{});),
       @generator.visual_effect(:puff,'blah')
-  end 
-  
+  end
+
   def test_visual_effect_toggle
-    assert_equal %(Effect.toggle("blah",'appear',{});), 
+    assert_equal %(Effect.toggle("blah",'appear',{});),
       @generator.visual_effect(:toggle_appear,'blah')
   end
-  
+
   def test_sortable
-    assert_equal %(Sortable.create("blah", {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("blah")})}});), 
+    assert_equal %(Sortable.create("blah", {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("blah")})}});),
       @generator.sortable('blah', :url => { :action => "order" })
   end
-  
+
   def test_draggable
-    assert_equal %(new Draggable("blah", {});), 
+    assert_equal %(new Draggable("blah", {});),
       @generator.draggable('blah')
   end
-  
+
   def test_drop_receiving
-    assert_equal %(Droppables.add("blah", {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});), 
+    assert_equal %(Droppables.add("blah", {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});),
       @generator.drop_receiving('blah', :url => { :action => "order" })
   end
 
@@ -535,7 +535,7 @@ return array.reverse();
 });
     EOS
   end
-  
+
   def test_collection_proxy_with_find_all
     @generator.select('p').find_all 'a' do |value, index|
       @generator << '(value.className == "welcome")'
@@ -547,7 +547,7 @@ return (value.className == "welcome");
 });
     EOS
   end
-  
+
   def test_collection_proxy_with_in_groups_of
     @generator.select('p').in_groups_of('a', 3)
     @generator.select('p').in_groups_of('a', 3, 'x')
@@ -556,13 +556,13 @@ var a = $$("p").inGroupsOf(3);
 var a = $$("p").inGroupsOf(3, "x");
     EOS
   end
-  
+
   def test_collection_proxy_with_each_slice
     @generator.select('p').each_slice('a', 3)
     @generator.select('p').each_slice('a', 3) do |group, index|
       group.reverse
     end
-      
+
     assert_equal <<-EOS.strip, @generator.to_s
 var a = $$("p").eachSlice(3);
 var a = $$("p").eachSlice(3, function(value, index) {
@@ -570,7 +570,7 @@ return value.reverse();
 });
     EOS
   end
-  
+
   def test_debug_rjs
     ActionView::Base.debug_rjs = true
     @generator['welcome'].replace_html 'Welcome'
@@ -578,7 +578,7 @@ return value.reverse();
   ensure
     ActionView::Base.debug_rjs = false
   end
-  
+
   def test_literal
     literal = @generator.literal("function() {}")
     assert_equal "function() {}", literal.to_json
@@ -589,7 +589,7 @@ return value.reverse();
     @generator.form.focus('my_field')
     assert_equal "Form.focus(\"my_field\");", @generator.to_s
   end
-  
+
   def test_call_with_block
     @generator.call(:before)
     @generator.call(:my_method) do |p|
@@ -602,7 +602,7 @@ return value.reverse();
     end
     assert_equal "before();\nmy_method(function() { $(\"one\").show();\n$(\"two\").hide(); });\nin_between();\nmy_method_with_arguments(true, \"hello\", function() { $(\"three\").visualEffect(\"highlight\"); });", @generator.to_s
   end
-  
+
   def test_class_proxy_call_with_block
     @generator.my_object.my_method do |p|
       p[:one].show
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 0afbb54f57..34a200b933 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 class Post
   def id
-     45 
+     45
   end
   def body
     "What a wonderful world!"
@@ -15,40 +15,36 @@ class RecordTagHelperTest < ActionView::TestCase
   def setup
     @post = Post.new
   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    
+    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        
+    assert_dom_equal expected, actual
   end
-  
-  def test_block_works_with_content_tag_for
-    _erbout = ''
+
+  def test_block_works_with_content_tag_for_in_erb
+    __in_erb_template = ''
     expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
-    actual = content_tag_for(:tr, @post) { _erbout.concat @post.body }
-    assert_dom_equal expected, actual            
+    actual = content_tag_for(:tr, @post) { concat @post.body }
+    assert_dom_equal expected, actual
   end
-  
-  def test_div_for    
-    _erbout = ''    
+
+  def test_div_for_in_erb
+    __in_erb_template = ''
     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  
-  
+  end
 end
diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
index 4da6116095..fc49d340ef 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -33,24 +33,40 @@ class TagHelperTest < ActionView::TestCase
     assert_equal content_tag("a", "Create", "href" => "create"),
                  content_tag("a", "Create", :href => "create")
   end
-  
-  def test_content_tag_with_block
-    _erbout = ''
-    content_tag(:div) { _erbout.concat "Hello world!" }
-    assert_dom_equal "<div>Hello world!</div>", _erbout
+
+  def test_content_tag_with_block_in_erb
+    __in_erb_template = ''
+    content_tag(:div) { 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
+
+  def test_content_tag_with_block_and_options_in_erb
+    __in_erb_template = ''
+    content_tag(:div, :class => "green") { 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
+
+  def test_content_tag_with_block_and_options_out_of_erb
+    assert_dom_equal %(<div class="green">Hello world!</div>), content_tag(:div, :class => "green") { "Hello world!" }
+  end
+
+  def test_content_tag_with_block_and_options_outside_out_of_erb
     assert_equal content_tag("a", "Create", :href => "create"),
-                 content_tag("a", "href" => "create") { "Create" }    
+                 content_tag("a", "href" => "create") { "Create" }
   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") },
+                 output_buffer
+  end
+
+  def test_content_tag_nested_in_content_tag_in_erb
+    __in_erb_template = true
+    content_tag("p") { concat content_tag("b", "Hello") }
+    assert_equal '<p><b>Hello</b></p>', output_buffer
+  end
+
   def test_cdata_section
     assert_equal "<![CDATA[<hello world>]]>", cdata_section("<hello world>")
   end
diff --git a/actionpack/test/template/template_file_test.rb b/actionpack/test/template/template_file_test.rb
new file mode 100644
index 0000000000..d14a966c1c
--- /dev/null
+++ b/actionpack/test/template/template_file_test.rb
@@ -0,0 +1,95 @@
+require 'abstract_unit'
+
+class TemplateFileTest < Test::Unit::TestCase
+  LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
+
+  def setup
+    @template = ActionView::TemplateFile.new("test/hello_world.html.erb")
+    @another_template = ActionView::TemplateFile.new("test/hello_world.erb")
+    @file_only = ActionView::TemplateFile.new("hello_world.erb")
+    @full_path = ActionView::TemplateFile.new("/u/app/scales/config/../app/views/test/hello_world.erb", true)
+    @layout = ActionView::TemplateFile.new("layouts/hello")
+    @multipart = ActionView::TemplateFile.new("test_mailer/implicitly_multipart_example.text.html.erb")
+  end
+
+  def test_path
+    assert_equal "test/hello_world.html.erb", @template.path
+    assert_equal "test/hello_world.erb", @another_template.path
+    assert_equal "hello_world.erb", @file_only.path
+    assert_equal "/u/app/scales/config/../app/views/test/hello_world.erb", @full_path.path
+    assert_equal "layouts/hello", @layout.path
+    assert_equal "test_mailer/implicitly_multipart_example.text.html.erb", @multipart.path
+  end
+
+  def test_path_without_extension
+    assert_equal "test/hello_world.html", @template.path_without_extension
+    assert_equal "test/hello_world", @another_template.path_without_extension
+    assert_equal "hello_world", @file_only.path_without_extension
+    assert_equal "layouts/hello", @layout.path_without_extension
+    assert_equal "test_mailer/implicitly_multipart_example.text.html", @multipart.path_without_extension
+  end
+
+  def test_path_without_format_and_extension
+    assert_equal "test/hello_world", @template.path_without_format_and_extension
+    assert_equal "test/hello_world", @another_template.path_without_format_and_extension
+    assert_equal "hello_world", @file_only.path_without_format_and_extension
+    assert_equal "layouts/hello", @layout.path_without_format_and_extension
+    assert_equal "test_mailer/implicitly_multipart_example", @multipart.path_without_format_and_extension
+  end
+
+  def test_name
+    assert_equal "hello_world", @template.name
+    assert_equal "hello_world", @another_template.name
+    assert_equal "hello_world", @file_only.name
+    assert_equal "hello_world", @full_path.name
+    assert_equal "hello", @layout.name
+    assert_equal "implicitly_multipart_example", @multipart.name
+  end
+
+  def test_format
+    assert_equal "html", @template.format
+    assert_equal nil, @another_template.format
+    assert_equal nil, @layout.format
+    assert_equal "text.html", @multipart.format
+  end
+
+  def test_extension
+    assert_equal "erb", @template.extension
+    assert_equal "erb", @another_template.extension
+    assert_equal nil, @layout.extension
+    assert_equal "erb", @multipart.extension
+  end
+
+  def test_format_and_extension
+    assert_equal "html.erb", @template.format_and_extension
+    assert_equal "erb", @another_template.format_and_extension
+    assert_equal nil, @layout.format_and_extension
+    assert_equal "text.html.erb", @multipart.format_and_extension
+  end
+
+  def test_new_file_with_extension
+    file = @template.dup_with_extension(:haml)
+    assert_equal "test/hello_world.html", file.path_without_extension
+    assert_equal "haml", file.extension
+    assert_equal "test/hello_world.html.haml", file.path
+
+    file = @another_template.dup_with_extension(:haml)
+    assert_equal "test/hello_world", file.path_without_extension
+    assert_equal "haml", file.extension
+    assert_equal "test/hello_world.haml", file.path
+
+    file = @another_template.dup_with_extension(nil)
+    assert_equal "test/hello_world", file.path_without_extension
+    assert_equal nil, file.extension
+    assert_equal "test/hello_world", file.path
+  end
+
+  def test_freezes_entire_contents
+    @template.freeze
+    assert @template.frozen?
+    assert @template.base_path.frozen?
+    assert @template.name.frozen?
+    assert @template.format.frozen?
+    assert @template.extension.frozen?
+  end
+end
diff --git a/actionpack/test/template/template_finder_test.rb b/actionpack/test/template/template_finder_test.rb
deleted file mode 100644
index 3d6baff5fb..0000000000
--- a/actionpack/test/template/template_finder_test.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require 'abstract_unit'
-
-class TemplateFinderTest < Test::Unit::TestCase
-
-  LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
-
-  def setup
-    ActionView::TemplateFinder.process_view_paths(LOAD_PATH_ROOT)
-    ActionView::Template::register_template_handler :mab, Class.new(ActionView::TemplateHandler)
-    @template = ActionView::Base.new
-    @finder = ActionView::TemplateFinder.new(@template, LOAD_PATH_ROOT)
-  end
-
-  def test_should_raise_exception_for_unprocessed_view_path
-    assert_raises ActionView::TemplateFinder::InvalidViewPath do
-      ActionView::TemplateFinder.new(@template, File.dirname(__FILE__))
-    end
-  end
-
-  def test_should_cache_file_extension_properly
-    assert_equal ["builder", "erb", "rhtml", "rjs", "rxml", "mab"].sort,
-                 ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].values.flatten.uniq.sort
-
-    assert_equal (Dir.glob("#{LOAD_PATH_ROOT}/**/*/*.{erb,rjs,rhtml,builder,rxml,mab}") |
-                  Dir.glob("#{LOAD_PATH_ROOT}/**.{erb,rjs,rhtml,builder,rxml,mab}")).size,
-                 ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].keys.size
-  end
-
-  def test_should_cache_dir_content_properly
-    assert ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT]
-    assert_equal (Dir.glob("#{LOAD_PATH_ROOT}/**/*/**") | Dir.glob("#{LOAD_PATH_ROOT}/**")).find_all {|f| !File.directory?(f) }.size,
-               ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT].size
-  end
-
-  def test_find_template_extension_from_first_render
-    assert_nil @finder.send(:find_template_extension_from_first_render)
-
-    {
-      nil => nil,
-      '' => nil,
-      'foo' => nil,
-      '/foo' => nil,
-      'foo.rb' => 'rb',
-      'foo.bar.rb' => 'bar.rb',
-      'baz/foo.rb' => 'rb',
-      'baz/foo.bar.rb' => 'bar.rb',
-      'baz/foo.o/foo.rb' => 'rb',
-      'baz/foo.o/foo.bar.rb' => 'bar.rb',
-    }.each do |input,expectation|
-      @template.instance_variable_set('@first_render', input)
-      assert_equal expectation, @finder.send(:find_template_extension_from_first_render)
-    end
-  end
-
-  def test_should_report_file_exists_correctly
-    assert_nil @finder.send(:find_template_extension_from_first_render)
-    assert_equal false, @finder.send(:file_exists?, 'test.rhtml')
-    assert_equal false, @finder.send(:file_exists?, 'test.rb')
-
-    @template.instance_variable_set('@first_render', 'foo.rb')
-
-    assert_equal 'rb', @finder.send(:find_template_extension_from_first_render)
-    assert_equal false, @finder.send(:file_exists?, 'baz')
-    assert_equal false, @finder.send(:file_exists?, 'baz.rb')
-  end
-  
-  uses_mocha 'Template finder tests' do
-    def test_should_update_extension_cache_when_template_handler_is_registered
-      ActionView::TemplateFinder.expects(:update_extension_cache_for).with("funky")
-      ActionView::Template::register_template_handler :funky, Class.new(ActionView::TemplateHandler)
-    end
-  end
-end
diff --git a/actionpack/test/template/template_object_test.rb b/actionpack/test/template/template_object_test.rb
index afb5c5cc16..2cfc4523c6 100644
--- a/actionpack/test/template/template_object_test.rb
+++ b/actionpack/test/template/template_object_test.rb
@@ -2,60 +2,57 @@ require 'abstract_unit'
 
 class TemplateObjectTest < Test::Unit::TestCase
   LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
-  ActionView::TemplateFinder.process_view_paths(LOAD_PATH_ROOT)
-  
+
   class TemplateTest < Test::Unit::TestCase
     def setup
       @view = ActionView::Base.new(LOAD_PATH_ROOT)
       @path = "test/hello_world.erb"
     end
-    
+
     def test_should_create_valid_template
       template = ActionView::Template.new(@view, @path, true)
-      
+
       assert_kind_of ActionView::TemplateHandlers::ERB, template.handler
-      assert_equal "test/hello_world.erb", template.path
+      assert_equal "test/hello_world.erb", template.path.to_s
       assert_nil template.instance_variable_get(:"@source")
       assert_equal "erb", template.extension
     end
-    
+
     uses_mocha 'Template preparation tests' do
-      
       def test_should_prepare_template_properly
         template = ActionView::Template.new(@view, @path, true)
         view = template.instance_variable_get(:"@view")
-        
+
         view.expects(:evaluate_assigns)
         template.handler.expects(:compile_template).with(template)
         view.expects(:method_names).returns({})
-        
+
         template.prepare!
       end
-      
     end
   end
-  
+
   class PartialTemplateTest < Test::Unit::TestCase
     def setup
       @view = ActionView::Base.new(LOAD_PATH_ROOT)
       @path = "test/partial_only"
     end
-    
+
     def test_should_create_valid_partial_template
       template = ActionView::PartialTemplate.new(@view, @path, nil)
-      
-      assert_equal "test/_partial_only", template.path
+
+      assert_equal "test/_partial_only", template.path.path_without_format_and_extension
       assert_equal :partial_only, template.variable_name
-      
+
       assert template.locals.has_key?(:object)
       assert template.locals.has_key?(:partial_only)
     end
-    
+
     def test_partial_with_errors
       template = ActionView::PartialTemplate.new(@view, 'test/raise', nil)
       assert_raise(ActionView::TemplateError) { template.render_template }
     end
-    
+
     uses_mocha 'Partial template preparation tests' do
       def test_should_prepare_on_initialization
         ActionView::PartialTemplate.any_instance.expects(:prepare!)
@@ -63,7 +60,7 @@ class TemplateObjectTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   class PartialTemplateFallbackTest < Test::Unit::TestCase
     def setup
       @view = ActionView::Base.new(LOAD_PATH_ROOT)
@@ -72,7 +69,7 @@ class TemplateObjectTest < Test::Unit::TestCase
 
     def test_default
       template = ActionView::PartialTemplate.new(@view, @path, nil)
-      assert_equal 'test/_layout_for_partial', template.path
+      assert_equal 'test/_layout_for_partial', template.path.path_without_format_and_extension
       assert_equal 'erb', template.extension
       assert_equal :html, @view.template_format
     end
@@ -80,7 +77,7 @@ class TemplateObjectTest < Test::Unit::TestCase
     def test_js
       @view.template_format = :js
       template = ActionView::PartialTemplate.new(@view, @path, nil)
-      assert_equal 'test/_layout_for_partial', template.path
+      assert_equal 'test/_layout_for_partial', template.path.path_without_format_and_extension
       assert_equal 'erb', template.extension
       assert_equal :html, @view.template_format
     end
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 62cdca03d1..df6be3bb13 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -11,6 +11,12 @@ class TextHelperTest < ActionView::TestCase
     @_cycles = nil if (defined? @_cycles)
   end
 
+  def test_concat
+    self.output_buffer = 'foo'
+    assert_equal 'foobar', concat('bar')
+    assert_equal 'foobar', output_buffer
+  end
+
   def test_simple_format
     assert_equal "<p></p>", simple_format(nil)
 
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index d45ea08a6f..44ceed6661 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -80,7 +80,7 @@ class UrlHelperTest < ActionView::TestCase
   def test_link_tag_with_straight_url
     assert_dom_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", "http://www.example.com")
   end
-  
+
   def test_link_tag_without_host_option
     ActionController::Base.class_eval { attr_accessor :url }
     url = {:controller => 'weblog', :action => 'show'}
@@ -121,7 +121,7 @@ class UrlHelperTest < ActionView::TestCase
     @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {'HTTP_REFERER' => 'http://www.example.com/referer'})
     assert_dom_equal "<a href=\"http://www.example.com/referer\">go back</a>", link_to('go back', :back)
   end
-  
+
   def test_link_tag_with_back_and_no_referer
     @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {})
     assert_dom_equal "<a href=\"javascript:history.back()\">go back</a>", link_to('go back', :back)
@@ -211,7 +211,15 @@ class UrlHelperTest < ActionView::TestCase
   def test_link_tag_using_post_javascript_and_popup
     assert_raises(ActionView::ActionViewError) { link_to("Hello", "http://www.example.com", :popup => true, :method => :post, :confirm => "Are you serious?") }
   end
-  
+
+  def test_link_tag_using_block_in_erb
+    __in_erb_template = ''
+
+    link_to("http://example.com") { concat("Example site") }
+
+    assert_equal '<a href="http://example.com">Example site</a>', output_buffer
+  end
+
   def test_link_to_unless
     assert_equal "Showing", link_to_unless(true, "Showing", :action => "show", :controller => "weblog")
     assert_dom_equal "<a href=\"http://www.example.com\">Listing</a>", link_to_unless(false, "Listing", :action => "list", :controller => "weblog")
@@ -285,7 +293,7 @@ class UrlHelperTest < ActionView::TestCase
     assert_dom_equal "<a href=\"&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">&#109;&#101;&#40;&#97;&#116;&#41;&#100;&#111;&#109;&#97;&#105;&#110;&#40;&#100;&#111;&#116;&#41;&#99;&#111;&#109;</a>", mail_to("me@domain.com", nil, :encode => "hex", :replace_at => "(at)", :replace_dot => "(dot)")
     assert_dom_equal "<script type=\"text/javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
   end
-  
+
   def protect_against_forgery?
     false
   end
@@ -412,11 +420,11 @@ class Workshop
   def initialize(id, new_record)
     @id, @new_record = id, new_record
   end
-  
+
   def new_record?
     @new_record
   end
-  
+
   def to_s
     id.to_s
   end