fix merge

19 files changed, 542 insertions, 400 deletions

diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index b28717597e..34c0200fe8 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -169,6 +169,22 @@ class DefaultUrlOptionsTest < Test::Unit::TestCase
   end
 end
 
+class EmptyUrlOptionsTest < Test::Unit::TestCase
+  def setup
+    @controller = NonEmptyController.new
+
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @request.host = 'www.example.com'
+  end
+
+  def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set
+    get :public_action
+    assert_equal "http://www.example.com/non_empty/public_action", @controller.url_for
+  end
+end
+
 class EnsureNamedRoutesWorksTicket22BugTest < Test::Unit::TestCase
   def test_named_routes_still_work
     ActionController::Routing::Routes.draw do |map|
@@ -180,4 +196,4 @@ class EnsureNamedRoutesWorksTicket22BugTest < Test::Unit::TestCase
   ensure
     ActionController::Routing::Routes.load!
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index aee60b1c6f..14cf0a86a1 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -188,6 +188,10 @@ class ActionCachingTestController < ActionController::Base
     expire_action :controller => 'action_caching_test', :action => 'index'
     render :nothing => true
   end
+  def expire_xml
+    expire_action :controller => 'action_caching_test', :action => 'index', :format => 'xml'
+    render :nothing => true
+  end
 end
 
 class MockTime < Time
@@ -213,6 +217,7 @@ class ActionCachingMockController
     mocked_path = @mock_path
     Object.new.instance_eval(<<-EVAL)
       def path; '#{@mock_path}' end
+      def format; 'all' end
       self
     EVAL
   end
@@ -326,6 +331,20 @@ class ActionCacheTest < Test::Unit::TestCase
     assert_equal new_cached_time, @response.body
   end
 
+  def test_cache_expiration_isnt_affected_by_request_format
+    get :index
+    cached_time = content_to_cache
+    reset!
+
+    @request.set_REQUEST_URI "/action_caching_test/expire.xml"
+    get :expire, :format => :xml
+    reset!
+
+    get :index
+    new_cached_time = content_to_cache
+    assert_not_equal cached_time, @response.body
+  end
+
   def test_cache_is_scoped_by_subdomain
     @request.host = 'jamis.hostname.com'
     get :index
@@ -370,11 +389,35 @@ class ActionCacheTest < Test::Unit::TestCase
   end
 
   def test_xml_version_of_resource_is_treated_as_different_cache
-    @mock_controller.mock_url_for = 'http://example.org/posts/'
-    @mock_controller.mock_path    = '/posts/index.xml'
-    path_object = @path_class.new(@mock_controller, {})
-    assert_equal 'xml', path_object.extension
-    assert_equal 'example.org/posts/index.xml', path_object.path
+    with_routing do |set|
+      ActionController::Routing::Routes.draw do |map|
+        map.connect ':controller/:action.:format'
+        map.connect ':controller/:action'
+      end
+
+      get :index, :format => 'xml'
+      cached_time = content_to_cache
+      assert_equal cached_time, @response.body
+      assert fragment_exist?('hostname.com/action_caching_test/index.xml')
+      reset!
+
+      get :index, :format => 'xml'
+      assert_equal cached_time, @response.body
+      assert_equal 'application/xml', @response.content_type
+      reset!
+
+      @request.env['HTTP_ACCEPT'] = "application/xml"
+      get :index
+      assert_equal cached_time, @response.body
+      assert_equal 'application/xml', @response.content_type
+      reset!
+
+      get :expire_xml
+      reset!
+
+      get :index, :format => 'xml'
+      assert_not_equal cached_time, @response.body
+    end
   end
 
   def test_correct_content_type_is_returned_for_cache_hit
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 62c00c5b9a..475e13897b 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'action_controller/integration'
+require 'action_controller/routing'
 
 uses_mocha 'integration' do
 
@@ -12,12 +13,12 @@ end
 
 class SessionTest < Test::Unit::TestCase
   include IntegrationSessionStubbing
-  
+
   def setup
     @session = ActionController::Integration::Session.new
     stub_integration_session(@session)
   end
-  
+
   def test_https_bang_works_and_sets_truth_by_default
     assert !@session.https?
     @session.https!
