merge forward to current rails/master

23 files changed, 451 insertions, 389 deletions

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index c25e9e1df6..56ba36cee5 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -157,21 +157,13 @@ module Admin
     def redirect_to_fellow_controller
       redirect_to :controller => 'user'
     end
-    
+
     def redirect_to_top_level_named_route
       redirect_to top_level_url(:id => "foo")
     end
   end
 end
 
-# ---------------------------------------------------------------------------
-
-
-# tell the controller where to find its templates but start from parent
-# directory of test_request_response to simulate the behaviour of a
-# production environment
-ActionPackAssertionsController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 # a test case to exercise the new capabilities TestRequest & TestResponse
 class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # let's get this party started
@@ -232,7 +224,6 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
       process :redirect_to_named_route
       assert_redirected_to 'http://test.host/route_one'
       assert_redirected_to route_one_url
-      assert_redirected_to :route_one_url
     end
   end
 
@@ -253,9 +244,6 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
       assert_raise(Test::Unit::AssertionFailedError) do
         assert_redirected_to route_two_url
       end
-      assert_raise(Test::Unit::AssertionFailedError) do
-        assert_redirected_to :route_two_url
-      end
     end
   end
 
@@ -340,11 +328,11 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # check if we were rendered by a file-based template?
   def test_rendered_action
     process :nothing
-    assert !@response.rendered_with_file?
+    assert_nil @response.rendered_template
 
     process :hello_world
-    assert @response.rendered_with_file?
-    assert 'hello_world', @response.rendered_file
+    assert @response.rendered_template
+    assert 'hello_world', @response.rendered_template.to_s
   end
 
   # check the redirection location
@@ -419,22 +407,6 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_equal "Mr. David", @response.body
   end
 
-  def test_follow_redirect
-    process :redirect_to_action
-    assert_redirected_to :action => "flash_me"
-
-    follow_redirect
-    assert_equal 1, @request.parameters["id"].to_i
-
-    assert "Inconceivable!", @response.body
-  end
-
-  def test_follow_redirect_outside_current_action
-    process :redirect_to_controller
-    assert_redirected_to :controller => "elsewhere", :action => "flash_me"
-
-    assert_raises(RuntimeError, "Can't follow redirects outside of current controller (elsewhere)") { follow_redirect }
-  end
 
   def test_assert_redirection_fails_with_incorrect_controller
     process :redirect_to_controller
@@ -448,14 +420,16 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_redirected_to :controller => 'action_pack_assertions', :action => "flash_me", :id => 1, :params => { :panda => 'fun' }
   end
 
-  def test_redirected_to_url_leadling_slash
+  def test_redirected_to_url_leading_slash
     process :redirect_to_path
     assert_redirected_to '/some/path'
   end
+
   def test_redirected_to_url_no_leadling_slash
     process :redirect_to_path
     assert_redirected_to 'some/path'
   end
+
   def test_redirected_to_url_full_url
     process :redirect_to_path
     assert_redirected_to 'http://test.host/some/path'
@@ -475,7 +449,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   def test_redirected_to_with_nested_controller
     @controller = Admin::InnerModuleController.new
     get :redirect_to_absolute_controller
-    assert_redirected_to :controller => 'content'
+    assert_redirected_to :controller => '/content'
 
     get :redirect_to_fellow_controller
     assert_redirected_to :controller => 'admin/user'
@@ -533,7 +507,6 @@ class ActionPackHeaderTest < Test::Unit::TestCase
     assert_equal('application/pdf; charset=utf-8', @response.headers['type'])
   end
 
-
   def test_render_text_with_custom_content_type
     get :render_text_with_custom_content_type
     assert_equal 'application/rss+xml; charset=utf-8', @response.headers['type']
diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
index a31734203d..b26cae24fb 100644
--- a/actionpack/test/controller/addresses_render_test.rb
+++ b/actionpack/test/controller/addresses_render_test.rb
@@ -1,7 +1,6 @@
 require 'abstract_unit'
 
 class Address
-
   def Address.count(conditions = nil, join = nil)
     nil
   end
@@ -20,8 +19,6 @@ class AddressesTestController < ActionController::Base
   def self.controller_path; "addresses"; end
 end
 
-AddressesTestController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class AddressesTest < Test::Unit::TestCase
   def setup
     @controller = AddressesTestController.new
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 14cf0a86a1..8f53ecd178 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -6,7 +6,6 @@ CACHE_DIR = 'test_cache'
 FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
 ActionController::Base.page_cache_directory = FILE_STORE_PATH
 ActionController::Base.cache_store = :file_store, FILE_STORE_PATH
-ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/' ]
 
 class PageCachingTestController < ActionController::Base
   caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? }
@@ -131,8 +130,7 @@ class PageCachingTest < Test::Unit::TestCase
   end
 
   def test_page_caching_conditional_options
-    @request.env['HTTP_ACCEPT'] = 'application/json'
-    get :ok
+    get :ok, :format=>'json'
     assert_page_not_cached :ok
   end
 
@@ -152,7 +150,7 @@ end
 
 
 class ActionCachingTestController < ActionController::Base
-  caches_action :index, :redirected, :forbidden, :if => Proc.new { |c| !c.request.format.json? }
+  caches_action :index, :redirected, :forbidden, :if => Proc.new { |c| !c.request.format.json? }, :expires_in => 1.hour
   caches_action :show, :cache_path => 'http://test.host/custom/show'
   caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
   caches_action :with_layout
@@ -188,6 +186,7 @@ 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
@@ -218,6 +217,7 @@ class ActionCachingMockController
     Object.new.instance_eval(<<-EVAL)
       def path; '#{@mock_path}' end
       def format; 'all' end
+      def cache_format; nil end
       self
     EVAL
   end
@@ -284,9 +284,19 @@ class ActionCacheTest < Test::Unit::TestCase
   end
 
   def test_action_cache_conditional_options
+    old_use_accept_header = ActionController::Base.use_accept_header
+    ActionController::Base.use_accept_header = true
     @request.env['HTTP_ACCEPT'] = 'application/json'
     get :index
     assert !fragment_exist?('hostname.com/action_caching_test')
+    ActionController::Base.use_accept_header = old_use_accept_header
+  end
+
+  def test_action_cache_with_store_options
+    MockTime.expects(:now).returns(12345).once
+    @controller.expects(:read_fragment).with('hostname.com/action_caching_test', :expires_in => 1.hour).once
+    @controller.expects(:write_fragment).with('hostname.com/action_caching_test', '12345.0', :expires_in => 1.hour).once
+    get :index
   end
 
   def test_action_cache_with_custom_cache_path
@@ -406,12 +416,6 @@ class ActionCacheTest < Test::Unit::TestCase
       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!
 
@@ -551,7 +555,7 @@ class FragmentCachingTest < Test::Unit::TestCase
     fragment_computed = false
 
     buffer = 'generated till now -> '
-    @controller.fragment_for(Proc.new { fragment_computed = true }, 'expensive') { buffer }
+    @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
 
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
@@ -562,50 +566,11 @@ class FragmentCachingTest < Test::Unit::TestCase
     fragment_computed = false
 
     buffer = 'generated till now -> '
-    @controller.fragment_for(Proc.new { fragment_computed = true }, 'expensive') { buffer}
+    @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
 
     assert !fragment_computed
     assert_equal 'generated till now -> fragment content', buffer
   end
-
-  def test_cache_erb_fragment
-    @store.write('views/expensive', 'fragment content')
-    @controller.response.template.output_buffer = 'generated till now -> '
-
-    assert_equal( 'generated till now -> fragment content',
-                  ActionView::TemplateHandlers::ERB.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
-  end
-
-  def test_cache_rxml_fragment
-    @store.write('views/expensive', 'fragment content')
-    xml = 'generated till now -> '
-    class << xml; def target!; to_s; end; end
-
-    assert_equal( 'generated till now -> fragment content',
-                  ActionView::TemplateHandlers::Builder.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
-  end
-
-  def test_cache_rjs_fragment
-    @store.write('views/expensive', 'fragment content')
-    page = 'generated till now -> '
-
-    assert_equal( 'generated till now -> fragment content',
-                  ActionView::TemplateHandlers::RJS.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
-  end
-
-  def test_cache_rjs_fragment_debug_mode_does_not_interfere
-    @store.write('views/expensive', 'fragment content')
-    page = 'generated till now -> '
-
-    begin
-      debug_mode, ActionView::Base.debug_rjs = ActionView::Base.debug_rjs, true
-      assert_equal( 'generated till now -> fragment content',
-                     ActionView::TemplateHandlers::RJS.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
-      assert ActionView::Base.debug_rjs
-    ensure
-      ActionView::Base.debug_rjs = debug_mode
-    end
-  end
 end
 
 
@@ -631,8 +596,6 @@ class FunctionalCachingController < ActionController::Base
   end
 end
 
-FunctionalCachingController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class FunctionalFragmentCachingTest < Test::Unit::TestCase
   def setup
     ActionController::Base.perform_caching = true
@@ -642,6 +605,7 @@ class FunctionalFragmentCachingTest < Test::Unit::TestCase
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
   end
+
   def test_fragment_caching
     get :fragment_cached
     assert_response :success
@@ -661,6 +625,14 @@ CACHED
     assert_match "Fragment caching in a partial", @store.read('views/test.host/functional_caching/html_fragment_cached_with_partial')
   end
 
+  def test_render_inline_before_fragment_caching
+    get :inline_fragment_cached
+    assert_response :success
+    assert_match /Some inline content/, @response.body
+    assert_match /Some cached content/, @response.body
+    assert_match "Some cached content", @store.read('views/test.host/functional_caching/inline_fragment_cached')
+  end
+
   def test_fragment_caching_in_rjs_partials
     xhr :get, :js_fragment_cached_with_partial
     assert_response :success
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index 2604844b84..5ded6a5d26 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -23,8 +23,6 @@ class CaptureController < ActionController::Base
   def rescue_action(e) raise end
 end
 
-CaptureController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class CaptureTest < Test::Unit::TestCase
   def setup
     @controller = CaptureController.new
diff --git a/actionpack/test/controller/cgi_test.rb b/actionpack/test/controller/cgi_test.rb
index 1b1ded4615..bf3b8b788e 100755
--- a/actionpack/test/controller/cgi_test.rb
+++ b/actionpack/test/controller/cgi_test.rb
@@ -3,18 +3,58 @@ require 'action_controller/cgi_process'
 
 class BaseCgiTest < Test::Unit::TestCase
   def setup
-    @request_hash = {"HTTP_MAX_FORWARDS"=>"10", "SERVER_NAME"=>"glu.ttono.us:8007", "FCGI_ROLE"=>"RESPONDER", "HTTP_X_FORWARDED_HOST"=>"glu.ttono.us", "HTTP_ACCEPT_ENCODING"=>"gzip, deflate", "HTTP_USER_AGENT"=>"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/312.5.1 (KHTML, like Gecko) Safari/312.3.1", "PATH_INFO"=>"", "HTTP_ACCEPT_LANGUAGE"=>"en", "HTTP_HOST"=>"glu.ttono.us:8007", "SERVER_PROTOCOL"=>"HTTP/1.1", "REDIRECT_URI"=>"/dispatch.fcgi", "SCRIPT_NAME"=>"/dispatch.fcgi", "SERVER_ADDR"=>"207.7.108.53", "REMOTE_ADDR"=>"207.7.108.53", "SERVER_SOFTWARE"=>"lighttpd/1.4.5", "HTTP_COOKIE"=>"_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes", "HTTP_X_FORWARDED_SERVER"=>"glu.ttono.us", "REQUEST_URI"=>"/admin", "DOCUMENT_ROOT"=>"/home/kevinc/sites/typo/public", "SERVER_PORT"=>"8007", "QUERY_STRING"=>"", "REMOTE_PORT"=>"63137", "GATEWAY_INTERFACE"=>"CGI/1.1", "HTTP_X_FORWARDED_FOR"=>"65.88.180.234", "HTTP_ACCEPT"=>"*/*", "SCRIPT_FILENAME"=>"/home/kevinc/sites/typo/public/dispatch.fcgi", "REDIRECT_STATUS"=>"200", "REQUEST_METHOD"=>"GET"}
+    @request_hash = {
+      "HTTP_MAX_FORWARDS" => "10",
+      "SERVER_NAME" => "glu.ttono.us:8007",
+      "FCGI_ROLE" => "RESPONDER",
+      "AUTH_TYPE" => "Basic",
+      "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
+      "HTTP_ACCEPT_CHARSET" => "UTF-8",
+      "HTTP_ACCEPT_ENCODING" => "gzip, deflate",
+      "HTTP_CACHE_CONTROL" => "no-cache, max-age=0",
+      "HTTP_PRAGMA" => "no-cache",
+      "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)",
+      "PATH_INFO" => "/homepage/",
+      "HTTP_ACCEPT_LANGUAGE" => "en",
+      "HTTP_NEGOTIATE" => "trans",
+      "HTTP_HOST" => "glu.ttono.us:8007",
+      "HTTP_REFERER" => "http://www.google.com/search?q=glu.ttono.us",
+      "HTTP_FROM" => "googlebot",
+      "SERVER_PROTOCOL" => "HTTP/1.1",
+      "REDIRECT_URI" => "/dispatch.fcgi",
+      "SCRIPT_NAME" => "/dispatch.fcgi",
+      "SERVER_ADDR" => "207.7.108.53",
+      "REMOTE_ADDR" => "207.7.108.53",
+      "REMOTE_HOST" => "google.com",
+      "REMOTE_IDENT" => "kevin",
+      "REMOTE_USER" => "kevin",
+      "SERVER_SOFTWARE" => "lighttpd/1.4.5",
+      "HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes",
+      "HTTP_X_FORWARDED_SERVER" => "glu.ttono.us",
+      "REQUEST_URI" => "/admin",
+      "DOCUMENT_ROOT" => "/home/kevinc/sites/typo/public",
+      "PATH_TRANSLATED" => "/home/kevinc/sites/typo/public/homepage/",
+      "SERVER_PORT" => "8007",
+      "QUERY_STRING" => "",
+      "REMOTE_PORT" => "63137",
+      "GATEWAY_INTERFACE" => "CGI/1.1",
+      "HTTP_X_FORWARDED_FOR" => "65.88.180.234",
+      "HTTP_ACCEPT" => "*/*",
+      "SCRIPT_FILENAME" => "/home/kevinc/sites/typo/public/dispatch.fcgi",
+      "REDIRECT_STATUS" => "200",
+      "REQUEST_METHOD" => "GET"
+    }
     # some Nokia phone browsers omit the space after the semicolon separator.
     # some developers have grown accustomed to using comma in cookie values.
     @alt_cookie_fmt_request_hash = {"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}
-    @fake_cgi = Struct.new(:env_table).new(@request_hash)
-    @request = ActionController::CgiRequest.new(@fake_cgi)
+    @cgi = CGI.new
+    @cgi.stubs(:env_table).returns(@request_hash)
+    @request = ActionController::CgiRequest.new(@cgi)
   end
 
   def default_test; end
 end
 
-
 class CgiRequestTest < BaseCgiTest
   def test_proxy_request
     assert_equal 'glu.ttono.us', @request.host_with_port
@@ -71,6 +111,37 @@ class CgiRequestTest < BaseCgiTest
     assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
   end
 
+  def test_cgi_environment_variables
+    assert_equal "Basic", @request.auth_type
+    assert_equal 0, @request.content_length
+    assert_equal nil, @request.content_type
+    assert_equal "CGI/1.1", @request.gateway_interface
+    assert_equal "*/*", @request.accept
+    assert_equal "UTF-8", @request.accept_charset
+    assert_equal "gzip, deflate", @request.accept_encoding
+    assert_equal "en", @request.accept_language
+    assert_equal "no-cache, max-age=0", @request.cache_control
+    assert_equal "googlebot", @request.from
+    assert_equal "glu.ttono.us", @request.host
+    assert_equal "trans", @request.negotiate
+    assert_equal "no-cache", @request.pragma
+    assert_equal "http://www.google.com/search?q=glu.ttono.us", @request.referer
+    assert_equal "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)", @request.user_agent
+    assert_equal "/homepage/", @request.path_info
+    assert_equal "/home/kevinc/sites/typo/public/homepage/", @request.path_translated
+    assert_equal "", @request.query_string
+    assert_equal "207.7.108.53", @request.remote_addr
+    assert_equal "google.com", @request.remote_host
+    assert_equal "kevin", @request.remote_ident
+    assert_equal "kevin", @request.remote_user
+    assert_equal :get, @request.request_method
+    assert_equal "/dispatch.fcgi", @request.script_name
+    assert_equal "glu.ttono.us:8007", @request.server_name
+    assert_equal 8007, @request.server_port
+    assert_equal "HTTP/1.1", @request.server_protocol
+    assert_equal "lighttpd", @request.server_software
+  end
+
   def test_cookie_syntax_resilience
     cookies = CGI::Cookie::parse(@request_hash["HTTP_COOKIE"]);
     assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect
@@ -82,7 +153,6 @@ class CgiRequestTest < BaseCgiTest
   end
 end
 
-
 class CgiRequestParamsParsingTest < BaseCgiTest
   def test_doesnt_break_when_content_type_has_charset
     data = 'flamenco=love'
@@ -98,7 +168,6 @@ class CgiRequestParamsParsingTest < BaseCgiTest
   end
 end
 
-
 class CgiRequestNeedsRewoundTest < BaseCgiTest
   def test_body_should_be_rewound
     data = 'foo'
@@ -119,8 +188,8 @@ uses_mocha 'CGI Response' do
   class CgiResponseTest < BaseCgiTest
     def setup
       super
-      @fake_cgi.expects(:header).returns("HTTP/1.0 200 OK\nContent-Type: text/html\n")
-      @response = ActionController::CgiResponse.new(@fake_cgi)
+      @cgi.expects(:header).returns("HTTP/1.0 200 OK\nContent-Type: text/html\n")
+      @response = ActionController::CgiResponse.new(@cgi)
       @output = StringIO.new('')
     end
 
@@ -132,7 +201,7 @@ uses_mocha 'CGI Response' do
     end
 
     def test_head_request
-      @fake_cgi.env_table['REQUEST_METHOD'] = 'HEAD'
+      @cgi.env_table['REQUEST_METHOD'] = 'HEAD'
       @response.body = "Hello, World!"
 
       @response.out(@output)
diff --git a/actionpack/test/controller/components_test.rb b/actionpack/test/controller/components_test.rb
index 82c55483dd..71e8a18071 100644
--- a/actionpack/test/controller/components_test.rb
+++ b/actionpack/test/controller/components_test.rb
@@ -119,7 +119,7 @@ class ComponentsTest < Test::Unit::TestCase
   def test_component_redirect_redirects
     get :calling_redirected
 
-    assert_redirected_to :action => "being_called"
+    assert_redirected_to :controller=>"callee", :action => "being_called"
   end
 
   def test_component_multiple_redirect_redirects
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index d262ce8103..d457d13aef 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -13,12 +13,12 @@ class ContentTypeController < ActionController::Base
   def render_content_type_from_render
     render :text => "hello world!", :content_type => Mime::RSS
   end
-  
+
   def render_charset_from_body
     response.charset = "utf-16"
     render :text => "hello world!"
   end
-  
+
   def render_default_for_rhtml
   end
 
@@ -45,8 +45,6 @@ class ContentTypeController < ActionController::Base
   def rescue_action(e) raise end
 end
 
-ContentTypeController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class ContentTypeTest < Test::Unit::TestCase
   def setup
     @controller = ContentTypeController.new
@@ -68,7 +66,7 @@ class ContentTypeTest < Test::Unit::TestCase
   def test_render_changed_charset_default
     ContentTypeController.default_charset = "utf-16"
     get :render_defaults
-    assert_equal "utf-16", @response.charset    
+    assert_equal "utf-16", @response.charset
     assert_equal Mime::HTML, @response.content_type
     ContentTypeController.default_charset = "utf-8"
   end
@@ -76,13 +74,13 @@ class ContentTypeTest < Test::Unit::TestCase
   def test_content_type_from_body
     get :render_content_type_from_body
     assert_equal "application/rss+xml", @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_content_type_from_render
     get :render_content_type_from_render
     assert_equal "application/rss+xml", @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_charset_from_body
@@ -94,27 +92,41 @@ class ContentTypeTest < Test::Unit::TestCase
   def test_default_for_rhtml
     get :render_default_for_rhtml
     assert_equal Mime::HTML, @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_default_for_rxml
     get :render_default_for_rxml
     assert_equal Mime::XML, @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_default_for_rjs
     xhr :post, :render_default_for_rjs
     assert_equal Mime::JS, @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_change_for_rxml
     get :render_change_for_rxml
     assert_equal Mime::HTML, @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
-  
+end
+
+class AcceptBasedContentTypeTest < ActionController::TestCase
+
+  tests ContentTypeController
+
+  def setup
+    ActionController::Base.use_accept_header = true
+  end
+
+  def teardown
+    ActionController::Base.use_accept_header = false
+  end
+
+
   def test_render_default_content_types_for_respond_to
     @request.env["HTTP_ACCEPT"] = Mime::HTML.to_s
     get :render_default_content_types_for_respond_to
@@ -130,7 +142,7 @@ class ContentTypeTest < Test::Unit::TestCase
     get :render_default_content_types_for_respond_to
     assert_equal Mime::XML, @response.content_type
   end
-  
+
   def test_render_default_content_types_for_respond_to_with_overwrite
     @request.env["HTTP_ACCEPT"] = Mime::RSS.to_s
     get :render_default_content_types_for_respond_to
diff --git a/actionpack/test/controller/custom_handler_test.rb b/actionpack/test/controller/custom_handler_test.rb
deleted file mode 100644
index ac484ae17e..0000000000
--- a/actionpack/test/controller/custom_handler_test.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'abstract_unit'
-
-class CustomHandler < ActionView::TemplateHandler
-  def initialize( view )
-    @view = view
-  end
-
-  def render( template )
-    [ template.source,
-      template.locals,
-      @view ]
-  end
-end
-
-class CustomHandlerTest < Test::Unit::TestCase
-  def setup
-    ActionView::Template.register_template_handler "foo", CustomHandler
-    ActionView::Template.register_template_handler :foo2, CustomHandler
-    @view = ActionView::Base.new
-  end
-
-  def test_custom_render
-    template = ActionView::InlineTemplate.new(@view, "hello <%= one %>", { :one => "two" }, "foo")
-
-    result = @view.render_template(template)
-    assert_equal(
-      [ "hello <%= one %>", { :one => "two" }, @view ],
-      result )
-  end
-
-  def test_custom_render2
-    template = ActionView::InlineTemplate.new(@view, "hello <%= one %>", { :one => "two" }, "foo2")
-    result = @view.render_template(template)
-    assert_equal(
-      [ "hello <%= one %>", { :one => "two" }, @view ],
-      result )
-  end
-
-  def test_unhandled_extension
-    # uses the ERb handler by default if the extension isn't recognized
-    template = ActionView::InlineTemplate.new(@view, "hello <%= one %>", { :one => "two" }, "bar")
-    result = @view.render_template(template)
-    assert_equal "hello two", result
-  end
-end
diff --git a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb b/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
index 8c1a8954a5..86555a77df 100644
--- a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
+++ b/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
@@ -2,7 +2,6 @@ require 'abstract_unit'
 
 class DeprecatedBaseMethodsTest < Test::Unit::TestCase
   class Target < ActionController::Base
-    
     def home_url(greeting)
       "http://example.com/#{greeting}"
     end
@@ -14,8 +13,6 @@ class DeprecatedBaseMethodsTest < Test::Unit::TestCase
     def rescue_action(e) raise e end
   end
 
-  Target.view_paths = [ File.dirname(__FILE__) + "/../../fixtures" ]
-
   def setup
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
diff --git a/actionpack/test/controller/html-scanner/document_test.rb b/actionpack/test/controller/html-scanner/document_test.rb
index 0519533dbd..1c3facb9e3 100644
--- a/actionpack/test/controller/html-scanner/document_test.rb
+++ b/actionpack/test/controller/html-scanner/document_test.rb
@@ -120,4 +120,29 @@ HTML
     assert doc.find(:tag => "div", :attributes => { :id => "map" }, :content => "")
     assert doc.find(:tag => "div", :attributes => { :id => "map" }, :content => nil)
   end
+
+  def test_parse_invalid_document
+    assert_nothing_raised do
+      doc = HTML::Document.new("<html>
+        <table>
+          <tr>
+            <td style=\"color: #FFFFFF; height: 17px; onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" style=\"cursor:pointer; height: 17px;\"; nowrap onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" onmouseout=\"this.bgColor='#0066cc'; this.style.color='#FFFFFF'\" onmouseover=\"this.bgColor='#ffffff'; this.style.color='#0033cc'\">About Us</td>
+          </tr>
+        </table>
+      </html>")
+    end
+  end
+
+  def test_invalid_document_raises_exception_when_strict
+    assert_raises RuntimeError do
+      doc = HTML::Document.new("<html>
+        <table>
+          <tr>
+            <td style=\"color: #FFFFFF; height: 17px; onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" style=\"cursor:pointer; height: 17px;\"; nowrap onclick=\"window.location.href='http://www.rmeinc.com/about_rme.aspx'\" onmouseout=\"this.bgColor='#0066cc'; this.style.color='#FFFFFF'\" onmouseover=\"this.bgColor='#ffffff'; this.style.color='#0033cc'\">About Us</td>
+          </tr>
+        </table>
+      </html>", true)
+    end
+  end
+
 end
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 3dc311b78a..92b6aa4f2f 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -34,8 +34,8 @@ end
 class MabView < ActionView::TemplateHandler
   def initialize(view)
   end
-  
-  def render(template)
+
+  def render(template, local_assigns)
     template.source
   end
 end
@@ -63,6 +63,7 @@ class LayoutAutoDiscoveryTest < Test::Unit::TestCase
   end
   
   def test_third_party_template_library_auto_discovers_layout
+    ThirdPartyTemplateLibraryController.view_paths.reload!
     @controller = ThirdPartyTemplateLibraryController.new
     get :hello
     assert_equal 'layouts/third_party_template_library', @controller.active_layout
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index c617cb2e84..1701431858 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -107,7 +107,7 @@ class RespondToController < ActionController::Base
       type.any(:js, :xml) { render :text => "Either JS or XML" }
     end
   end
-  
+
   def handle_any_any
     respond_to do |type|
       type.html { render :text => 'HTML' }
@@ -120,12 +120,12 @@ class RespondToController < ActionController::Base
       type.html
       type.js
     end
-  end 
-  
-  def iphone_with_html_response_type 
+  end
+
+  def iphone_with_html_response_type
     Mime::Type.register_alias("text/html", :iphone)
     request.format = :iphone if request.env["HTTP_ACCEPT"] == "text/iphone"
-    
+
     respond_to do |type|
       type.html   { @type = "Firefox" }
       type.iphone { @type = "iPhone"  }
@@ -138,7 +138,7 @@ class RespondToController < ActionController::Base
   def iphone_with_html_response_type_without_layout
     Mime::Type.register_alias("text/html", :iphone)
     request.format = "iphone" if request.env["HTTP_ACCEPT"] == "text/iphone"
-    
+
     respond_to do |type|
       type.html   { @type = "Firefox"; render :action => "iphone_with_html_response_type" }
       type.iphone { @type = "iPhone" ; render :action => "iphone_with_html_response_type" }
@@ -162,10 +162,9 @@ class RespondToController < ActionController::Base
     end
 end
 
-RespondToController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class MimeControllerTest < Test::Unit::TestCase
   def setup
+    ActionController::Base.use_accept_header = true
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
 
@@ -173,6 +172,10 @@ class MimeControllerTest < Test::Unit::TestCase
     @request.host = "www.example.com"
   end
 
+  def teardown
+    ActionController::Base.use_accept_header = false
+  end
+
   def test_html
     @request.env["HTTP_ACCEPT"] = "text/html"
     get :js_or_html
@@ -247,7 +250,7 @@ class MimeControllerTest < Test::Unit::TestCase
     get :just_xml
     assert_equal 'XML', @response.body
   end
-  
+
   def test_using_defaults
     @request.env["HTTP_ACCEPT"] = "*/*"
     get :using_defaults
@@ -347,12 +350,12 @@ class MimeControllerTest < Test::Unit::TestCase
     get :handle_any_any
     assert_equal 'HTML', @response.body
   end
-  
+
   def test_handle_any_any_parameter_format
     get :handle_any_any, {:format=>'html'}
     assert_equal 'HTML', @response.body
   end
-  
+
   def test_handle_any_any_explicit_html
     @request.env["HTTP_ACCEPT"] = "text/html"
     get :handle_any_any
@@ -364,7 +367,7 @@ class MimeControllerTest < Test::Unit::TestCase
     get :handle_any_any
     assert_equal 'Whatever you ask for, I got it', @response.body
   end
-  
+
   def test_handle_any_any_xml
     @request.env["HTTP_ACCEPT"] = "text/xml"
     get :handle_any_any
@@ -445,31 +448,31 @@ class MimeControllerTest < Test::Unit::TestCase
 
     get :using_defaults, :format => "xml"
     assert_equal "using_defaults - xml", @response.body
-  end 
-  
+  end
+
   def test_format_with_custom_response_type
     get :iphone_with_html_response_type
-    assert_equal '<html><div id="html">Hello future from Firefox!</div></html>', @response.body 
-    
+    assert_equal '<html><div id="html">Hello future from Firefox!</div></html>', @response.body
+
     get :iphone_with_html_response_type, :format => "iphone"
     assert_equal "text/html", @response.content_type
     assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
-  end 
-  
+  end
+
   def test_format_with_custom_response_type_and_request_headers
     @request.env["HTTP_ACCEPT"] = "text/iphone"
     get :iphone_with_html_response_type
     assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
     assert_equal "text/html", @response.content_type
-  end 
+  end
 
   def test_format_with_custom_response_type_and_request_headers_with_only_one_layout_present
     get :iphone_with_html_response_type_without_layout
-    assert_equal '<html><div id="html_missing">Hello future from Firefox!</div></html>', @response.body 
+    assert_equal '<html><div id="html_missing">Hello future from Firefox!</div></html>', @response.body
 
     @request.env["HTTP_ACCEPT"] = "text/iphone"
     assert_raises(ActionView::MissingTemplate) { get :iphone_with_html_response_type_without_layout }
-  end 
+  end
 end
 
 class AbstractPostController < ActionController::Base
@@ -497,7 +500,7 @@ class PostController < AbstractPostController
     end
 end
 
-class SuperPostController < PostController  
+class SuperPostController < PostController
   def index
     respond_to do |type|
       type.html
@@ -514,25 +517,24 @@ class MimeControllerLayoutsTest < Test::Unit::TestCase
     @controller   = PostController.new
     @request.host = "www.example.com"
   end
-  
+
   def test_missing_layout_renders_properly
     get :index
-    assert_equal '<html><div id="html">Hello Firefox</div></html>', @response.body 
+    assert_equal '<html><div id="html">Hello Firefox</div></html>', @response.body
 
     @request.env["HTTP_ACCEPT"] = "text/iphone"
     get :index
     assert_equal 'Hello iPhone', @response.body
   end
-  
+
   def test_format_with_inherited_layouts
     @controller = SuperPostController.new
-    
+
     get :index
     assert_equal 'Super Firefox', @response.body
-    
+
     @request.env["HTTP_ACCEPT"] = "text/iphone"
     get :index
     assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body
   end
 end
-  
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index b77b3ceffa..d2a3a2b0b0 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -45,11 +45,11 @@ class NewRenderTestController < ActionController::Base
   def render_action_hello_world_as_symbol
     render :action => :hello_world
   end
-  
+
   def render_text_hello_world
     render :text => "hello world"
   end
- 
+
   def render_text_hello_world_with_layout
     @variable_for_layout = ", I'm here!"
     render :text => "hello world", :layout => true
@@ -68,7 +68,7 @@ class NewRenderTestController < ActionController::Base
     path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb')
     render :file => path
   end
-  
+
   def render_file_from_template
     @secret = 'in the sauce'
     @path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_ivar.erb'))
@@ -76,17 +76,17 @@ class NewRenderTestController < ActionController::Base
 
   def render_file_with_locals
     path = File.join(File.dirname(__FILE__), '../fixtures/test/render_file_with_locals.erb')
-    render :file => path, :locals => {:secret => 'in the sauce'} 
+    render :file => path, :locals => {:secret => 'in the sauce'}
   end
 
   def render_file_not_using_full_path
     @secret = 'in the sauce'
-    render :file => 'test/render_file_with_ivar', :use_full_path => true
+    render :file => 'test/render_file_with_ivar'
   end
-  
+
   def render_file_not_using_full_path_with_dot_in_path
     @secret = 'in the sauce'
-    render :file => 'test/dot.directory/render_file_with_ivar', :use_full_path => true
+    render :file => 'test/dot.directory/render_file_with_ivar'
   end
 
   def render_xml_hello
@@ -105,7 +105,7 @@ class NewRenderTestController < ActionController::Base
   def layout_test_with_different_layout
     render :action => "hello_world", :layout => "standard"
   end
-  
+
   def rendering_without_layout
     render :action => "hello_world", :layout => false
   end
@@ -113,11 +113,11 @@ class NewRenderTestController < ActionController::Base
   def layout_overriding_layout
     render :action => "hello_world", :layout => "standard"
   end
-  
+
   def rendering_nothing_on_layout
     render :nothing => true
   end
-  
+
   def builder_layout_test
     render :action => "hello"
   end
@@ -135,9 +135,9 @@ class NewRenderTestController < ActionController::Base
   def partial_only_with_layout
     render :partial => "partial_only", :layout => true
   end
-  
+
   def partial_with_locals
-    render :partial => "customer", :locals => { :customer => Customer.new("david") } 
+    render :partial => "customer", :locals => { :customer => Customer.new("david") }
   end
 
   def partial_with_form_builder
@@ -151,11 +151,15 @@ class NewRenderTestController < ActionController::Base
   def partial_collection
     render :partial => "customer", :collection => [ Customer.new("david"), Customer.new("mary") ]
   end
-  
+
+  def partial_collection_with_as
+    render :partial => "customer_with_var", :collection => [ Customer.new("david"), Customer.new("mary") ], :as => :customer
+  end
+
   def partial_collection_with_spacer
     render :partial => "customer", :spacer_template => "partial_only", :collection => [ Customer.new("david"), Customer.new("mary") ]
   end
-  
+
   def partial_collection_with_counter
     render :partial => "customer_counter", :collection => [ Customer.new("david"), Customer.new("mary") ]
   end
@@ -186,33 +190,33 @@ class NewRenderTestController < ActionController::Base
   def empty_partial_collection
     render :partial => "customer", :collection => []
   end
-  
+
   def partial_with_hash_object
     render :partial => "hash_object", :object => {:first_name => "Sam"}
   end
-  
+
   def partial_hash_collection
     render :partial => "hash_object", :collection => [ {:first_name => "Pratik"}, {:first_name => "Amy"} ]
   end
-  
+
   def partial_hash_collection_with_locals
     render :partial => "hash_greeting", :collection => [ {:first_name => "Pratik"}, {:first_name => "Amy"} ], :locals => { :greeting => "Hola" }
   end
-  
+
   def partial_with_implicit_local_assignment
     @customer = Customer.new("Marcel")
     render :partial => "customer"
   end
-  
+
   def missing_partial
     render :partial => 'thisFileIsntHere'
   end
-  
+
   def hello_in_a_string
     @customers = [ Customer.new("david"), Customer.new("mary") ]
     render :text =>  "How's there? " << render_to_string(:template => "test/list")
   end
-  
+
   def render_to_string_with_assigns
     @before = "i'm before the render"
     render_to_string :text => "foo"
@@ -222,18 +226,18 @@ class NewRenderTestController < ActionController::Base
 
   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"  
-  end  
-  
+    @partial_with_locals = render_to_string :partial => "customer", :locals => { :customer => Customer.new("david") }
+    render :action => "test/hello_world"
+  end
+
   def render_to_string_with_exception
-    render_to_string :file => "exception that will not be caught - this will certainly not work", :use_full_path => true
+    render_to_string :file => "exception that will not be caught - this will certainly not work"
   end
-  
+
   def render_to_string_with_caught_exception
     @before = "i'm before the render"
     begin
-      render_to_string :file => "exception that will be caught- hope my future instance vars still work!", :use_full_path => true
+      render_to_string :file => "exception that will be caught- hope my future instance vars still work!"
     rescue
     end
     @after = "i'm after the render"
@@ -268,6 +272,10 @@ class NewRenderTestController < ActionController::Base
     render :template => "test/hello_world"
   end
 
+  def render_with_explicit_template_with_locals
+    render :template => "test/render_file_with_locals", :locals => { :secret => 'area51' }
+  end
+
   def double_render
     render :text => "hello"
     render :text => "world"
@@ -282,7 +290,7 @@ class NewRenderTestController < ActionController::Base
     render :text => "hello"
     redirect_to :action => "double_render"
   end
-  
+
   def render_to_string_and_render
     @stuff = render_to_string :text => "here is some cached stuff"
     render :text => "Hi web users! #{@stuff}"
@@ -329,7 +337,7 @@ class NewRenderTestController < ActionController::Base
   def render_with_location
     render :xml => "<hello/>", :location => "http://example.com", :status => 201
   end
-  
+
   def render_with_object_location
     customer = Customer.new("Some guy", 1)
     render :xml => "<customer/>", :location => customer_url(customer), :status => :created
@@ -341,12 +349,12 @@ class NewRenderTestController < ActionController::Base
         "<i-am-xml/>"
       end
     end.new
-    
+
     render :xml => to_xmlable
   end
 
   helper NewRenderTestHelper
-  helper do 
+  helper do
     def rjs_helper_method(value)
       page.visual_effect :highlight, value
     end
@@ -383,7 +391,7 @@ class NewRenderTestController < ActionController::Base
       page.visual_effect :highlight, 'balance'
     end
   end
-  
+
   def update_page_with_instance_variables
     @money = '$37,000,000.00'
     @div_id = 'balance'
@@ -426,12 +434,12 @@ class NewRenderTestController < ActionController::Base
   def render_using_layout_around_block_in_main_layout_and_within_content_for_layout
     render :action => "using_layout_around_block"
   end
-  
+
   def rescue_action(e) raise end
-    
+
   private
     def determine_layout
-      case action_name 
+      case action_name
         when "hello_world", "layout_test", "rendering_without_layout",
              "rendering_nothing_on_layout", "render_text_hello_world",
              "render_text_hello_world_with_layout",
@@ -443,7 +451,7 @@ class NewRenderTestController < ActionController::Base
              "render_js_with_explicit_template",
              "render_js_with_explicit_action_template",
              "delete_with_js", "update_page", "update_page_with_instance_variables"
-    
+
           "layouts/standard"
         when "builder_layout_test"
           "layouts/builder"
@@ -457,9 +465,6 @@ class NewRenderTestController < ActionController::Base
     end
 end
 
-NewRenderTestController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-Fun::GamesController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class NewRenderTest < Test::Unit::TestCase
   def setup
     @controller = NewRenderTestController.new
@@ -481,6 +486,11 @@ class NewRenderTest < Test::Unit::TestCase
     assert_equal "<html>Hello world!</html>", @response.body
   end
 
+  def test_renders_default_template_for_missing_action
+    get :'hyphen-ated'
+    assert_template 'test/hyphen-ated'
+  end
+
   def test_do_with_render
     get :render_hello_world
     assert_template "test/hello_world"
@@ -527,7 +537,7 @@ class NewRenderTest < Test::Unit::TestCase
   end
 
   def test_render_file_not_using_full_path
-    get :render_file_not_using_full_path 
+    get :render_file_not_using_full_path
     assert_equal "The secret is in the sauce\n", @response.body
   end
 
@@ -540,7 +550,7 @@ class NewRenderTest < Test::Unit::TestCase
     get :render_file_with_locals
     assert_equal "The secret is in the sauce\n", @response.body
   end
-  
+
   def test_render_file_from_template
     get :render_file_from_template
     assert_equal "The secret is in the sauce\n", @response.body
@@ -597,8 +607,7 @@ EOS
   end
 
   def test_render_with_default_from_accept_header
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
-    get :greeting
+    xhr :get, :greeting
     assert_equal "$(\"body\").visualEffect(\"highlight\");", @response.body
   end
 
@@ -661,7 +670,7 @@ EOS
     assert_not_deprecated { get :hello_in_a_string }
     assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", @response.body
   end
-  
+
   def test_render_to_string_doesnt_break_assigns
     get :render_to_string_with_assigns
     assert_equal "i'm before the render", assigns(:before)
@@ -672,12 +681,12 @@ EOS
     get :render_to_string_with_partial
     assert_equal "only partial", assigns(:partial_only)
     assert_equal "Hello: david", assigns(:partial_with_locals)
-  end  
+  end
 
   def test_bad_render_to_string_still_throws_exception
     assert_raises(ActionView::MissingTemplate) { get :render_to_string_with_exception }
   end
-  
+
   def test_render_to_string_that_throws_caught_exception_doesnt_break_assigns
     assert_nothing_raised { get :render_to_string_with_caught_exception }
     assert_equal "i'm before the render", assigns(:before)
@@ -715,7 +724,7 @@ EOS
   def test_render_and_redirect
     assert_raises(ActionController::DoubleRenderError) { get :render_and_redirect }
   end
-  
+
   # specify the one exception to double render rule - render_to_string followed by render
   def test_render_to_string_and_render
     get :render_to_string_and_render
@@ -736,7 +745,7 @@ EOS
     get :partials_list
     assert_equal "goodbyeHello: davidHello: marygoodbye\n", @response.body
   end
-  
+
   def test_partial_with_locals
     get :partial_with_locals
     assert_equal "Hello: david", @response.body
@@ -758,17 +767,22 @@ EOS
     get :partial_collection
     assert_equal "Hello: davidHello: mary", @response.body
   end
-  
+
+  def test_partial_collection_with_as
+    get :partial_collection_with_as
+    assert_equal "david david davidmary mary mary", @response.body
+  end
+
   def test_partial_collection_with_counter
     get :partial_collection_with_counter
     assert_equal "david0mary1", @response.body
   end
-  
+
   def test_partial_collection_with_locals
     get :partial_collection_with_locals
     assert_equal "Bonjour: davidBonjour: mary", @response.body
   end
-  
+
   def test_partial_collection_with_spacer
     get :partial_collection_with_spacer
     assert_equal "Hello: davidonly partialHello: mary", @response.body
@@ -793,12 +807,12 @@ EOS
     get :partial_with_hash_object
     assert_equal "Sam\nmaS\n", @response.body
   end
-  
+
   def test_hash_partial_collection
     get :partial_hash_collection
     assert_equal "Pratik\nkitarP\nAmy\nymA\n", @response.body
   end
-  
+
   def test_partial_hash_collection_with_locals
     get :partial_hash_collection_with_locals
     assert_equal "Hola: PratikHola: Amy", @response.body
@@ -808,25 +822,30 @@ EOS
     get :partial_with_implicit_local_assignment
     assert_equal "Hello: Marcel", @response.body
   end
-  
+
   def test_render_missing_partial_template
     assert_raises(ActionView::MissingTemplate) do
       get :missing_partial
     end
   end
-  
+
   def test_render_text_with_assigns
     get :render_text_with_assigns
     assert_equal "world", assigns["hello"]
   end
-  
+
+  def test_template_with_locals
+    get :render_with_explicit_template_with_locals
+    assert_equal "The secret is area51\n", @response.body
+  end
+
   def test_update_page
     get :update_page
     assert_template nil
     assert_equal 'text/javascript; charset=utf-8', @response.headers['type']
     assert_equal 2, @response.body.split($/).length
   end
-  
+
   def test_update_page_with_instance_variables
     get :update_page_with_instance_variables
     assert_template nil
@@ -834,7 +853,7 @@ EOS
     assert_match /balance/, @response.body
     assert_match /\$37/, @response.body
   end
-  
+
   def test_yield_content_for
     assert_not_deprecated { get :yield_content_for }
     assert_equal "<title>Putting stuff in the title!</title>\n\nGreat stuff!\n", @response.body
@@ -906,12 +925,12 @@ EOS
     get :render_with_location
     assert_equal "http://example.com", @response.headers["Location"]
   end
-  
+
   def test_rendering_xml_should_call_to_xml_if_possible
     get :render_with_to_xml
     assert_equal "<i-am-xml/>", @response.body
   end
-  
+
   def test_rendering_with_object_location_should_set_header_with_url_for
     ActionController::Routing::Routes.draw do |map|
       map.resources :customers
@@ -941,5 +960,4 @@ EOS
     get :render_using_layout_around_block_in_main_layout_and_within_content_for_layout
     assert_equal "Before (Anthony)\nInside from first block in layout\nAfter\nBefore (David)\nInside from block\nAfter\nBefore (Ramm)\nInside from second block in layout\nAfter\n", @response.body
   end
-
 end
diff --git a/actionpack/test/controller/polymorphic_routes_test.rb b/actionpack/test/controller/polymorphic_routes_test.rb
index 4ec0d3cd4e..3f52526f08 100644
--- a/actionpack/test/controller/polymorphic_routes_test.rb
+++ b/actionpack/test/controller/polymorphic_routes_test.rb
@@ -118,6 +118,39 @@ uses_mocha 'polymorphic URL helpers' do
       polymorphic_url([:site, :admin, @article, @response, @tag])
     end
 
+    def test_nesting_with_array_ending_in_singleton_resource
+      expects(:article_response_url).with(@article)
+      polymorphic_url([@article, :response])
+    end
+
+    def test_nesting_with_array_containing_singleton_resource
+      @tag = Tag.new
+      @tag.save
+      expects(:article_response_tag_url).with(@article, @tag)
+      polymorphic_url([@article, :response, @tag])
+    end
+
+    def test_nesting_with_array_containing_namespace_and_singleton_resource
+      @tag = Tag.new
+      @tag.save
+      expects(:admin_article_response_tag_url).with(@article, @tag)
+      polymorphic_url([:admin, @article, :response, @tag])
+    end
+
+    def test_nesting_with_array_containing_singleton_resource_and_format
+      @tag = Tag.new
+      @tag.save
+      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
+      formatted_polymorphic_url([@article, :response, @tag, :pdf])
+    end
+
+    def test_nesting_with_array_containing_singleton_resource_and_format_option
+      @tag = Tag.new
+      @tag.save
+      expects(:article_response_tag_url).with(@article, @tag, :pdf)
+      polymorphic_url([@article, :response, @tag], :format => :pdf)
+    end
+
     # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
     def xtest_with_hash
       expects(:article_url).with(@article)
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index 856f24bbdb..486fe49737 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -7,22 +7,33 @@ class BaseRackTest < Test::Unit::TestCase
       "HTTP_MAX_FORWARDS" => "10",
       "SERVER_NAME" => "glu.ttono.us:8007",
       "FCGI_ROLE" => "RESPONDER",
+      "AUTH_TYPE" => "Basic",
       "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
+      "HTTP_ACCEPT_CHARSET" => "UTF-8",
       "HTTP_ACCEPT_ENCODING" => "gzip, deflate",
+      "HTTP_CACHE_CONTROL" => "no-cache, max-age=0",
+      "HTTP_PRAGMA" => "no-cache",
       "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)",
-      "PATH_INFO" => "",
+      "PATH_INFO" => "/homepage/",
       "HTTP_ACCEPT_LANGUAGE" => "en",
+      "HTTP_NEGOTIATE" => "trans",
       "HTTP_HOST" => "glu.ttono.us:8007",
+      "HTTP_REFERER" => "http://www.google.com/search?q=glu.ttono.us",
+      "HTTP_FROM" => "googlebot",
       "SERVER_PROTOCOL" => "HTTP/1.1",
       "REDIRECT_URI" => "/dispatch.fcgi",
       "SCRIPT_NAME" => "/dispatch.fcgi",
       "SERVER_ADDR" => "207.7.108.53",
       "REMOTE_ADDR" => "207.7.108.53",
+      "REMOTE_HOST" => "google.com",
+      "REMOTE_IDENT" => "kevin",
+      "REMOTE_USER" => "kevin",
       "SERVER_SOFTWARE" => "lighttpd/1.4.5",
       "HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes",
       "HTTP_X_FORWARDED_SERVER" => "glu.ttono.us",
       "REQUEST_URI" => "/admin",
       "DOCUMENT_ROOT" => "/home/kevinc/sites/typo/public",
+      "PATH_TRANSLATED" => "/home/kevinc/sites/typo/public/homepage/",
       "SERVER_PORT" => "8007",
       "QUERY_STRING" => "",
       "REMOTE_PORT" => "63137",
@@ -42,7 +53,6 @@ class BaseRackTest < Test::Unit::TestCase
   def default_test; end
 end
 
-
 class RackRequestTest < BaseRackTest
   def test_proxy_request
     assert_equal 'glu.ttono.us', @request.host_with_port
@@ -99,6 +109,37 @@ class RackRequestTest < BaseRackTest
     assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
   end
 
+  def test_cgi_environment_variables
+    assert_equal "Basic", @request.auth_type
+    assert_equal 0, @request.content_length
+    assert_equal nil, @request.content_type
+    assert_equal "CGI/1.1", @request.gateway_interface
+    assert_equal "*/*", @request.accept
+    assert_equal "UTF-8", @request.accept_charset
+    assert_equal "gzip, deflate", @request.accept_encoding
+    assert_equal "en", @request.accept_language
+    assert_equal "no-cache, max-age=0", @request.cache_control
+    assert_equal "googlebot", @request.from
+    assert_equal "glu.ttono.us", @request.host
+    assert_equal "trans", @request.negotiate
+    assert_equal "no-cache", @request.pragma
+    assert_equal "http://www.google.com/search?q=glu.ttono.us", @request.referer
+    assert_equal "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)", @request.user_agent
+    assert_equal "/homepage/", @request.path_info
+    assert_equal "/home/kevinc/sites/typo/public/homepage/", @request.path_translated
+    assert_equal "", @request.query_string
+    assert_equal "207.7.108.53", @request.remote_addr
+    assert_equal "google.com", @request.remote_host
+    assert_equal "kevin", @request.remote_ident
+    assert_equal "kevin", @request.remote_user
+    assert_equal :get, @request.request_method
+    assert_equal "/dispatch.fcgi", @request.script_name
+    assert_equal "glu.ttono.us:8007", @request.server_name
+    assert_equal 8007, @request.server_port
+    assert_equal "HTTP/1.1", @request.server_protocol
+    assert_equal "lighttpd", @request.server_software
+  end
+
   def test_cookie_syntax_resilience
     cookies = @request.cookies
     assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect
@@ -110,7 +151,6 @@ class RackRequestTest < BaseRackTest
   end
 end
 
-
 class RackRequestParamsParsingTest < BaseRackTest
   def test_doesnt_break_when_content_type_has_charset
     data = 'flamenco=love'
@@ -126,7 +166,6 @@ class RackRequestParamsParsingTest < BaseRackTest
   end
 end
 
-
 class RackRequestNeedsRewoundTest < BaseRackTest
   def test_body_should_be_rewound
     data = 'foo'
@@ -143,7 +182,6 @@ class RackRequestNeedsRewoundTest < BaseRackTest
   end
 end
 
-
 class RackResponseTest < BaseRackTest
   def setup
     super
@@ -155,7 +193,7 @@ class RackResponseTest < BaseRackTest
     @response.body = "Hello, World!"
 
     status, headers, body = @response.out(@output)
-    assert_equal 200, status
+    assert_equal "200 OK", status
     assert_equal({"Content-Type" => "text/html", "Cache-Control" => "no-cache", "Set-Cookie" => []}, headers)
 
     parts = []
@@ -169,7 +207,7 @@ class RackResponseTest < BaseRackTest
     end
 
     status, headers, body = @response.out(@output)
-    assert_equal 200, status
+    assert_equal "200 OK", status
     assert_equal({"Content-Type" => "text/html", "Cache-Control" => "no-cache", "Set-Cookie" => []}, headers)
 
     parts = []
@@ -184,7 +222,7 @@ class RackResponseTest < BaseRackTest
     @response.body = "Hello, World!"
 
     status, headers, body = @response.out(@output)
-    assert_equal 200, status
+    assert_equal "200 OK", status
     assert_equal({
       "Content-Type" => "text/html",
       "Cache-Control" => "no-cache",
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 0e85347bad..28da5c6163 100755
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -168,21 +168,6 @@ class RedirectTest < Test::Unit::TestCase
     assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
   end
 
-  def test_redirect_error_with_pretty_diff
-    get :host_redirect
-    assert_response :redirect
-    begin
-      assert_redirected_to :action => "other_host", :only_path => true
-    rescue Test::Unit::AssertionFailedError => err
-      expected_msg, redirection_msg, diff_msg = err.message.scan(/<\{[^\}]+\}>/).collect { |s| s[2..-3] }
-      assert_match %r("only_path"=>false),        redirection_msg
-      assert_match %r("host"=>"other.test.host"), redirection_msg
-      assert_match %r("action"=>"other_host"),    redirection_msg
-      assert_match %r("only_path"=>false),        diff_msg
-      assert_match %r("host"=>"other.test.host"), diff_msg
-    end
-  end
-
   def test_module_redirect
     get :module_redirect
     assert_response :redirect
@@ -235,9 +220,16 @@ class RedirectTest < Test::Unit::TestCase
     
     get :redirect_to_existing_record
     assert_equal "http://test.host/workshops/5", redirect_to_url
+    assert_redirected_to Workshop.new(5, false)
 
     get :redirect_to_new_record
     assert_equal "http://test.host/workshops", redirect_to_url
+    assert_redirected_to Workshop.new(5, true)
+  end
+
+  def test_redirect_with_partial_params
+    get :module_redirect
+    assert_redirected_to :action => 'hello_world'
   end
 
   def test_redirect_to_nil
@@ -283,7 +275,7 @@ module ModuleTest
     def test_module_redirect_using_options
       get :module_redirect
       assert_response :redirect
-      assert_redirected_to :controller => 'redirect', :action => "hello_world"
+      assert_redirected_to :controller => '/redirect', :action => "hello_world"
     end
   end
 end
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 066fa6acd4..9a94db4b00 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -23,11 +23,11 @@ class TestController < ActionController::Base
   def render_hello_world_with_forward_slash
     render :template => "/test/hello_world"
   end
-  
+
   def render_template_in_top_directory
     render :template => 'shared'
   end
-  
+
   def render_template_in_top_directory_with_slash
     render :template => '/shared'
   end
@@ -86,7 +86,7 @@ class TestController < ActionController::Base
   def render_nothing_with_appendix
     render :text => "appended"
   end
-  
+
   def render_invalid_args
     render("test/hello")
   end
@@ -101,12 +101,7 @@ class TestController < ActionController::Base
   end
 
   def render_line_offset
-    begin
-      render :inline => '<% raise %>', :locals => {:foo => 'bar'}
-    rescue => exc
-    end
-    line = exc.backtrace.first
-    render :text => line
+    render :inline => '<% raise %>', :locals => {:foo => 'bar'}
   end
 
   def heading
@@ -171,7 +166,7 @@ class TestController < ActionController::Base
   def partial_dot_html
     render :partial => 'partial.html.erb'
   end
-  
+
   def partial_as_rjs
     render :update do |page|
       page.replace :foo, :partial => 'partial'
@@ -217,9 +212,6 @@ class TestController < ActionController::Base
     end
 end
 
-TestController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-Fun::GamesController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class RenderTest < Test::Unit::TestCase
   def setup
     @request    = ActionController::TestRequest.new
@@ -241,23 +233,28 @@ class RenderTest < Test::Unit::TestCase
   end
 
   def test_line_offset
-    get :render_line_offset
-    line = @response.body
-    assert(line =~ %r{:(\d+):})
-    assert_equal "1", $1
+    begin
+      get :render_line_offset
+      flunk "the action should have raised an exception"
+    rescue RuntimeError => exc
+      line = exc.backtrace.first
+      assert(line =~ %r{:(\d+):})
+      assert_equal "1", $1,
+        "The line offset is wrong, perhaps the wrong exception has been raised, exception was: #{exc.inspect}"
+    end
   end
 
   def test_render_with_forward_slash
     get :render_hello_world_with_forward_slash
     assert_template "test/hello_world"
   end
-  
+
   def test_render_in_top_directory
     get :render_template_in_top_directory
     assert_template "shared"
     assert_equal "Elastica", @response.body
   end
-  
+
   def test_render_in_top_directory_with_slash
     get :render_template_in_top_directory_with_slash
     assert_template "shared"
@@ -336,11 +333,11 @@ class RenderTest < Test::Unit::TestCase
     assert_response 200
     assert_equal 'appended', @response.body
   end
-  
+
   def test_attempt_to_render_with_invalid_arguments
     assert_raises(ActionController::RenderError) { get :render_invalid_args }
   end
-  
+
   def test_attempt_to_access_object_method
     assert_raises(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
   end
@@ -467,17 +464,17 @@ class RenderTest < Test::Unit::TestCase
     get :formatted_html_erb
     assert_equal 'formatted html erb', @response.body
   end
-  
+
   def test_should_render_formatted_xml_erb_template
     get :formatted_xml_erb, :format => :xml
     assert_equal '<test>passed formatted xml erb</test>', @response.body
   end
-  
+
   def test_should_render_formatted_html_erb_template
     get :formatted_xml_erb
     assert_equal '<test>passed formatted html erb</test>', @response.body
   end
-  
+
   def test_should_render_formatted_html_erb_template_with_faulty_accepts_header
     @request.env["HTTP_ACCEPT"] = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, appliction/x-shockwave-flash, */*"
     get :formatted_xml_erb
@@ -520,7 +517,6 @@ class RenderTest < Test::Unit::TestCase
   end
 
   protected
-  
     def etag_for(text)
       %("#{Digest::MD5.hexdigest(text)}")
     end
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index 2bd489b2c7..932c0e21a1 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -386,7 +386,7 @@ class RequestTest < Test::Unit::TestCase
 
   def test_nil_format
     @request.instance_eval { @parameters = { :format => nil } }
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest"
     assert_equal Mime::JS, @request.format
   end
 
@@ -909,15 +909,21 @@ class LegacyXmlParamsParsingTest < XmlParamsParsingTest
 end
 
 class JsonParamsParsingTest < Test::Unit::TestCase
-  def test_hash_params
-    person = parse_body({:person => {:name => "David"}}.to_json)[:person]
+  def test_hash_params_for_application_json
+    person = parse_body({:person => {:name => "David"}}.to_json,'application/json')[:person]
+    assert_kind_of Hash, person
+    assert_equal 'David', person['name']
+  end
+
+  def test_hash_params_for_application_jsonrequest
+    person = parse_body({:person => {:name => "David"}}.to_json,'application/jsonrequest')[:person]
     assert_kind_of Hash, person
     assert_equal 'David', person['name']
   end
 
   private
-    def parse_body(body)
-      env = { 'CONTENT_TYPE'   => 'application/json',
+    def parse_body(body,content_type)
+      env = { 'CONTENT_TYPE'   => content_type,
               'CONTENT_LENGTH' => body.size.to_s }
       cgi = ActionController::Integration::Session::StubCGI.new(env, body)
       ActionController::CgiRequest.new(cgi).request_parameters
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 0d089d0f23..0f7924649a 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -28,18 +28,16 @@ module Backoffice
 end
 
 class ResourcesTest < Test::Unit::TestCase
-  
-  
   # The assertions in these tests are incompatible with the hash method
   # optimisation.  This could indicate user level problems
   def setup
     ActionController::Base.optimise_named_routes = false
   end
-  
-  def tear_down
+
+  def teardown
     ActionController::Base.optimise_named_routes = true
   end
-  
+
   def test_should_arrange_actions
     resource = ActionController::Resources::Resource.new(:messages,
       :collection => { :rss => :get, :reorder => :post, :csv => :post },
@@ -159,14 +157,14 @@ class ResourcesTest < Test::Unit::TestCase
 
   def test_with_collection_actions_and_name_prefix
     actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
-  
+
     with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions do
       assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.each do |action, method|
           assert_recognizes(options.merge(:action => action), :path => "/threads/1/messages/#{action}", :method => method)
         end
       end
-  
+
       assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.keys.each do |action|
           assert_named_route "/threads/1/messages/#{action}", "#{action}_thread_messages_path", :action => action
@@ -177,14 +175,14 @@ class ResourcesTest < Test::Unit::TestCase
 
   def test_with_collection_action_and_name_prefix_and_formatted
     actions = { 'a' => :get, 'b' => :put, 'c' => :post, 'd' => :delete }
-  
+
     with_restful_routing :messages, :path_prefix => '/threads/:thread_id', :name_prefix => "thread_", :collection => actions do
       assert_restful_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.each do |action, method|
           assert_recognizes(options.merge(:action => action, :format => 'xml'), :path => "/threads/1/messages/#{action}.xml", :method => method)
         end
       end
-  
+
       assert_restful_named_routes_for :messages, :path_prefix => 'threads/1/', :name_prefix => 'thread_', :options => { :thread_id => '1' } do |options|
         actions.keys.each do |action|
           assert_named_route "/threads/1/messages/#{action}.xml", "formatted_#{action}_thread_messages_path", :action => action, :format => 'xml'
@@ -279,7 +277,7 @@ class ResourcesTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_with_new_action_with_name_prefix
     with_restful_routing :messages, :new => { :preview => :post }, :path_prefix => '/threads/:thread_id', :name_prefix => 'thread_' do
       preview_options = {:action => 'preview', :thread_id => '1'}
@@ -293,7 +291,7 @@ class ResourcesTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_with_formatted_new_action_with_name_prefix
     with_restful_routing :messages, :new => { :preview => :post }, :path_prefix => '/threads/:thread_id', :name_prefix => 'thread_' do
       preview_options = {:action => 'preview', :thread_id => '1', :format => 'xml'}
@@ -307,7 +305,7 @@ class ResourcesTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_override_new_method
     with_restful_routing :messages do
       assert_restful_routes_for :messages do |options|
@@ -524,9 +522,9 @@ class ResourcesTest < Test::Unit::TestCase
         map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
         map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
       end
-      
+
       action_separator = ActionController::Base.resource_action_separator
-      
+
       assert_simply_restful_for :messages, :name_prefix => 'thread_', :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
       assert_named_route "/threads/1/messages#{action_separator}search", "search_thread_messages_path", {}
       assert_named_route "/threads/1/messages/new", "new_thread_message_path", {}
@@ -623,7 +621,7 @@ class ResourcesTest < Test::Unit::TestCase
       assert_simply_restful_for :products, :controller => "backoffice/products"
     end
   end
-  
+
   def test_nested_resources_using_namespace
     with_routing do |set|
       set.draw do |map|
@@ -795,7 +793,7 @@ class ResourcesTest < Test::Unit::TestCase
 
       yield options[:options] if block_given?
     end
-    
+
     def assert_singleton_routes_for(singleton_name, options = {})
       options[:options] ||= {}
       options[:options][:controller] = options[:controller] || singleton_name.to_s.pluralize
@@ -855,7 +853,7 @@ class ResourcesTest < Test::Unit::TestCase
       actual =  @controller.send(route, options) rescue $!.class.name
       assert_equal expected, actual, "Error on route: #{route}(#{options.inspect})"
     end
-    
+
     def assert_resource_methods(expected, resource, action_method, method)
       assert_equal expected.length, resource.send("#{action_method}_methods")[method].size, "#{resource.send("#{action_method}_methods")[method].inspect}"
       expected.each do |action|
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 07c13ebbf7..c5ccb71582 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -2039,6 +2039,26 @@ uses_mocha 'LegacyRouteSet, Route, RouteSet and RouteLoading' do
       Object.send(:remove_const, :Api)
     end
 
+    def test_namespace_with_path_prefix
+      Object.const_set(:Api, Module.new { |m| m.const_set(:ProductsController, Class.new) })
+
+      set.draw do |map|
+
+        map.namespace 'api', :path_prefix => 'prefix' do |api|
+          api.route 'inventory', :controller => "products", :action => 'inventory'
+        end
+
+      end
+
+      request.path = "/prefix/inventory"
+      request.method = :get
+      assert_nothing_raised { set.recognize(request) }
+      assert_equal("api/products", request.path_parameters[:controller])
+      assert_equal("inventory", request.path_parameters[:action])
+    ensure
+      Object.send(:remove_const, :Api)
+    end
+
     def test_generate_finds_best_fit
       set.draw do |map|
         map.connect "/people", :controller => "people", :action => "index"
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 406825fe59..c003abf094 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -1,13 +1,11 @@
 require 'abstract_unit'
 
-
 module TestFileUtils
   def file_name() File.basename(__FILE__) end
   def file_path() File.expand_path(__FILE__) end
   def file_data() File.open(file_path, 'rb') { |f| f.read } end
 end
 
-
 class SendFileController < ActionController::Base
   include TestFileUtils
   layout "layouts/standard" # to make sure layouts don't interfere
@@ -21,8 +19,6 @@ class SendFileController < ActionController::Base
   def rescue_action(e) raise end
 end
 
-SendFileController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class SendFileTest < Test::Unit::TestCase
   include TestFileUtils
 
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 38898a1f75..b624005a57 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -566,24 +566,6 @@ XML
     assert_raise(RuntimeError) { ActionController::TestUploadedFile.new('non_existent_file') }
   end
 
-  def test_assert_follow_redirect_to_same_controller
-    with_foo_routing do |set|
-      get :redirect_to_same_controller
-      assert_response :redirect
-      assert_redirected_to :controller => 'test_test/test', :action => 'test_uri', :id => 5
-      assert_nothing_raised { follow_redirect }
-    end
-  end
-
-  def test_assert_follow_redirect_to_different_controller
-    with_foo_routing do |set|
-      get :redirect_to_different_controller
-      assert_response :redirect
-      assert_redirected_to :controller => 'fail', :id => 5
-      assert_raise(RuntimeError) { follow_redirect }
-    end
-  end
-
   def test_redirect_url_only_cares_about_location_header
     get :create
     assert_response :created
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 1b4c1fae2f..85fa58a45b 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -1,10 +1,6 @@
 require 'abstract_unit'
 
 class ViewLoadPathsTest < Test::Unit::TestCase
-  LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
-
-  ActionController::Base.view_paths = [LOAD_PATH_ROOT]
-
   class TestController < ActionController::Base
     def self.controller_path() "test" end
     def rescue_action(e) raise end
@@ -16,7 +12,7 @@ class ViewLoadPathsTest < Test::Unit::TestCase
 
     private
       def add_view_path
-        prepend_view_path "#{LOAD_PATH_ROOT}/override"
+        prepend_view_path "#{FIXTURE_LOAD_PATH}/override"
       end
   end
 
@@ -47,35 +43,35 @@ class ViewLoadPathsTest < Test::Unit::TestCase
   end
 
   def test_template_load_path_was_set_correctly
-    assert_equal [ LOAD_PATH_ROOT ], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH], @controller.view_paths
   end
 
   def test_controller_appends_view_path_correctly
     @controller.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths
 
     @controller.append_view_path(%w(bar baz))
-    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths
 
-    @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(FIXTURE_LOAD_PATH)
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
 
-    @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([FIXTURE_LOAD_PATH])
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
   end
 
   def test_controller_prepends_view_path_correctly
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths
 
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
 
-    @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(FIXTURE_LOAD_PATH)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths
 
-    @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([FIXTURE_LOAD_PATH])
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths
   end
 
   def test_template_appends_view_path_correctly
@@ -83,10 +79,10 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     class_view_paths = TestController.view_paths
 
     @controller.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths
 
     @controller.append_view_path(%w(bar baz))
-    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths
     assert_equal class_view_paths, TestController.view_paths
   end
 
@@ -95,10 +91,10 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     class_view_paths = TestController.view_paths
 
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths
 
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
     assert_equal class_view_paths, TestController.view_paths
   end
 
@@ -109,7 +105,7 @@ class ViewLoadPathsTest < Test::Unit::TestCase
   end
 
   def test_view_paths_override
-    TestController.prepend_view_path "#{LOAD_PATH_ROOT}/override"
+    TestController.prepend_view_path "#{FIXTURE_LOAD_PATH}/override"
     get :hello_world
     assert_response :success
     assert_equal "Hello overridden world!", @response.body
@@ -117,7 +113,7 @@ class ViewLoadPathsTest < Test::Unit::TestCase
 
   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" ]
+    Test::SubController.view_paths = [ "#{FIXTURE_LOAD_PATH}/override", FIXTURE_LOAD_PATH, "#{FIXTURE_LOAD_PATH}/override2" ]
     get :hello_world
     assert_response :success
     assert_equal "layout: Hello overridden world!", @response.body
@@ -140,26 +136,12 @@ class ViewLoadPathsTest < Test::Unit::TestCase
 
     A.view_paths = ['a/path']
 
-    assert_equal ['a/path'], A.view_paths.map(&:to_s)
+    assert_equal ['a/path'], A.view_paths
     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.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")
+    assert_equal ['c/path'], C.view_paths
   end
 end