@@ -196,7 +197,7 @@ class SessionTest < Test::Unit::TestCase
     @session.expects(:process).with(:head,path,params,headers_after_xhr)
     @session.xml_http_request(:head,path,params,headers)
   end
-  
+
   def test_xml_http_request_override_accept
     path = "/index"; params = "blah"; headers = {:location => 'blah', "Accept" => "application/xml"}
     headers_after_xhr = headers.merge(
@@ -227,7 +228,6 @@ class IntegrationTestTest < Test::Unit::TestCase
     assert_equal ::ActionController::Integration::Session, session2.class
     assert_not_equal session1, session2
   end
-
 end
 
 # Tests that integration tests don't call Controller test methods for processing.
@@ -246,7 +246,90 @@ class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest
       assert_nothing_raised("'#{verb}' should use integration test methods") { send!(verb, '/') }
     end
   end
+end
+
+class IntegrationProcessTest < ActionController::IntegrationTest
+  class IntegrationController < ActionController::Base
+    session :off
+
+    def get
+      render :text => "OK", :status => 200
+    end
+
+    def post
+      render :text => "Created", :status => 201
+    end
+
+    def cookie_monster
+      cookies["cookie_1"] = nil
+      cookies["cookie_3"] = "chocolate"
+      render :text => "Gone", :status => 410
+    end
+  end
 
+  def test_get
+    with_test_route_set do
+      get '/get'
+      assert_equal 200, status
+      assert_equal "OK", status_message
+      assert_equal "200 OK", response.headers["Status"]
+      assert_equal ["200 OK"], headers["status"]
+      assert_equal [], response.headers["cookie"]
+      assert_equal [], headers["cookie"]
+      assert_equal({}, cookies)
+      assert_equal "OK", response.body
+      assert_kind_of HTML::Document, html_document
+      assert_equal 1, request_count
+    end
+  end
+
+  def test_post
+    with_test_route_set do
+      post '/post'
+      assert_equal 201, status
+      assert_equal "Created", status_message
+      assert_equal "201 Created", response.headers["Status"]
+      assert_equal ["201 Created"], headers["status"]
+      assert_equal [], response.headers["cookie"]
+      assert_equal [], headers["cookie"]
+      assert_equal({}, cookies)
+      assert_equal "Created", response.body
+      assert_kind_of HTML::Document, html_document
+      assert_equal 1, request_count
+    end
+  end
+
+  def test_cookie_monster
+    with_test_route_set do
+      self.cookies['cookie_1'] = "sugar"
+      self.cookies['cookie_2'] = "oatmeal"
+      get '/cookie_monster'
+      assert_equal 410, status
+      assert_equal "Gone", status_message
+      assert_equal "410 Gone", response.headers["Status"]
+      assert_equal ["410 Gone"], headers["status"]
+      assert_equal nil, response.headers["Set-Cookie"]
+      assert_equal ["cookie_1=; path=/", "cookie_3=chocolate; path=/"], headers['set-cookie']
+      assert_equal [[], ["chocolate"]], response.headers["cookie"]
+      assert_equal [], headers["cookie"]
+      assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies)
+      assert_equal "Gone", response.body
+    end
+  end
+
+  private
+    def with_test_route_set
+      with_routing do |set|
+        set.draw do |map|
+          map.with_options :controller => "IntegrationProcessTest::Integration" do |c|
+            c.connect '/get', :action => "get"
+            c.connect '/post', :action => "post"
+            c.connect '/cookie_monster', :action => "cookie_monster"
+          end
+        end
+        yield
+      end
+    end
 end
 
-end # uses_mocha
+end
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 6b83b8337e..b77b3ceffa 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -220,7 +220,7 @@ class NewRenderTestController < ActionController::Base
     render :action => "test/hello_world"
   end
 
- def render_to_string_with_partial
+  def render_to_string_with_partial
     @partial_only = render_to_string :partial => "partial_only"
     @partial_with_locals = render_to_string :partial => "customer", :locals => { :customer => Customer.new("david") }     
     render :action => "test/hello_world"  
@@ -251,11 +251,15 @@ class NewRenderTestController < ActionController::Base
   def accessing_logger_in_template
     render :inline =>  "<%= logger.class %>"
   end
-  
+
   def accessing_action_name_in_template
     render :inline =>  "<%= action_name %>"
   end
 
+  def accessing_controller_name_in_template
+    render :inline =>  "<%= controller_name %>"
+  end
+
   def accessing_params_in_template_with_layout
     render :layout => nil, :inline =>  "Hello: <%= params[:name] %>"
   end
@@ -559,12 +563,17 @@ class NewRenderTest < Test::Unit::TestCase
     get :accessing_logger_in_template
     assert_equal "Logger", @response.body
   end
-  
+
   def test_access_to_action_name_in_view
     get :accessing_action_name_in_template
     assert_equal "accessing_action_name_in_template", @response.body
   end
 
+  def test_access_to_controller_name_in_view
+    get :accessing_controller_name_in_template
+    assert_equal "test", @response.body # name is explicitly set to 'test' inside the controller.
+  end
+
   def test_render_xml
     get :render_xml_hello
     assert_equal "<html>\n  <p>Hello David</p>\n<p>This is grand!</p>\n</html>\n", @response.body
diff --git a/actionpack/test/controller/verification_test.rb b/actionpack/test/controller/verification_test.rb
index d6fde35f83..b289443129 100644
--- a/actionpack/test/controller/verification_test.rb
+++ b/actionpack/test/controller/verification_test.rb
@@ -21,10 +21,10 @@ class VerificationTest < Test::Unit::TestCase
 
     verify :only => :guarded_by_method, :method => :post,
            :redirect_to => { :action => "unguarded" }
-           
+
     verify :only => :guarded_by_xhr, :xhr => true,
            :redirect_to => { :action => "unguarded" }
-           
+
     verify :only => :guarded_by_not_xhr, :xhr => false,
            :redirect_to => { :action => "unguarded" }
 
@@ -39,10 +39,13 @@ class VerificationTest < Test::Unit::TestCase
 
     verify :only => :no_default_action, :params => "santa"
 
+    verify :only => :guarded_with_back, :method => :post,
+           :redirect_to => :back
+
     def guarded_one
       render :text => "#{params[:one]}"
     end
-    
+
     def guarded_one_for_named_route_test
       render :text => "#{params[:one]}"
     end
@@ -70,11 +73,11 @@ class VerificationTest < Test::Unit::TestCase
     def guarded_by_method
       render :text => "#{request.method}"
     end
-    
+
     def guarded_by_xhr
       render :text => "#{request.xhr?}"
     end
-    
+
     def guarded_by_not_xhr
       render :text => "#{request.xhr?}"
     end
@@ -86,15 +89,19 @@ class VerificationTest < Test::Unit::TestCase
     def two_redirects
       render :nothing => true
     end
-    
+
     def must_be_post
       render :text => "Was a post!"
     end
-    
+
+    def guarded_with_back
+      render :text => "#{params[:one]}"
+    end
+
     def no_default_action
       # Will never run
     end
-    
+
     protected
       def rescue_action(e) raise end
 
@@ -109,7 +116,17 @@ class VerificationTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
     ActionController::Routing::Routes.add_named_route :foo, '/foo', :controller => 'test', :action => 'foo'
   end
-  
+
+  def test_using_symbol_back_with_no_referrer
+    assert_raise(ActionController::RedirectBackError) { get :guarded_with_back }
+  end
+
+  def test_using_symbol_back_redirects_to_referrer
+    @request.env["HTTP_REFERER"] = "/foo"
+    get :guarded_with_back
+    assert_redirected_to '/foo'
+  end
+
   def test_no_deprecation_warning_for_named_route
     assert_not_deprecated do
       get :guarded_one_for_named_route_test, :two => "not one"
@@ -209,44 +226,44 @@ class VerificationTest < Test::Unit::TestCase
     get :guarded_by_method
     assert_redirected_to :action => "unguarded"
   end
-  
+
   def test_guarded_by_xhr_with_prereqs
     xhr :post, :guarded_by_xhr
     assert_equal "true", @response.body
   end
-    
+
   def test_guarded_by_xhr_without_prereqs
     get :guarded_by_xhr
     assert_redirected_to :action => "unguarded"
   end
-  
+
   def test_guarded_by_not_xhr_with_prereqs
     get :guarded_by_not_xhr
     assert_equal "false", @response.body
   end
-    
+
   def test_guarded_by_not_xhr_without_prereqs
     xhr :post, :guarded_by_not_xhr
     assert_redirected_to :action => "unguarded"
   end
-  
+
   def test_guarded_post_and_calls_render_succeeds
     post :must_be_post
     assert_equal "Was a post!", @response.body
   end
-    
+
   def test_default_failure_should_be_a_bad_request
     post :no_default_action
     assert_response :bad_request
   end
-    
+
   def test_guarded_post_and_calls_render_fails_and_sets_allow_header
     get :must_be_post
     assert_response 405
     assert_equal "Must be post", @response.body
     assert_equal "POST", @response.headers["Allow"]
   end
-  
+
   def test_second_redirect
     assert_nothing_raised { get :two_redirects }
   end
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 0516da32d8..1b4c1fae2f 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -1,30 +1,30 @@
 require 'abstract_unit'
 
 class ViewLoadPathsTest < Test::Unit::TestCase
-  
   LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
 
-  ActionController::Base.view_paths = [ LOAD_PATH_ROOT ]
+  ActionController::Base.view_paths = [LOAD_PATH_ROOT]
 
   class TestController < ActionController::Base
     def self.controller_path() "test" end
     def rescue_action(e) raise end
-    
+
     before_filter :add_view_path, :only => :hello_world_at_request_time
-    
+
     def hello_world() end
     def hello_world_at_request_time() render(:action => 'hello_world') end
+
     private
-    def add_view_path
-      prepend_view_path "#{LOAD_PATH_ROOT}/override"
-    end
+      def add_view_path
+        prepend_view_path "#{LOAD_PATH_ROOT}/override"
+      end
   end
-  
+
   class Test::SubController < ActionController::Base
     layout 'test/sub'
     def hello_world; render(:template => 'test/hello_world'); end
   end
-  
+
   def setup
     TestController.view_paths = nil
 
@@ -41,68 +41,80 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     @last_message = nil
     ActiveSupport::Deprecation.behavior = Proc.new { |message, callback| @last_message = message }
   end
-  
+
   def teardown
     ActiveSupport::Deprecation.behavior = @old_behavior
   end
-  
+
   def test_template_load_path_was_set_correctly
-    assert_equal [ LOAD_PATH_ROOT ], @controller.view_paths
+    assert_equal [ LOAD_PATH_ROOT ], @controller.view_paths.map(&:to_s)
   end
-  
+
   def test_controller_appends_view_path_correctly
     @controller.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
-    
+    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths.map(&:to_s)
+
     @controller.append_view_path(%w(bar baz))
-    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
+
+    @controller.append_view_path(LOAD_PATH_ROOT)
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+
+    @controller.append_view_path([LOAD_PATH_ROOT])
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
   end
-  
+
   def test_controller_prepends_view_path_correctly
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
-    
+    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+
+    @controller.prepend_view_path(LOAD_PATH_ROOT)
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
+
+    @controller.prepend_view_path([LOAD_PATH_ROOT])
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
   end
-  
+
   def test_template_appends_view_path_correctly
     @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
     class_view_paths = TestController.view_paths
 
     @controller.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
-    
+    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths.map(&:to_s)
+
     @controller.append_view_path(%w(bar baz))
-    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
     assert_equal class_view_paths, TestController.view_paths
   end
-  
+
   def test_template_prepends_view_path_correctly
     @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
     class_view_paths = TestController.view_paths
-    
+
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
-    
+    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
     assert_equal class_view_paths, TestController.view_paths
   end
-  
+
   def test_view_paths
     get :hello_world
     assert_response :success
     assert_equal "Hello world!", @response.body
   end
-  
+
   def test_view_paths_override
     TestController.prepend_view_path "#{LOAD_PATH_ROOT}/override"
     get :hello_world
     assert_response :success
     assert_equal "Hello overridden world!", @response.body
   end
-  
+
   def test_view_paths_override_for_layouts_in_controllers_with_a_module
     @controller = Test::SubController.new
     Test::SubController.view_paths = [ "#{LOAD_PATH_ROOT}/override", LOAD_PATH_ROOT, "#{LOAD_PATH_ROOT}/override2" ]
@@ -110,31 +122,44 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     assert_response :success
     assert_equal "layout: Hello overridden world!", @response.body
   end
-  
+
   def test_view_paths_override_at_request_time
     get :hello_world_at_request_time
     assert_response :success
     assert_equal "Hello overridden world!", @response.body
   end
-  
+
   def test_inheritance
     original_load_paths = ActionController::Base.view_paths
-    
+
     self.class.class_eval %{
       class A < ActionController::Base; end
       class B < A; end
       class C < ActionController::Base; end
     }
-  
-    A.view_paths = [ 'a/path' ]
-    
-    assert_equal [ 'a/path' ],        A.view_paths
-    assert_equal A.view_paths,   B.view_paths
+
+    A.view_paths = ['a/path']
+
+    assert_equal ['a/path'], A.view_paths.map(&:to_s)
+    assert_equal A.view_paths, B.view_paths
     assert_equal original_load_paths, C.view_paths
-    
+
     C.view_paths = []
     assert_nothing_raised { C.view_paths << 'c/path' }
-    assert_equal ['c/path'], C.view_paths
+    assert_equal ['c/path'], C.view_paths.map(&:to_s)
+  end
+
+  def test_find_template_file_for_path
+    assert_equal "test/hello_world.erb", @controller.view_paths.find_template_file_for_path("test/hello_world.erb").to_s
+    assert_equal "test/hello.builder", @controller.view_paths.find_template_file_for_path("test/hello.builder").to_s
+    assert_equal nil, @controller.view_paths.find_template_file_for_path("test/missing.erb")
+  end
+
+  def test_view_paths_find_template_file_for_path
+    assert_equal "test/formatted_html_erb.html.erb", @controller.view_paths.find_template_file_for_path("test/formatted_html_erb.html").to_s
+    assert_equal "test/formatted_xml_erb.xml.erb", @controller.view_paths.find_template_file_for_path("test/formatted_xml_erb.xml").to_s
+    assert_equal "test/hello_world.erb", @controller.view_paths.find_template_file_for_path("test/hello_world.html").to_s
+    assert_equal "test/hello_world.erb", @controller.view_paths.find_template_file_for_path("test/hello_world.xml").to_s
+    assert_equal nil, @controller.view_paths.find_template_file_for_path("test/missing.html")
   end
-  
 end
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 3399b03dd2..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)
 
-    @output_buffer = ''
-
     fields_for :post, @post do |f|
-      @output_buffer.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, @output_buffer)
+    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)
 
-    @output_buffer = ''
-
     fields_for :post, @post do |f|
-      @output_buffer.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, @output_buffer)
+    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 65984fac44..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
-    @output_buffer = ''
-
     form_for(:post, @post, :html => { :id => 'create-post' }) do |f|
-      @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')
+      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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_method
-    @output_buffer = ''
-
     form_for(:post, @post, :html => { :id => 'create-post', :method => :put }) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_without_object
-    @output_buffer = ''
-
     form_for(:post, :html => { :id => 'create-post' }) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_index
-    @output_buffer = ''
-
     form_for("post[]", @post) do |f|
-      @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)
+      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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_nil_index_option_override
-    @output_buffer = ''
-
     form_for("post[]", @post, :index => nil) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_nested_fields_for
-    @output_buffer = ''
     form_for(:post, @post) do |f|
       f.fields_for(:comment, @post) do |c|
-        @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_fields_for
-    @output_buffer = ''
-
     fields_for(:post, @post) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_fields_for_with_index
-    @output_buffer = ''
-
     fields_for("post[]", @post) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_fields_for_with_nil_index_option_override
-    @output_buffer = ''
-
     fields_for("post[]", @post, :index => nil) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_fields_for_with_index_option_override
-    @output_buffer = ''
-
     fields_for("post[]", @post, :index => "abc") do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_fields_for_without_object
-    @output_buffer = ''
     fields_for(:post) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_fields_for_with_only_object
-    @output_buffer = ''
     fields_for(@post) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_fields_for_object_with_bracketed_name
-    @output_buffer = ''
     fields_for("author[post]", @post) do |f|
-      @output_buffer.concat f.label(:title)
-      @output_buffer.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' />",
-      @output_buffer
+      output_buffer
   end
 
   def test_fields_for_object_with_bracketed_name_and_index
-    @output_buffer = ''
     fields_for("author[post]", @post, :index => 1) do |f|
-      @output_buffer.concat f.label(:title)
-      @output_buffer.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' />",
-      @output_buffer
+      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
-    @output_buffer = ''
-
     form_for(:post, @post, :html => { :id => 'create-post' }) do |post_form|
-      @output_buffer.concat post_form.text_field(:title)
-      @output_buffer.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|
-        @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_and_fields_for_with_object
-    @output_buffer = ''
-
     form_for(:post, @post, :html => { :id => 'create-post' }) do |post_form|
-      @output_buffer.concat post_form.text_field(:title)
-      @output_buffer.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|
-        @output_buffer.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, @output_buffer
+    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
-    @output_buffer = ''
-
     form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    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
 
-    @output_buffer = ''
     form_for(:post, @post) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    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
-
-    @output_buffer = ''
     form_for(:post, @post) do |f|
-       @output_buffer.concat f.error_message_on('author_name')
-       @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
 
   end
 
@@ -713,10 +681,9 @@ class FormHelperTest < ActionView::TestCase
     post = @post
     @post = nil
 
-    @output_buffer = ''
     form_for(:post, post) do |f|
-       @output_buffer.concat f.error_message_on('author_name')
-       @output_buffer.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, @output_buffer
+    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
-     @output_buffer = ''
 
      remote_form_for(:post, @post, :builder => LabelledFormBuilder) do |f|
-       @output_buffer.concat f.text_field(:title)
-       @output_buffer.concat f.text_area(:body)
-       @output_buffer.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, @output_buffer
+     assert_dom_equal expected, output_buffer
   end
 
   def test_fields_for_with_labelled_builder
-    @output_buffer = ''
-
     fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
-      @output_buffer.concat f.text_field(:title)
-      @output_buffer.concat f.text_area(:body)
-      @output_buffer.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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_html_options_adds_options_to_form_tag
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_string_url_option
-    @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>', @output_buffer
+    assert_equal '<form action="http://www.otherdomain.com" method="post"></form>', output_buffer
   end
 
   def test_form_for_with_hash_url_option
-    @output_buffer = ''
-
     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
-    @output_buffer = ''
-
     form_for(:post, @post, :url => @post) do |f| end
 
     expected = "<form action=\"/posts/123\" method=\"post\"></form>"
-    assert_equal expected, @output_buffer
+    assert_equal expected, output_buffer
   end
 
   def test_form_for_with_existing_object
-    @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, @output_buffer
+    assert_equal expected, output_buffer
   end
 
   def test_form_for_with_new_object
-    @output_buffer = ''
-
     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, @output_buffer
+    assert_equal expected, output_buffer
   end
 
   def test_form_for_with_existing_object_in_list
     @post.new_record = false
     @comment.save
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_new_object_in_list
     @post.new_record = false
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_existing_object_and_namespace_in_list
     @post.new_record = false
     @comment.save
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_new_object_and_namespace_in_list
     @post.new_record = false
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_existing_object_and_custom_url
-    @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, @output_buffer
+    assert_equal expected, output_buffer
   end
 
   def test_remote_form_for_with_html_options_adds_options_to_form_tag
     self.extend ActionView::Helpers::PrototypeHelper
-    @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, @output_buffer
+    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 3c9fb297c3..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>"
-    
-    @output_buffer = ''
-    
+
     fields_for :post, @post do |f|
-      @output_buffer.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>",
-      @output_buffer
+      output_buffer
     )
   end
 
@@ -352,16 +350,14 @@ class FormOptionsHelperTest < ActionView::TestCase
 
     @post = Post.new
     @post.author_name = "Babe"
-    
-    @output_buffer = ''
-    
+
     fields_for :post, @post do |f|
-      @output_buffer.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>",
-      @output_buffer
+      output_buffer
     )
   end
 
@@ -1194,11 +1190,9 @@ COUNTRIES
 
   def test_time_zone_select_under_fields_for
     @firm = Firm.new("D")
-    
-    @output_buffer = ''
-    
+
     fields_for :firm, @firm do |f|
-      @output_buffer.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>",
-      @output_buffer
+      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 b281db18bd..47b3605849 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -43,19 +43,17 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_form_tag_with_block
-    @output_buffer = ''
-    form_tag("http://example.com") { @output_buffer.concat "Hello world!" }
+    form_tag("http://example.com") { concat "Hello world!" }
 
     expected = %(<form action="http://example.com" method="post">Hello world!</form>)
-    assert_dom_equal expected, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_form_tag_with_block_and_method
-    @output_buffer = ''
-    form_tag("http://example.com", :method => :put) { @output_buffer.concat "Hello world!" }
+    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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_hidden_field_tag
@@ -234,23 +232,22 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_field_set_tag
-    @output_buffer = ''
-    field_set_tag("Your details") { @output_buffer.concat "Hello world!" }
+    field_set_tag("Your details") { concat "Hello world!" }
 
     expected = %(<fieldset><legend>Your details</legend>Hello world!</fieldset>)
-    assert_dom_equal expected, @output_buffer
+    assert_dom_equal expected, output_buffer
 
-    @output_buffer = ''
-    field_set_tag { @output_buffer.concat "Hello world!" }
+    self.output_buffer = ''
+    field_set_tag { concat "Hello world!" }
 
     expected = %(<fieldset>Hello world!</fieldset>)
-    assert_dom_equal expected, @output_buffer
-    
-    @output_buffer = ''
-    field_set_tag('') { @output_buffer.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, @output_buffer
+    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 4924074c3e..8c649ea544 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -82,12 +82,12 @@ class JavaScriptHelperTest < ActionView::TestCase
   end
 
   def test_javascript_tag
-    @output_buffer = 'foo'
+    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'
+    assert_equal 'foo', output_buffer, 'javascript_tag without a block should not concat to output_buffer'
   end
 
   def test_javascript_tag_with_options
@@ -96,15 +96,13 @@ class JavaScriptHelperTest < ActionView::TestCase
   end
 
   def test_javascript_tag_with_block
-    @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
+    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
-    @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
+    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 3f5ec07214..a5be0d2789 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -118,52 +118,46 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
   end
 
   def test_form_remote_tag_with_block
-    @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
+    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
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_remote_form_for_with_record_identification_without_html_options
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_remote_form_for_with_record_identification_with_existing_record
     @record.save
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
 
   def test_remote_form_for_with_new_object_in_list
-    @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, @output_buffer
+    assert_dom_equal expected, output_buffer
   end
   
   def test_remote_form_for_with_existing_object_in_list
     @author.save
     @article.save
-    @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, @output_buffer
+    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 c39e5c69bf..441dc6b720 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -17,37 +17,32 @@ class RecordTagHelperTest < ActionView::TestCase
   end
   
   def test_content_tag_for
-    @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
-    @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
-    @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
-    @output_buffer = ''
     expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
-    actual = content_tag_for(:tr, @post) { @output_buffer.concat @post.body }
+    actual = content_tag_for(:tr, @post) { concat @post.body }
     assert_dom_equal expected, actual            
   end
   
   def test_div_for    
-    @output_buffer = ''
     expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
-    actual = div_for(@post, :class => "bar") { @output_buffer.concat @post.body }
+    actual = div_for(@post, :class => "bar") { 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 7db04d178f..2941dfe217 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -35,18 +35,17 @@ class TagHelperTest < ActionView::TestCase
   end
   
   def test_content_tag_with_block
-    @output_buffer = ''
-    content_tag(:div) { @output_buffer.concat "Hello world!" }
-    assert_dom_equal "<div>Hello world!</div>", @output_buffer
+    content_tag(:div) { concat "Hello world!" }
+    assert_dom_equal "<div>Hello world!</div>", output_buffer
   end
   
   def test_content_tag_with_block_and_options
-    @output_buffer = ''
-    content_tag(:div, :class => "green") { @output_buffer.concat "Hello world!" }
-    assert_dom_equal %(<div class="green">Hello world!</div>), @output_buffer
+    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
+    self.output_buffer = nil
     assert_equal content_tag("a", "Create", :href => "create"),
                  content_tag("a", "href" => "create") { "Create" }    
   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 0f5c62acad..cbb5c7ee74 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -12,11 +12,11 @@ class TextHelperTest < ActionView::TestCase
   end
 
   def test_concat
-    @output_buffer = 'foo'
+    self.output_buffer = 'foo'
     concat 'bar'
-    assert_equal 'foobar', @output_buffer
+    assert_equal 'foobar', output_buffer
     assert_nothing_raised { concat nil }
-    assert_equal 'foobar', @output_buffer
+    assert_equal 'foobar', output_buffer
   end
 
   def test_simple_format
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index d45ea08a6f..0713cea8ac 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -211,6 +211,14 @@ 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
+    self.output_buffer = ''
+
+    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")