Merge remote branch 'mainstream/master'

44 files changed, 785 insertions, 565 deletions

diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 524381509d..4ad87d9762 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -28,7 +28,7 @@ module AbstractController
     # Test Render mixin
     # ====
     class RenderingController < AbstractController::Base
-      include ::AbstractController::RenderingController
+      include ::AbstractController::Rendering
 
       def _prefix() end
 
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index efcd68e5c8..ade29140ba 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -6,7 +6,7 @@ module AbstractController
   module Testing
   
     class ControllerWithHelpers < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include Helpers
 
       def with_module
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index ae2f1bf1f2..df73d948f0 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -6,7 +6,7 @@ module AbstractControllerTests
 
     # Base controller for these tests
     class Base < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include AbstractController::Layouts
 
       self.view_paths = [ActionView::FixtureResolver.new(
@@ -23,7 +23,7 @@ module AbstractControllerTests
       self.view_paths = []
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello blank!")
+        render :_template => ActionView::Template::Text.new("Hello blank!")
       end
     end
     
@@ -31,19 +31,19 @@ module AbstractControllerTests
       layout "hello"
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello string!")
+        render :_template => ActionView::Template::Text.new("Hello string!")
       end
 
       def overwrite_default
-        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => :default
+        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => :default
       end
 
       def overwrite_false
-        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => false
+        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => false
       end
 
       def overwrite_string
-        render :_template => ActionView::TextTemplate.new("Hello string!"), :layout => "omg"
+        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => "omg"
       end
 
       def overwrite_skip
@@ -72,7 +72,7 @@ module AbstractControllerTests
       layout :hello
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello symbol!")
+        render :_template => ActionView::Template::Text.new("Hello symbol!")
       end
     private  
       def hello
@@ -84,7 +84,7 @@ module AbstractControllerTests
       layout :no_hello
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello missing symbol!")
+        render :_template => ActionView::Template::Text.new("Hello missing symbol!")
       end
     private  
       def no_hello
@@ -96,7 +96,7 @@ module AbstractControllerTests
       layout :nilz
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello nilz!")
+        render :_template => ActionView::Template::Text.new("Hello nilz!")
       end
       
       def nilz() end
@@ -106,7 +106,7 @@ module AbstractControllerTests
       layout :objekt
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello nilz!")
+        render :_template => ActionView::Template::Text.new("Hello nilz!")
       end
       
       def objekt
@@ -118,7 +118,7 @@ module AbstractControllerTests
       layout :omg_no_method
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello boom!")
+        render :_template => ActionView::Template::Text.new("Hello boom!")
       end
     end
     
@@ -126,7 +126,7 @@ module AbstractControllerTests
       layout "missing"
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello missing!")
+        render :_template => ActionView::Template::Text.new("Hello missing!")
       end
     end
     
@@ -134,7 +134,7 @@ module AbstractControllerTests
       layout false
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello false!")
+        render :_template => ActionView::Template::Text.new("Hello false!")
       end
     end
     
@@ -142,7 +142,7 @@ module AbstractControllerTests
       layout nil
       
       def index
-        render :_template => ActionView::TextTemplate.new("Hello nil!")
+        render :_template => ActionView::Template::Text.new("Hello nil!")
       end
     end
     
diff --git a/actionpack/test/abstract/localized_cache_test.rb b/actionpack/test/abstract/localized_cache_test.rb
index 6f9bb693f7..8b0b0fff03 100644
--- a/actionpack/test/abstract/localized_cache_test.rb
+++ b/actionpack/test/abstract/localized_cache_test.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Testing
   
     class CachedController < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
       include AbstractController::LocalizedCache
 
       self.view_paths = [ActionView::FixtureResolver.new(
diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index 45a4763fe4..be0478b638 100644
--- a/actionpack/test/abstract/render_test.rb
+++ b/actionpack/test/abstract/render_test.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Testing
 
     class ControllerRenderer < AbstractController::Base
-      include AbstractController::RenderingController
+      include AbstractController::Rendering
 
       self.view_paths = [ActionView::FixtureResolver.new(
         "default.erb" => "With Default",
@@ -38,7 +38,7 @@ module AbstractController
       end
 
       def object
-        render :_template => ActionView::TextTemplate.new("With Object")
+        render :_template => ActionView::Template::Text.new("With Object")
       end
     end
 
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 775cfc82bf..8c65087898 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -1,12 +1,9 @@
-root = File.expand_path('../../..', __FILE__)
 begin
-  require "#{root}/vendor/gems/environment"
+  require File.expand_path('../../../vendor/gems/environment', __FILE__)
 rescue LoadError
-  $:.unshift "#{root}/activesupport/lib"
-  $:.unshift "#{root}/activemodel/lib"
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+lib = File.expand_path('../../lib', __FILE__)
 $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
@@ -16,18 +13,20 @@ $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
 ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp')
 
 require 'test/unit'
-require 'active_support'
-require 'active_support/test_case'
 require 'abstract_controller'
 require 'action_controller'
 require 'action_view'
 require 'action_view/base'
 require 'action_dispatch'
-require 'active_model'
 require 'fixture_template'
+require 'active_support/test_case'
 require 'action_view/test_case'
 require 'active_support/dependencies'
 
+activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
+$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
+require 'active_model'
+
 begin
   require 'ruby-debug'
   Debugger.settings[:autoeval] = true
@@ -51,6 +50,14 @@ ORIGINAL_LOCALES = I18n.available_locales.map {|locale| locale.to_s }.sort
 FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
 FIXTURES = Pathname.new(FIXTURE_LOAD_PATH)
 
+# Turn on notifications
+require 'active_support/notifications'
+Thread.abort_on_exception = true
+
+ActiveSupport::Notifications.subscribe do |*args|
+  ActionController::Base.log_event(*args) if ActionController::Base.logger
+end
+
 module SetupOnce
   extend ActiveSupport::Concern
 
@@ -83,11 +90,26 @@ class ActiveSupport::TestCase
   # have been loaded.
   setup_once do
     ActionController::Routing::Routes.draw do |map|
-      map.connect ':controller/:action/:id'
+      match ':controller(/:action(/:id))'
     end
   end
 end
 
+class MockLogger
+  attr_reader :logged
+  attr_accessor :level
+
+  def initialize
+    @level = Logger::DEBUG
+    @logged = []
+  end
+
+  def method_missing(method, *args, &blk)
+    @logged << args.first
+    @logged << blk.call if block_given?
+  end
+end
+
 class ActionController::IntegrationTest < ActiveSupport::TestCase
   def self.build_app(routes = nil)
     ActionDispatch::MiddlewareStack.new { |middleware|
@@ -191,26 +213,14 @@ class ::ApplicationController < ActionController::Base
 end
 
 module ActionController
-  module Routing
-    def self.possible_controllers
-      @@possible_controllers ||= []
-    end
-  end
-
   class Base
     include ActionController::Testing
-
-    def self.inherited(klass)
-      name = klass.name.underscore.sub(/_controller$/, '')
-      ActionController::Routing.possible_controllers << name unless name.blank?
-      super
-    end
   end
 
   Base.view_paths = FIXTURE_LOAD_PATH
 
   class TestCase
-    include TestProcess
+    include ActionDispatch::TestProcess
 
     def assert_template(options = {}, message = nil)
       validate_request!
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb
index 9e0c66055d..9a094cf66b 100644
--- a/actionpack/test/active_record_unit.rb
+++ b/actionpack/test/active_record_unit.rb
@@ -11,19 +11,15 @@ class ActiveRecordTestConnector
 end
 
 # Try to grab AR
-if defined?(ActiveRecord) && defined?(Fixtures)
-  $stderr.puts 'Active Record is already loaded, running tests'
-else
-  $stderr.print 'Attempting to load Active Record... '
+unless defined?(ActiveRecord) && defined?(Fixtures)
   begin
     PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
     raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
     $LOAD_PATH.unshift PATH_TO_AR
     require 'active_record'
     require 'active_record/fixtures'
-    $stderr.puts 'success'
   rescue LoadError => e
-    $stderr.print "failed. Skipping Active Record assertion tests: #{e}"
+    $stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}"
     ActiveRecordTestConnector.able_to_connect = false
   end
 end
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index c6c079f88c..61bee1b66c 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -155,7 +155,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
     def with_test_route_set(options = {})
       with_routing do |set|
         set.draw do |map|
-          map.connect "/:action", :controller => "active_record_store_test/test"
+          match ':action', :to => 'active_record_store_test/test'
         end
         @app = ActiveRecord::SessionStore.new(set, options.reverse_merge(:key => '_session_id'))
         yield
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
new file mode 100644
index 0000000000..0f534da14b
--- /dev/null
+++ b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -0,0 +1,39 @@
+require 'active_record_unit'
+require 'active_record/railties/controller_runtime'
+require 'fixtures/project'
+
+ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime
+
+class ARLoggingController < ActionController::Base
+  def show
+    render :inline => "<%= Project.all %>"
+  end
+end
+
+class ARLoggingTest < ActionController::TestCase
+  tests ARLoggingController
+
+  def setup
+    super
+    set_logger
+  end
+
+  def wait
+    ActiveSupport::Notifications.notifier.wait
+  end
+
+  def test_log_with_active_record
+    get :show
+    wait
+    assert_match /ActiveRecord runtime/, logs[3]
+  end
+
+  private
+    def set_logger
+      @controller.logger = MockLogger.new
+    end
+
+    def logs
+      @logs ||= @controller.logger.logged.compact.map {|l| l.to_s.strip}
+    end
+end
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 901cb940ea..d54be9bdc0 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -221,8 +221,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_named_route
     with_routing do |set|
       set.draw do |map|
-        map.route_one 'route_one', :controller => 'action_pack_assertions', :action => 'nothing'
-        map.connect   ':controller/:action/:id'
+        match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
+        match ':controller/:action'
       end
       set.install_helpers
 
@@ -235,9 +235,9 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_named_route_failure
     with_routing do |set|
       set.draw do |map|
-        map.route_one 'route_one', :controller => 'action_pack_assertions', :action => 'nothing', :id => 'one'
-        map.route_two 'route_two', :controller => 'action_pack_assertions', :action => 'nothing', :id => 'two'
-        map.connect   ':controller/:action/:id'
+        match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
+        match 'route_two', :to => 'action_pack_assertions#nothing', :id => 'two', :as => :route_two
+        match ':controller/:action'
       end
       process :redirect_to_named_route
       assert_raise(ActiveSupport::TestCase::Assertion) do
@@ -255,8 +255,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirect_to_nested_named_route
     with_routing do |set|
       set.draw do |map|
-        map.admin_inner_module 'admin/inner_module', :controller => 'admin/inner_module', :action => 'index'
-        map.connect            ':controller/:action/:id'
+        match 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_index
@@ -268,8 +268,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_assert_redirected_to_top_level_named_route_from_nested_controller
     with_routing do |set|
       set.draw do |map|
-        map.top_level '/action_pack_assertions/:id', :controller => 'action_pack_assertions', :action => 'index'
-        map.connect   ':controller/:action/:id'
+        match '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
@@ -282,8 +282,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     with_routing do |set|
       set.draw do |map|
         # this controller exists in the admin namespace as well which is the only difference from previous test
-        map.top_level '/user/:id', :controller => 'user', :action => 'index'
-        map.connect   ':controller/:action/:id'
+        match '/user/:id', :to => 'user#index', :as => :top_level
+        match ':controller/:action'
       end
       @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index b57550a69a..65118f9bc9 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -158,13 +158,6 @@ class PerformActionTest < ActionController::TestCase
     assert_raise(ActionController::UnknownAction) { get :hidden_action }
     assert_raise(ActionController::UnknownAction) { get :another_hidden_action }
   end
-
-  def test_namespaced_action_should_log_module_name
-    use_controller Submodule::ContainedNonEmptyController
-    @controller.logger = MockLogger.new
-    get :public_action
-    assert_match /Processing\sSubmodule::ContainedNonEmptyController#public_action/, @controller.logger.logged[1]
-  end
 end
 
 class DefaultUrlOptionsTest < ActionController::TestCase
@@ -179,8 +172,8 @@ class DefaultUrlOptionsTest < ActionController::TestCase
   def test_default_url_options_are_used_if_set
     with_routing do |set|
       set.draw do |map|
-        map.default_url_options 'default_url_options', :controller => 'default_url_options'
-        map.connect ':controller/:action/:id'
+        match 'default_url_options', :to => 'default_url_options#default_url_options_action', :as => :default_url_options
+        match ':controller/:action'
       end
 
       get :default_url_options_action # Make a dummy request so that the controller is initialized properly.
@@ -210,7 +203,7 @@ class EnsureNamedRoutesWorksTicket22BugTest < ActionController::TestCase
   def test_named_routes_still_work
     with_routing do |set|
       set.draw do |map|
-        map.resources :things
+        resources :things
       end
       EmptyController.send :include, ActionController::UrlWriter
 
diff --git a/actionpack/test/controller/benchmark_test.rb b/actionpack/test/controller/benchmark_test.rb
deleted file mode 100644
index 66ebfcf20a..0000000000
--- a/actionpack/test/controller/benchmark_test.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'abstract_unit'
-
-# Provide some static controllers.
-class BenchmarkedController < ActionController::Base
-  def public_action
-    render :nothing => true
-  end
-
-  def rescue_action(e)
-    raise e
-  end
-end
-
-class BenchmarkTest < ActionController::TestCase
-  tests BenchmarkedController
-
-  class MockLogger
-    def method_missing(*args)
-    end
-  end
-
-  def setup
-    super
-    # benchmark doesn't do anything unless a logger is set
-    @controller.logger = MockLogger.new
-    @request.host = "test.actioncontroller.i"
-  end
-
-  def test_with_http_1_0_request
-    @request.host = nil
-    assert_nothing_raised { get :public_action }
-  end
-end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 3ce90b6ccf..679eaf7b38 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -70,8 +70,8 @@ class PageCachingTest < ActionController::TestCase
   def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
     with_routing do |set|
       set.draw do |map|
-        map.main '', :controller => 'posts', :format => nil
-        map.formatted_posts 'posts.:format', :controller => 'posts'
+        match 'posts.:format', :to => 'posts#index', :as => :formatted_posts
+        match '/', :to => 'posts#index', :as => :main
       end
       @params[:format] = 'rss'
       assert_equal '/posts.rss', @rewriter.rewrite(@params)
@@ -422,8 +422,7 @@ class ActionCacheTest < ActionController::TestCase
   def test_xml_version_of_resource_is_treated_as_different_cache
     with_routing do |set|
       set.draw do |map|
-        map.connect ':controller/:action.:format'
-        map.connect ':controller/:action'
+        match ':controller(/:action(.:format))'
       end
 
       get :index, :format => 'xml'
@@ -632,13 +631,16 @@ class FragmentCachingTest < ActionController::TestCase
 
   def test_fragment_for_logging
     fragment_computed = false
-    ActiveSupport::Notifications.queue.expects(:publish).times(2)
+    events = []
+    ActiveSupport::Notifications.subscribe { |*args| events << args }
 
     buffer = 'generated till now -> '
     @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
 
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
+    ActiveSupport::Notifications.notifier.wait
+    assert_equal [:exist_fragment?, :write_fragment], events.map(&:first)
   end
 
 end
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
index 53d4364576..c8e8b3857e 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/controller/cookie_test.rb
@@ -1,5 +1,7 @@
 require 'abstract_unit'
 
+ActionController::Base.cookie_verifier_secret = "thisISverySECRET123"
+
 class CookieTest < ActionController::TestCase
   class TestController < ActionController::Base
     def authenticate
@@ -47,6 +49,21 @@ class CookieTest < ActionController::TestCase
       cookies["user_name"] = { :value => "david", :httponly => true }
       head :ok
     end
+
+    def set_permanent_cookie
+      cookies.permanent[:user_name] = "Jamie"
+      head :ok
+    end
+    
+    def set_signed_cookie
+      cookies.signed[:user_id] = 45
+      head :ok
+    end
+    
+    def set_permanent_signed_cookie
+      cookies.permanent.signed[:remember_me] = 100
+      head :ok
+    end
   end
 
   tests TestController
@@ -134,6 +151,24 @@ class CookieTest < ActionController::TestCase
     response = get :authenticate
     assert response.headers["Set-Cookie"] =~ /user_name=david/
   end
+
+  def test_permanent_cookie
+    get :set_permanent_cookie
+    assert_match /Jamie/, @response.headers["Set-Cookie"]
+    assert_match %r(#{20.years.from_now.utc.year}), @response.headers["Set-Cookie"]
+  end
+  
+  def test_signed_cookie
+    get :set_signed_cookie
+    assert_equal 45, @controller.send(:cookies).signed[:user_id]
+  end
+  
+  def test_permanent_signed_cookie
+    get :set_permanent_signed_cookie
+    assert_match %r(#{20.years.from_now.utc.year}), @response.headers["Set-Cookie"]
+    assert_equal 100, @controller.send(:cookies).signed[:remember_me]
+  end
+
   
   private
     def assert_cookie_header(expected)
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb
index 622d67287d..64f1ad7610 100644
--- a/actionpack/test/controller/dispatcher_test.rb
+++ b/actionpack/test/controller/dispatcher_test.rb
@@ -15,7 +15,6 @@ class DispatcherTest < Test::Unit::TestCase
     ActionDispatch::Callbacks.reset_callbacks(:call)
 
     ActionController::Routing::Routes.stubs(:call).returns([200, {}, 'response'])
-    ActionController::Routing::Routes.stubs(:reload)
     Dispatcher.stubs(:require_dependency)
   end
 
@@ -28,18 +27,6 @@ class DispatcherTest < Test::Unit::TestCase
     dispatch(false)
   end
 
-  def test_reloads_routes_before_dispatch_if_in_loading_mode
-    ActionController::Routing::Routes.expects(:reload).once
-    dispatch(false)
-  end
-
-  def test_leaves_dependencies_after_dispatch_if_not_in_loading_mode
-    ActionController::Routing::Routes.expects(:reload).never
-    ActiveSupport::Dependencies.expects(:clear).never
-
-    dispatch
-  end
-
   def test_prepare_callbacks
     a = b = c = nil
     ActionDispatch::Callbacks.to_prepare { |*args| a = b = c = 1 }
diff --git a/actionpack/test/controller/filter_params_test.rb b/actionpack/test/controller/filter_params_test.rb
index 43bef34885..420ebeacf4 100644
--- a/actionpack/test/controller/filter_params_test.rb
+++ b/actionpack/test/controller/filter_params_test.rb
@@ -70,9 +70,9 @@ class FilterParamTest < ActionController::TestCase
     FilterParamController.filter_parameter_logging(:lifo, :amount)
 
     get :payment, :lifo => 'Pratik', :amount => '420', :step => '1'
+    ActiveSupport::Notifications.notifier.wait
 
     filtered_params_logs = logs.detect {|l| l =~ /\AParameters/ }
-
     assert filtered_params_logs.index('"amount"=>"[FILTERED]"')
     assert filtered_params_logs.index('"lifo"=>"[FILTERED]"')
     assert filtered_params_logs.index('"step"=>"1"')
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index c448f36cb3..a9b60386f1 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -34,7 +34,7 @@ class FlashTest < ActionController::TestCase
       flash.keep
       render :inline => "hello"
     end
-    
+
     def use_flash_and_update_it
       flash.update("this" => "hello again")
       @flash_copy = {}.update flash
@@ -72,6 +72,18 @@ class FlashTest < ActionController::TestCase
       redirect_to :action => "std_action"
       @flash_copy = {}.update(flash)
     end
+
+    def redirect_with_alert
+      redirect_to '/nowhere', :alert => "Beware the nowheres!"
+    end
+
+    def redirect_with_notice
+      redirect_to '/somewhere', :notice => "Good luck in the somewheres!"
+    end
+
+    def redirect_with_other_flashes
+      redirect_to '/wonderland', :flash => { :joyride => "Horses!" }
+    end
   end
 
   tests TestController
@@ -89,7 +101,7 @@ class FlashTest < ActionController::TestCase
 
   def test_keep_flash
     get :set_flash
-    
+
     get :use_flash_and_keep_it
     assert_equal "hello", assigns["flash_copy"]["that"]
     assert_equal "hello", assigns["flashy"]
@@ -100,7 +112,7 @@ class FlashTest < ActionController::TestCase
     get :use_flash
     assert_nil assigns["flash_copy"]["that"], "On third flash"
   end
-  
+
   def test_flash_now
     get :set_flash_now
     assert_equal "hello", assigns["flash_copy"]["that"]
@@ -111,8 +123,8 @@ class FlashTest < ActionController::TestCase
     assert_nil assigns["flash_copy"]["that"]
     assert_nil assigns["flash_copy"]["foo"]
     assert_nil assigns["flashy"]
-  end 
-  
+  end
+
   def test_update_flash
     get :set_flash
     get :use_flash_and_update_it
@@ -128,7 +140,7 @@ class FlashTest < ActionController::TestCase
     assert_equal "hello",    assigns["flashy_that"]
     assert_equal "good-bye", assigns["flashy_this"]
     assert_nil   assigns["flashy_that_reset"]
-  end 
+  end
 
   def test_does_not_set_the_session_if_the_flash_is_empty
     get :std_action
@@ -153,11 +165,26 @@ class FlashTest < ActionController::TestCase
     assert_equal(:foo_indeed, flash.discard(:foo)) # valid key passed
     assert_nil flash.discard(:unknown) # non existant key passed
     assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard()) # nothing passed
-    assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard(nil)) # nothing passed      
+    assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.discard(nil)) # nothing passed
 
     assert_equal(:foo_indeed, flash.keep(:foo)) # valid key passed
     assert_nil flash.keep(:unknown) # non existant key passed
     assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep()) # nothing passed
-    assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep(nil)) # nothing passed     
+    assert_equal({:foo => :foo_indeed, :bar => :bar_indeed}, flash.keep(nil)) # nothing passed
+  end
+
+  def test_redirect_to_with_alert
+    get :redirect_with_alert
+    assert_equal "Beware the nowheres!", @controller.send(:flash)[:alert]
+  end
+
+  def test_redirect_to_with_notice
+    get :redirect_with_notice
+    assert_equal "Good luck in the somewheres!", @controller.send(:flash)[:notice]
+  end
+
+  def test_redirect_to_with_other_flashes
+    get :redirect_with_other_flashes
+    assert_equal "Horses!", @controller.send(:flash)[:joyride]
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index b9be163904..9030e562bb 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -191,7 +191,7 @@ class IsolatedHelpersTest < Test::Unit::TestCase
   end
 
   def test_helper_in_a
-    assert_raise(ActionView::TemplateError) { call_controller(A, "index") }
+    assert_raise(ActionView::Template::Error) { call_controller(A, "index") }
   end
 
   def test_helper_in_b
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index feb2f81cc1..f635253156 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -115,7 +115,7 @@ class RendersNoLayoutController < LayoutTest
 end
 
 class LayoutSetInResponseTest < ActionController::TestCase
-  include ActionView::TemplateHandlers
+  include ActionView::Template::Handlers
   
   def test_layout_set_when_using_default_layout
     @controller = DefaultLayoutController.new
diff --git a/actionpack/test/controller/logging_test.rb b/actionpack/test/controller/logging_test.rb
index 2b5e8d8bde..4206dffa7e 100644
--- a/actionpack/test/controller/logging_test.rb
+++ b/actionpack/test/controller/logging_test.rb
@@ -1,48 +1,74 @@
 require 'abstract_unit'
 
-class LoggingController < ActionController::Base
-  def show
-    render :nothing => true
-  end
-end
-
-class LoggingTest < ActionController::TestCase
-  tests LoggingController
-
-  class MockLogger
-    attr_reader :logged
-    attr_accessor :level
+module Another
+  class LoggingController < ActionController::Base
+    layout "layouts/standard"
 
-    def initialize
-      @level = Logger::DEBUG
+    def show
+      render :nothing => true
     end
 
-    def method_missing(method, *args, &blk)
-      @logged ||= []
-      @logged << args.first
-      @logged << blk.call if block_given?
+    def with_layout
+      render :template => "test/hello_world", :layout => true
     end
   end
+end
+
+class LoggingTest < ActionController::TestCase
+  tests Another::LoggingController
 
   def setup
     super
     set_logger
   end
 
+  def get(*args)
+    super
+    wait
+  end
+
+  def wait
+    ActiveSupport::Notifications.notifier.wait
+  end
+
   def test_logging_without_parameters
     get :show
-    assert_equal 3, logs.size
+    assert_equal 4, logs.size
     assert_nil logs.detect {|l| l =~ /Parameters/ }
   end
 
   def test_logging_with_parameters
     get :show, :id => '10'
-    assert_equal 4, logs.size
+    assert_equal 5, logs.size
 
     params = logs.detect {|l| l =~ /Parameters/ }
     assert_equal 'Parameters: {"id"=>"10"}', params
   end
 
+  def test_log_controller_with_namespace_and_action
+    get :show
+    assert_match /Processed\sAnother::LoggingController#show/, logs[1]
+  end
+
+  def test_log_view_runtime
+     get :show
+     assert_match /View runtime/, logs[2]
+   end
+
+  def test_log_completed_status_and_request_uri
+    get :show
+    last = logs.last
+    assert_match /Completed/, last
+    assert_match /200/, last
+    assert_match /another\/logging\/show/, last
+  end
+
+  def test_logger_prints_layout_and_template_rendering_info
+    get :with_layout
+    logged = logs.find {|l| l =~ /render/i }
+    assert_match /Rendered (.*)test\/hello_world.erb within (.*)layouts\/standard.html.erb/, logged
+  end
+
   private
     def set_logger
       @controller.logger = MockLogger.new
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index fee9cf46f9..6b9cace9cd 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -507,6 +507,13 @@ class RespondWithController < ActionController::Base
     end
   end
 
+  def using_responder_with_respond
+    responder = Class.new(ActionController::Responder) do
+      def respond; @controller.render :text => "respond #{format}"; end
+    end
+    respond_with(Customer.new("david", 13), :responder => responder)
+  end
+
 protected
 
   def _render_js(js, options)
@@ -592,14 +599,18 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_post_with_html
+  def test_using_resource_for_post_with_html_redirects_on_success
     with_test_route_set do
       post :using_resource
       assert_equal "text/html", @response.content_type
       assert_equal 302, @response.status
       assert_equal "http://www.example.com/customers/13", @response.location
       assert @response.redirect?
+    end
+  end
 
+  def test_using_resource_for_post_with_html_rerender_on_failure
+    with_test_route_set do
       errors = { :name => :invalid }
       Customer.any_instance.stubs(:errors).returns(errors)
       post :using_resource
@@ -610,16 +621,20 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_post_with_xml
+  def test_using_resource_for_post_with_xml_yields_created_on_success
     with_test_route_set do
       @request.accept = "application/xml"
-
       post :using_resource
       assert_equal "application/xml", @response.content_type
       assert_equal 201, @response.status
       assert_equal "<name>david</name>", @response.body
       assert_equal "http://www.example.com/customers/13", @response.location
+    end
+  end
 
+  def test_using_resource_for_post_with_xml_yields_unprocessable_entity_on_failure
+    with_test_route_set do
+      @request.accept = "application/xml"
       errors = { :name => :invalid }
       Customer.any_instance.stubs(:errors).returns(errors)
       post :using_resource
@@ -630,14 +645,18 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_put_with_html
+  def test_using_resource_for_put_with_html_redirects_on_success
     with_test_route_set do
       put :using_resource
       assert_equal "text/html", @response.content_type
       assert_equal 302, @response.status
       assert_equal "http://www.example.com/customers/13", @response.location
       assert @response.redirect?
+    end
+  end
 
+  def test_using_resource_for_put_with_html_rerender_on_failure
+    with_test_route_set do
       errors = { :name => :invalid }
       Customer.any_instance.stubs(:errors).returns(errors)
       put :using_resource
@@ -648,14 +667,16 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_put_with_xml
+  def test_using_resource_for_put_with_xml_yields_ok_on_success
     @request.accept = "application/xml"
-
     put :using_resource
     assert_equal "application/xml", @response.content_type
     assert_equal 200, @response.status
     assert_equal " ", @response.body
+  end
 
+  def test_using_resource_for_put_with_xml_yields_unprocessable_entity_on_failure
+    @request.accept = "application/xml"
     errors = { :name => :invalid }
     Customer.any_instance.stubs(:errors).returns(errors)
     put :using_resource
@@ -665,7 +686,7 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_nil @response.location
   end
 
-  def test_using_resource_for_delete_with_html
+  def test_using_resource_for_delete_with_html_redirects_on_success
     with_test_route_set do
       Customer.any_instance.stubs(:destroyed?).returns(true)
       delete :using_resource
@@ -675,7 +696,7 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_delete_with_xml
+  def test_using_resource_for_delete_with_xml_yields_ok_on_success
     Customer.any_instance.stubs(:destroyed?).returns(true)
     @request.accept = "application/xml"
     delete :using_resource
@@ -684,6 +705,18 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_equal " ", @response.body
   end
 
+  def test_using_resource_for_delete_with_html_redirects_on_failure
+    with_test_route_set do
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      Customer.any_instance.stubs(:destroyed?).returns(false)
+      delete :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 302, @response.status
+      assert_equal "http://www.example.com/customers/13", @response.location
+    end
+  end
+
   def test_using_resource_with_parent_for_get
     @request.accept = "application/xml"
     get :using_resource_with_parent
@@ -735,6 +768,16 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_equal "foo - #{[:html].to_s}", @controller.response_body
   end
 
+  def test_respond_as_responder_entry_point
+    @request.accept = "text/html"
+    get :using_responder_with_respond
+    assert_equal "respond html", @response.body
+
+    @request.accept = "application/xml"
+    get :using_responder_with_respond
+    assert_equal "respond xml", @response.body
+  end
+
   def test_clear_respond_to
     @controller = InheritedRespondWithController.new
     @request.accept = "text/html"
@@ -810,9 +853,11 @@ class RespondWithControllerTest < ActionController::TestCase
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.resources :customers
-          map.resources :quiz_stores, :has_many => :customers
-          map.connect ":controller/:action/:id"
+          resources :customers
+          resources :quiz_stores do
+            resources :customers
+          end
+          match ":controller/:action"
         end
         yield
       end
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index ea278fd8f0..570ff4a41b 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -233,8 +233,8 @@ class RedirectTest < ActionController::TestCase
   def test_redirect_to_record
     with_routing do |set|
       set.draw do |map|
-        map.resources :workshops
-        map.connect ':controller/:action/:id'
+        resources :workshops
+        match ':controller/:action'
       end
 
       get :redirect_to_existing_record
diff --git a/actionpack/test/controller/render_other_test.rb b/actionpack/test/controller/render_other_test.rb
index 51c3c55545..dfc4f2db8c 100644
--- a/actionpack/test/controller/render_other_test.rb
+++ b/actionpack/test/controller/render_other_test.rb
@@ -2,6 +2,11 @@ require 'abstract_unit'
 require 'controller/fake_models'
 require 'pathname'
 
+ActionController.add_renderer :simon do |says, options|
+  self.content_type  = Mime::TEXT
+  self.response_body = "Simon says: #{says}"
+end
+
 class RenderOtherTest < ActionController::TestCase
   class TestController < ActionController::Base
     protect_from_forgery
@@ -109,6 +114,10 @@ class RenderOtherTest < ActionController::TestCase
       end
     end
 
+    def render_simon_says
+      render :simon => "foo"
+    end
+
     private
       def default_render
         if @alternate_default_render
@@ -240,4 +249,9 @@ class RenderOtherTest < ActionController::TestCase
     xhr :get, :render_alternate_default
     assert_equal %(Element.replace("foo", "partial html");), @response.body
   end
+
+  def test_using_custom_render_option
+    get :render_simon_says
+    assert_equal "Simon says: foo", @response.body
+  end
 end
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index b32325fa20..2c3dc2a72d 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -10,19 +10,6 @@ module Fun
   end
 end
 
-class MockLogger
-  attr_reader :logged
-
-  def initialize
-    @logged = []
-  end
-
-  def method_missing(method, *args, &blk)
-    @logged << args.first
-    @logged << blk.call if block_given?
-  end
-end
-
 class TestController < ActionController::Base
   protect_from_forgery
 
@@ -39,35 +26,35 @@ class TestController < ActionController::Base
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_public_header
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_public_header_and_expires_at
     expires_in 1.minute
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
       render :action => 'hello_world'
     end
   end
-  
+
   def conditional_hello_with_expires_in
-    expires_in 1.minute
+    expires_in 60.1.seconds
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public
     expires_in 1.minute, :public => true
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public_with_more_keys
     expires_in 1.minute, :public => true, 'max-stale' => 5.hours
     render :action => 'hello_world'
   end
-  
+
   def conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
     expires_in 1.minute, :public => true, :private => nil, 'max-stale' => 5.hours
     render :action => 'hello_world'
@@ -272,7 +259,7 @@ class TestController < ActionController::Base
   def builder_layout_test
     render :action => "hello", :layout => "layouts/builder"
   end
-  
+
   # :move: test this in ActionView
   def builder_partial_test
     render :action => "hello_world_container"
@@ -1093,8 +1080,8 @@ class RenderTest < ActionController::TestCase
   def test_head_with_location_object
     with_routing do |set|
       set.draw do |map|
-        map.resources :customers
-        map.connect ':controller/:action/:id'
+        resources :customers
+        match ':controller/:action'
       end
 
       get :head_with_location_object
@@ -1125,7 +1112,7 @@ class RenderTest < ActionController::TestCase
     assert !@response.headers.include?('Content-Length')
     assert_response :no_content
 
-    ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE.each do |status, code|
+    Rack::Utils::SYMBOL_TO_STATUS_CODE.each do |status, code|
       get :head_with_symbolic_status, :status => status.to_s
       assert_equal code, @response.response_code
       assert_response status
@@ -1133,7 +1120,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_head_with_integer_status
-    ActionDispatch::StatusCodes::STATUS_CODES.each do |code, message|
+    Rack::Utils::HTTP_STATUS_CODES.each do |code, message|
       get :head_with_integer_status, :status => code.to_s
       assert_equal message, @response.message
     end
@@ -1306,22 +1293,22 @@ class ExpiresInRenderTest < ActionController::TestCase
   def setup
     @request.host = "www.nextangle.com"
   end
-  
+
   def test_expires_in_header
     get :conditional_hello_with_expires_in
     assert_equal "max-age=60, private", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_header_with_public
     get :conditional_hello_with_expires_in_with_public
     assert_equal "max-age=60, public", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_header_with_additional_headers
     get :conditional_hello_with_expires_in_with_public_with_more_keys
     assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
   end
-  
+
   def test_expires_in_old_syntax
     get :conditional_hello_with_expires_in_with_public_with_more_keys_old_syntax
     assert_equal "max-age=60, public, max-stale=18000", @response.headers["Cache-Control"]
@@ -1425,12 +1412,12 @@ class EtagRenderTest < ActionController::TestCase
     get :conditional_hello_with_bangs
     assert_response :not_modified
   end
-  
+
   def test_etag_with_public_true_should_set_header
     get :conditional_hello_with_public_header
     assert_equal "public", @response.headers['Cache-Control']
   end
-  
+
   def test_etag_with_public_true_should_set_header_and_retain_other_headers
     get :conditional_hello_with_public_header_and_expires_at
     assert_equal "max-age=60, public", @response.headers['Cache-Control']
@@ -1500,21 +1487,4 @@ class LastModifiedRenderTest < ActionController::TestCase
     get :conditional_hello_with_bangs
     assert_response :success
   end
-end
-
-class RenderingLoggingTest < ActionController::TestCase
-  tests TestController
-
-  def setup
-    super
-    @request.host = "www.nextangle.com"
-  end
-
-  def test_logger_prints_layout_and_template_rendering_info
-    @controller.logger = MockLogger.new
-    get :layout_test
-    logged = @controller.logger.logged.find_all {|l| l =~ /render/i }
-    assert logged[0] =~ %r{Rendering.*test/hello_world}
-    assert logged[1] =~ %r{Rendering template within.*layouts/standard}
-  end
-end
+end
\ No newline at end of file
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index 68a52c3e8c..b5b0d0b9d5 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -61,8 +61,8 @@ class RenderXmlTest < ActionController::TestCase
   def test_rendering_with_object_location_should_set_header_with_url_for
     with_routing do |set|
       set.draw do |map|
-        map.resources :customers
-        map.connect ':controller/:action/:id'
+        resources :customers
+        match ':controller/:action'
       end
 
       get :render_with_object_location
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 7111796f8d..09003adf73 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -18,7 +18,7 @@ module RequestForgeryProtectionActions
   def unsafe
     render :text => 'pwn'
   end
-  
+
   def rescue_action(e) raise e end
 end
 
@@ -40,6 +40,13 @@ class FreeCookieController < RequestForgeryProtectionController
   end
 end
 
+class CustomAuthenticityParamController < RequestForgeryProtectionController
+  def form_authenticity_param
+    'foobar'
+  end
+end
+
+
 # common test methods
 
 module RequestForgeryProtectionTests
@@ -241,3 +248,14 @@ class FreeCookieControllerTest < ActionController::TestCase
     end
   end
 end
+
+class CustomAuthenticityParamControllerTest < ActionController::TestCase
+  def setup
+    ActionController::Base.request_forgery_protection_token = :authenticity_token
+  end
+
+  def test_should_allow_custom_token
+    post :index, :authenticity_token => 'foobar'
+    assert_response :ok
+  end
+end
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 04e9acf855..1a03396ae9 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -403,7 +403,7 @@ class ResourcesTest < ActionController::TestCase
     with_restful_routing :messages do
       assert_restful_routes_for :messages do |options|
         assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
-        assert_raise(ActionController::MethodNotAllowed) do
+        assert_raise(ActionController::RoutingError) do
           ActionController::Routing::Routes.recognize_path("/messages/new", :method => :post)
         end
       end
@@ -689,11 +689,11 @@ class ResourcesTest < ActionController::TestCase
       options = { :controller => controller_name.to_s }
       collection_path = "/#{controller_name}"
 
-      assert_raise(ActionController::MethodNotAllowed) do
+      assert_raise(ActionController::RoutingError) do
         assert_recognizes(options.merge(:action => 'update'), :path => collection_path, :method => :put)
       end
 
-      assert_raise(ActionController::MethodNotAllowed) do
+      assert_raise(ActionController::RoutingError) do
         assert_recognizes(options.merge(:action => 'destroy'), :path => collection_path, :method => :delete)
       end
     end
@@ -1378,7 +1378,7 @@ class ResourcesTest < ActionController::TestCase
     end
 
     def assert_not_recognizes(expected_options, path)
-      assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Assertion do
+      assert_raise ActionController::RoutingError, Assertion do
         assert_recognizes(expected_options, path)
       end
     end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 3971aacadb..c15eaade58 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -51,30 +51,6 @@ class UriReservedCharactersRoutingTest < Test::Unit::TestCase
   end
 end
 
-class RoutingTest < Test::Unit::TestCase
-  def test_normalize_unix_paths
-    load_paths = %w(. config/../app/controllers config/../app//helpers script/../config/../vendor/rails/actionpack/lib vendor/rails/railties/builtin/rails_info app/models lib script/../config/../foo/bar/../../app/models .foo/../.bar foo.bar/../config)
-    paths = ActionController::Routing.normalize_paths(load_paths)
-    assert_equal %w(vendor/rails/railties/builtin/rails_info vendor/rails/actionpack/lib app/controllers app/helpers app/models config .bar lib .), paths
-  end
-
-  def test_normalize_windows_paths
-    load_paths = %w(. config\\..\\app\\controllers config\\..\\app\\\\helpers script\\..\\config\\..\\vendor\\rails\\actionpack\\lib vendor\\rails\\railties\\builtin\\rails_info app\\models lib script\\..\\config\\..\\foo\\bar\\..\\..\\app\\models .foo\\..\\.bar foo.bar\\..\\config)
-    paths = ActionController::Routing.normalize_paths(load_paths)
-    assert_equal %w(vendor\\rails\\railties\\builtin\\rails_info vendor\\rails\\actionpack\\lib app\\controllers app\\helpers app\\models config .bar lib .), paths
-  end
-
-  def test_routing_helper_module
-    assert_kind_of Module, ActionController::Routing::Helpers
-
-    h = ActionController::Routing::Helpers
-    c = Class.new
-    assert ! c.ancestors.include?(h)
-    ActionController::Routing::Routes.install_helpers c
-    assert c.ancestors.include?(h)
-  end
-end
-
 class MockController
   attr_accessor :routes
 
@@ -578,10 +554,6 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def setup_request_method_routes_for(method)
-    @request = ActionController::TestRequest.new
-    @request.env["REQUEST_METHOD"] = method
-    @request.request_uri = "/match"
-
     rs.draw do |r|
       r.connect '/match', :controller => 'books', :action => 'get', :conditions => { :method => :get }
       r.connect '/match', :controller => 'books', :action => 'post', :conditions => { :method => :post }
@@ -593,8 +565,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   %w(GET POST PUT DELETE).each do |request_method|
     define_method("test_request_method_recognized_with_#{request_method}") do
       setup_request_method_routes_for(request_method)
-      assert_nothing_raised { rs.recognize(@request) }
-      assert_equal request_method.downcase, @request.path_parameters[:action]
+      params = rs.recognize_path("/match", :method => request_method)
+      assert_equal request_method.downcase, params[:action]
     end
   end
 
@@ -604,18 +576,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
       r.connect '/match', :controller => 'books', :action => 'not_get_or_post'
     end
 
-    @request = ActionController::TestRequest.new
-    @request.env["REQUEST_METHOD"] = 'POST'
-    @request.request_uri = "/match"
-    assert_nothing_raised { rs.recognize(@request) }
-    assert_equal 'get_or_post', @request.path_parameters[:action]
+    params = rs.recognize_path("/match", :method => :post)
+    assert_equal 'get_or_post', params[:action]
 
-    # have to recreate or else the RouteSet uses a cached version:
-    @request = ActionController::TestRequest.new
-    @request.env["REQUEST_METHOD"] = 'PUT'
-    @request.request_uri = "/match"
-    assert_nothing_raised { rs.recognize(@request) }
-    assert_equal 'not_get_or_post', @request.path_parameters[:action]
+    params = rs.recognize_path("/match", :method => :put)
+    assert_equal 'not_get_or_post', params[:action]
   end
 
   def test_subpath_recognized
@@ -769,9 +734,7 @@ class RouteSetTest < ActiveSupport::TestCase
     set.draw do |map|
       map.connect '/users/index', :controller => :users, :action => :index
     end
-    @request = ActionController::TestRequest.new
-    @request.request_uri = '/users/index'
-    assert_nothing_raised { set.recognize(@request) }
+    params = set.recognize_path('/users/index', :method => :get)
     assert_equal 1, set.routes.size
   end
 
@@ -1004,55 +967,34 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.request_uri = "/people"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("index", request.path_parameters[:action])
-    request.recycle!
+    params = set.recognize_path("/people", :method => :get)
+    assert_equal("index", params[:action])
 
-    request.env["REQUEST_METHOD"] = "POST"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("create", request.path_parameters[:action])
-    request.recycle!
+    params = set.recognize_path("/people", :method => :post)
+    assert_equal("create", params[:action])
 
-    request.env["REQUEST_METHOD"] = "PUT"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("update", request.path_parameters[:action])
-    request.recycle!
+    params = set.recognize_path("/people", :method => :put)
+    assert_equal("update", params[:action])
 
-    assert_raise(ActionController::UnknownHttpMethod) {
-      request.env["REQUEST_METHOD"] = "BACON"
-      set.recognize(request)
+    assert_raise(ActionController::RoutingError) {
+      set.recognize_path("/people", :method => :bacon)
     }
-    request.recycle!
 
-    request.request_uri = "/people/5"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("show", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :get)
+    assert_equal("show", params[:action])
+    assert_equal("5", params[:id])
 
-    request.env["REQUEST_METHOD"] = "PUT"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("update", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :put)
+    assert_equal("update", params[:action])
+    assert_equal("5", params[:id])
 
-    request.env["REQUEST_METHOD"] = "DELETE"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("destroy", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :delete)
+    assert_equal("destroy", params[:action])
+    assert_equal("5", params[:id])
 
-    begin
-      request.env["REQUEST_METHOD"] = "POST"
-      set.recognize(request)
-      flunk 'Should have raised MethodNotAllowed'
-    rescue ActionController::MethodNotAllowed => e
-      assert_equal [:get, :put, :delete], e.allowed_methods
-    end
-    request.recycle!
+    assert_raise(ActionController::RoutingError) {
+      set.recognize_path("/people/5", :method => :post)
+    }
   end
 
   def test_recognize_with_alias_in_conditions
@@ -1062,17 +1004,13 @@ class RouteSetTest < ActiveSupport::TestCase
       map.root   :people
     end
 
-    request.path = "/people"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("people", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("/people", :method => :get)
+    assert_equal("people", params[:controller])
+    assert_equal("index", params[:action])
 
-    request.path = "/"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("people", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("/", :method => :get)
+    assert_equal("people", params[:controller])
+    assert_equal("index", params[:action])
   end
 
   def test_typo_recognition
@@ -1082,14 +1020,12 @@ class RouteSetTest < ActiveSupport::TestCase
              :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
     end
 
-    request.path = "/articles/2005/11/05/a-very-interesting-article"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("permalink", request.path_parameters[:action])
-    assert_equal("2005", request.path_parameters[:year])
-    assert_equal("11", request.path_parameters[:month])
-    assert_equal("05", request.path_parameters[:day])
-    assert_equal("a-very-interesting-article", request.path_parameters[:title])
+    params = set.recognize_path("/articles/2005/11/05/a-very-interesting-article", :method => :get)
+    assert_equal("permalink", params[:action])
+    assert_equal("2005", params[:year])
+    assert_equal("11", params[:month])
+    assert_equal("05", params[:day])
+    assert_equal("a-very-interesting-article", params[:title])
   end
 
   def test_routing_traversal_does_not_load_extra_classes
@@ -1098,9 +1034,7 @@ class RouteSetTest < ActiveSupport::TestCase
       map.connect '/profile', :controller => 'profile'
     end
 
-    request.path = '/profile'
-
-    set.recognize(request) rescue nil
+    params = set.recognize_path("/profile") rescue nil
 
     assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
   end
@@ -1114,24 +1048,17 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.request_uri = "/people/5"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("show", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :get)
+    assert_equal("show", params[:action])
+    assert_equal("5", params[:id])
 
-    request.env["REQUEST_METHOD"] = "PUT"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("update", request.path_parameters[:action])
-    request.recycle!
+    params = set.recognize_path("/people/5", :method => :put)
+    assert_equal("update", params[:action])
 
-    request.request_uri = "/people/5.png"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("show", request.path_parameters[:action])
-    assert_equal("5", request.path_parameters[:id])
-    assert_equal("png", request.path_parameters[:_format])
+    params = set.recognize_path("/people/5.png", :method => :get)
+    assert_equal("show", params[:action])
+    assert_equal("5", params[:id])
+    assert_equal("png", params[:_format])
   end
 
   def test_generate_with_default_action
@@ -1147,11 +1074,9 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_root_map
     set.draw { |map| map.root :controller => "people" }
 
-    request.path = ""
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("people", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("", :method => :get)
+    assert_equal("people", params[:controller])
+    assert_equal("index", params[:action])
   end
 
   def test_namespace
@@ -1163,11 +1088,9 @@ class RouteSetTest < ActiveSupport::TestCase
 
     end
 
-    request.path = "/api/inventory"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("api/products", request.path_parameters[:controller])
-    assert_equal("inventory", request.path_parameters[:action])
+    params = set.recognize_path("/api/inventory", :method => :get)
+    assert_equal("api/products", params[:controller])
+    assert_equal("inventory", params[:action])
   end
 
   def test_namespaced_root_map
@@ -1179,11 +1102,9 @@ class RouteSetTest < ActiveSupport::TestCase
 
     end
 
-    request.path = "/api"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("api/products", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("/api", :method => :get)
+    assert_equal("api/products", params[:controller])
+    assert_equal("index", params[:action])
   end
 
   def test_namespace_with_path_prefix
@@ -1193,11 +1114,9 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.path = "/prefix/inventory"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("api/products", request.path_parameters[:controller])
-    assert_equal("inventory", request.path_parameters[:action])
+    params = set.recognize_path("/prefix/inventory", :method => :get)
+    assert_equal("api/products", params[:controller])
+    assert_equal("inventory", params[:action])
   end
 
   def test_namespace_with_blank_path_prefix
@@ -1207,11 +1126,9 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.path = "/inventory"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("api/products", request.path_parameters[:controller])
-    assert_equal("inventory", request.path_parameters[:action])
+    params = set.recognize_path("/inventory", :method => :get)
+    assert_equal("api/products", params[:controller])
+    assert_equal("inventory", params[:action])
   end
 
   def test_generate_changes_controller_module
@@ -1340,11 +1257,9 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    request.path = "/projects/1/milestones"
-    request.env["REQUEST_METHOD"] = "GET"
-    assert_nothing_raised { set.recognize(request) }
-    assert_equal("milestones", request.path_parameters[:controller])
-    assert_equal("index", request.path_parameters[:action])
+    params = set.recognize_path("/projects/1/milestones", :method => :get)
+    assert_equal("milestones", params[:controller])
+    assert_equal("index", params[:action])
   end
 
   def test_setting_root_in_namespace_using_symbol
@@ -1418,6 +1333,7 @@ class RouteSetTest < ActiveSupport::TestCase
         :action => 'show',
         :requirements => {:name => /(david|jamis)/i}
     end
+
     url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
     assert_equal "/page/david", url
     assert_raise ActionController::RoutingError do
@@ -1459,6 +1375,7 @@ class RouteSetTest < ActiveSupport::TestCase
                                       jamis #The Deployer
                                     )/x}
     end
+
     url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
     assert_equal "/page/david", url
     assert_raise ActionController::RoutingError do
@@ -1480,6 +1397,7 @@ class RouteSetTest < ActiveSupport::TestCase
                                       jamis #The Deployer
                                     )/xi}
     end
+
     url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
     assert_equal "/page/JAMIS", url
   end
@@ -1638,7 +1556,7 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_expand_array_build_query_string
-    assert_uri_equal '/foo?x%5B%5D=1&x%5B%5D=2', default_route_set.generate({:controller => 'foo', :x => [1, 2]})
+    assert_uri_equal '/foo?x[]=1&x[]=2', default_route_set.generate({:controller => 'foo', :x => [1, 2]})
   end
 
   def test_escape_spaces_build_query_string_selected_keys
@@ -1656,9 +1574,7 @@ class RouteSetTest < ActiveSupport::TestCase
       map.connect ':controller/:action/:id'
     end
 
-    pending do
-      assert_equal '/ibocorp', set.generate({:controller => 'ibocorp', :page => 1})
-    end
+    assert_equal '/ibocorp', set.generate({:controller => 'ibocorp', :page => 1})
   end
 
   def test_generate_with_optional_params_recalls_last_request
@@ -1691,9 +1607,7 @@ class RouteSetTest < ActiveSupport::TestCase
     assert_equal("/blog/2006/07/25", set.generate({:day => 25}, last_request))
     assert_equal("/blog/2005", set.generate({:year => 2005}, last_request))
     assert_equal("/blog/show/123", set.generate({:action => "show" , :id => 123}, last_request))
-    pending do
-      assert_equal("/blog/2006/07/28", set.generate({:year => 2006}, last_request))
-    end
+    assert_equal("/blog/2006", set.generate({:year => 2006}, last_request))
     assert_equal("/blog/2006", set.generate({:year => 2006, :month => nil}, last_request))
   end
 
@@ -1709,85 +1623,6 @@ class RouteSetTest < ActiveSupport::TestCase
     end
 end
 
-class RouteLoadingTest < Test::Unit::TestCase
-  def setup
-    routes.instance_variable_set '@routes_last_modified', nil
-    Object.remove_const(:RAILS_ROOT) if defined?(::RAILS_ROOT)
-    Object.const_set :RAILS_ROOT, '.'
-    routes.add_configuration_file(File.join(RAILS_ROOT, 'config', 'routes.rb'))
-
-    @stat = stub_everything
-  end
-
-  def teardown
-    ActionController::Routing::Routes.configuration_files.clear
-    Object.send :remove_const, :RAILS_ROOT
-  end
-
-  def test_load
-    File.expects(:stat).returns(@stat)
-    routes.expects(:load).with(regexp_matches(/routes\.rb$/))
-
-    routes.reload
-  end
-
-  def test_no_reload_when_not_modified
-    @stat.expects(:mtime).times(2).returns(1)
-    File.expects(:stat).times(2).returns(@stat)
-    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).at_most_once
-
-    2.times { routes.reload }
-  end
-
-  def test_reload_when_modified
-    @stat.expects(:mtime).at_least(2).returns(1, 2)
-    File.expects(:stat).at_least(2).returns(@stat)
-    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
-
-    2.times { routes.reload }
-  end
-
-  def test_bang_forces_reload
-    @stat.expects(:mtime).at_least(2).returns(1)
-    File.expects(:stat).at_least(2).returns(@stat)
-    routes.expects(:load).with(regexp_matches(/routes\.rb$/)).times(2)
-
-    2.times { routes.reload! }
-  end
-
-  def test_adding_inflections_forces_reload
-    ActiveSupport::Inflector::Inflections.instance.expects(:uncountable).with('equipment')
-    routes.expects(:reload!)
-
-    ActiveSupport::Inflector.inflections { |inflect| inflect.uncountable('equipment') }
-  end
-
-  def test_load_with_configuration
-    routes.configuration_files.clear
-    routes.add_configuration_file("foobarbaz")
-    File.expects(:stat).returns(@stat)
-    routes.expects(:load).with("foobarbaz")
-
-    routes.reload
-  end
-
-  def test_load_multiple_configurations
-    routes.add_configuration_file("engines.rb")
-
-    File.expects(:stat).at_least_once.returns(@stat)
-
-    routes.expects(:load).with('./config/routes.rb')
-    routes.expects(:load).with('engines.rb')
-
-    routes.reload
-  end
-
-  private
-    def routes
-      ActionController::Routing::Routes
-    end
-end
-
 class RackMountIntegrationTests < ActiveSupport::TestCase
   Model = Struct.new(:to_param)
 
@@ -1877,11 +1712,9 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     assert_equal({:controller => 'posts', :action => 'show_date', :year => '2009'}, @routes.recognize_path('/blog/2009', :method => :get))
     assert_equal({:controller => 'posts', :action => 'show_date', :year => '2009', :month => '01'}, @routes.recognize_path('/blog/2009/01', :method => :get))
     assert_equal({:controller => 'posts', :action => 'show_date', :year => '2009', :month => '01', :day => '01'}, @routes.recognize_path('/blog/2009/01/01', :method => :get))
-    assert_raise(ActionController::ActionControllerError) { @routes.recognize_path('/blog/123456789', :method => :get) }
 
     assert_equal({:controller => 'archive', :action => 'index', :year => '2010'}, @routes.recognize_path('/archive/2010'))
     assert_equal({:controller => 'archive', :action => 'index'}, @routes.recognize_path('/archive'))
-    assert_raise(ActionController::ActionControllerError) { @routes.recognize_path('/archive/january') }
 
     assert_equal({:controller => 'people', :action => 'index'}, @routes.recognize_path('/people', :method => :get))
     assert_equal({:controller => 'people', :action => 'index', :format => 'xml'}, @routes.recognize_path('/people.xml', :method => :get))
@@ -2040,9 +1873,9 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     assert_equal '/posts', @routes.generate({:controller => 'posts'}, {:controller => 'posts', :action => 'index'})
     assert_equal '/posts/create', @routes.generate({:action => 'create'}, {:controller => 'posts'})
     assert_equal '/posts?foo=bar', @routes.generate(:controller => 'posts', :foo => 'bar')
-    assert_equal '/posts?foo%5B%5D=bar&foo%5B%5D=baz', @routes.generate(:controller => 'posts', :foo => ['bar', 'baz'])
+    assert_equal '/posts?foo[]=bar&foo[]=baz', @routes.generate(:controller => 'posts', :foo => ['bar', 'baz'])
     assert_equal '/posts?page=2', @routes.generate(:controller => 'posts', :page => 2)
-    assert_equal '/posts?q%5Bfoo%5D%5Ba%5D=b', @routes.generate(:controller => 'posts', :q => { :foo => { :a => 'b'}})
+    assert_equal '/posts?q[foo][a]=b', @routes.generate(:controller => 'posts', :q => { :foo => { :a => 'b'}})
 
     assert_equal '/', @routes.generate(:controller => 'news', :action => 'index')
     assert_equal '/', @routes.generate(:controller => 'news', :action => 'index', :format => nil)
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 375878b755..0f074b32e6 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -456,8 +456,8 @@ XML
   def test_array_path_parameter_handled_properly
     with_routing do |set|
       set.draw do |map|
-        map.connect 'file/*path', :controller => 'test_test/test', :action => 'test_params'
-        map.connect ':controller/:action/:id'
+        match 'file/*path', :to => 'test_test/test#test_params'
+        match ':controller/:action'
       end
 
       get :test_params, :path => ['hello', 'world']
@@ -563,7 +563,7 @@ XML
     expected = File.read(path)
     expected.force_encoding(Encoding::BINARY) if expected.respond_to?(:force_encoding)
 
-    file = ActionController::TestUploadedFile.new(path, content_type)
+    file = Rack::Test::UploadedFile.new(path, content_type)
     assert_equal filename, file.original_filename
     assert_equal content_type, file.content_type
     assert_equal file.path, file.local_path
@@ -580,10 +580,10 @@ XML
     path = "#{FILES_DIR}/#{filename}"
     content_type = 'image/png'
 
-    binary_uploaded_file = ActionController::TestUploadedFile.new(path, content_type, :binary)
+    binary_uploaded_file = Rack::Test::UploadedFile.new(path, content_type, :binary)
     assert_equal File.open(path, READ_BINARY).read, binary_uploaded_file.read
 
-    plain_uploaded_file = ActionController::TestUploadedFile.new(path, content_type)
+    plain_uploaded_file = Rack::Test::UploadedFile.new(path, content_type)
     assert_equal File.open(path, READ_PLAIN).read, plain_uploaded_file.read
   end
 
@@ -605,7 +605,7 @@ XML
   end
 
   def test_test_uploaded_file_exception_when_file_doesnt_exist
-    assert_raise(RuntimeError) { ActionController::TestUploadedFile.new('non_existent_file') }
+    assert_raise(RuntimeError) { Rack::Test::UploadedFile.new('non_existent_file') }
   end
 
   def test_redirect_url_only_cares_about_location_header
@@ -628,17 +628,6 @@ XML
       assert_nothing_raised(NoMethodError) { @response.binary_content }
     end
   end
-
-  protected
-    def with_foo_routing
-      with_routing do |set|
-        set.draw do |map|
-          map.generate_url 'foo', :controller => 'test'
-          map.connect      ':controller/:action/:id'
-        end
-        yield set
-      end
-    end
 end
 
 class InferringClassNameTest < ActionController::TestCase
@@ -673,7 +662,7 @@ class NamedRoutesControllerTest < ActionController::TestCase
 
   def test_should_be_able_to_use_named_routes_before_a_request_is_done
     with_routing do |set|
-      set.draw { |map| map.resources :contents }
+      set.draw { |map| resources :contents }
       assert_equal 'http://test.host/contents/new', new_content_url
       assert_equal 'http://test.host/contents/1', content_url(:id => 1)
     end
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 3b14cbb2d8..428f40b9f8 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -247,7 +247,7 @@ class UrlWriterTests < ActionController::TestCase
 
     with_routing do |set|
       set.draw do |map|
-        map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
+        match '/home/sweet/home/:user', :to => 'home#index', :as => :home
       end
 
       kls = Class.new { include ActionController::UrlWriter }
@@ -264,7 +264,7 @@ class UrlWriterTests < ActionController::TestCase
     with_routing do |set|
       set.draw do |map|
         match 'home/sweet/home/:user', :to => 'home#index', :as => :home
-        map.connect ':controller/:action/:id'
+        match ':controller/:action/:id'
       end
 
       # We need to create a new class in order to install the new named route.
@@ -331,8 +331,8 @@ class UrlWriterTests < ActionController::TestCase
   def test_named_routes_with_nil_keys
     with_routing do |set|
       set.draw do |map|
-        map.main '', :controller => 'posts', :format => nil
-        map.resources :posts
+        match 'posts.:format', :to => 'posts#index', :as => :posts
+        match '/', :to => 'posts#index', :as => :main
       end
 
       # We need to create a new class in order to install the new named route.
@@ -350,7 +350,7 @@ class UrlWriterTests < ActionController::TestCase
   def test_formatted_url_methods_are_deprecated
     with_routing do |set|
       set.draw do |map|
-        map.resources :posts
+        resources :posts
       end
       # We need to create a new class in order to install the new named route.
       kls = Class.new { include ActionController::UrlWriter }
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 0514c098bf..5882a8cfa3 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -255,9 +255,7 @@ class WebServiceTest < ActionController::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.with_options :controller => "web_service_test/test" do |c|
-            c.connect "/", :action => "assign_parameters"
-          end
+          match '/', :to => 'web_service_test/test#assign_parameters'
         end
         yield
       end
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 301080842e..40c5ac2d09 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -151,7 +151,7 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do |map|
-          map.connect ':action', :controller => "multipart_params_parsing_test/test"
+          match ':action', :to => 'multipart_params_parsing_test/test'
         end
         yield
       end
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 256ed06a45..02f63f7006 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -7,7 +7,6 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "simple output" do
     @response.body = "Hello, World!"
-    @response.prepare!
 
     status, headers, body = @response.to_a
     assert_equal 200, status
@@ -25,7 +24,6 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "utf8 output" do
     @response.body = [1090, 1077, 1089, 1090].pack("U*")
-    @response.prepare!
 
     status, headers, body = @response.to_a
     assert_equal 200, status
@@ -41,7 +39,6 @@ class ResponseTest < ActiveSupport::TestCase
     @response.body = Proc.new do |response, output|
       5.times { |n| output.write(n) }
     end
-    @response.prepare!
 
     status, headers, body = @response.to_a
     assert_equal 200, status
@@ -59,14 +56,12 @@ class ResponseTest < ActiveSupport::TestCase
   test "content type" do
     [204, 304].each do |c|
       @response.status = c.to_s
-      @response.prepare!
       status, headers, body = @response.to_a
       assert !headers.has_key?("Content-Type"), "#{c} should not have Content-Type header"
     end
 
     [200, 302, 404, 500].each do |c|
       @response.status = c.to_s
-      @response.prepare!
       status, headers, body = @response.to_a
       assert headers.has_key?("Content-Type"), "#{c} did not have Content-Type header"
     end
@@ -74,7 +69,6 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "does not include Status header" do
     @response.status = "200 OK"
-    @response.prepare!
     status, headers, body = @response.to_a
     assert !headers.has_key?('Status')
   end
@@ -114,15 +108,126 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "cookies" do
     @response.set_cookie("user_name", :value => "david", :path => "/")
-    @response.prepare!
     status, headers, body = @response.to_a
     assert_equal "user_name=david; path=/", headers["Set-Cookie"]
     assert_equal({"user_name" => "david"}, @response.cookies)
 
     @response.set_cookie("login", :value => "foo&bar", :path => "/", :expires => Time.utc(2005, 10, 10,5))
-    @response.prepare!
     status, headers, body = @response.to_a
     assert_equal "user_name=david; path=/\nlogin=foo%26bar; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT", headers["Set-Cookie"]
     assert_equal({"login" => "foo&bar", "user_name" => "david"}, @response.cookies)
   end
+
+  test "read cache control" do
+    resp = ActionDispatch::Response.new.tap { |resp|
+      resp.cache_control[:public] = true
+      resp.etag = '123'
+      resp.body = 'Hello'
+    }
+    resp.to_a
+
+    assert_equal('"202cb962ac59075b964b07152d234b70"', resp.etag)
+    assert_equal({:public => true}, resp.cache_control)
+
+    assert_equal('public', resp.headers['Cache-Control'])
+    assert_equal('"202cb962ac59075b964b07152d234b70"', resp.headers['ETag'])
+  end
+
+  test "read charset and content type" do
+    resp = ActionDispatch::Response.new.tap { |resp|
+      resp.charset = 'utf-16'
+      resp.content_type = Mime::XML
+      resp.body = 'Hello'
+    }
+    resp.to_a
+
+    assert_equal('utf-16', resp.charset)
+    assert_equal(Mime::XML, resp.content_type)
+
+    assert_equal('application/xml; charset=utf-16', resp.headers['Content-Type'])
+  end
+end
+
+class ResponseIntegrationTest < ActionDispatch::IntegrationTest
+  def app
+    @app
+  end
+
+  test "response cache control from railsish app" do
+    @app = lambda { |env|
+      ActionDispatch::Response.new.tap { |resp|
+        resp.cache_control[:public] = true
+        resp.etag = '123'
+        resp.body = 'Hello'
+      }.to_a
+    }
+
+    get '/'
+    assert_response :success
+
+    assert_equal('public', @response.headers['Cache-Control'])
+    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
+
+    pending do
+      assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+      assert_equal({:public => true}, @response.cache_control)
+    end
+  end
+
+  test "response cache control from rackish app" do
+    @app = lambda { |env|
+      [200,
+        {'ETag' => '"202cb962ac59075b964b07152d234b70"',
+          'Cache-Control' => 'public'}, ['Hello']]
+    }
+
+    get '/'
+    assert_response :success
+
+    assert_equal('public', @response.headers['Cache-Control'])
+    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.headers['ETag'])
+
+    pending do
+      assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+      assert_equal({:public => true}, @response.cache_control)
+    end
+  end
+
+  test "response charset and content type from railsish app" do
+    @app = lambda { |env|
+      ActionDispatch::Response.new.tap { |resp|
+        resp.charset = 'utf-16'
+        resp.content_type = Mime::XML
+        resp.body = 'Hello'
+      }.to_a
+    }
+
+    get '/'
+    assert_response :success
+
+    pending do
+      assert_equal('utf-16', @response.charset)
+      assert_equal(Mime::XML, @response.content_type)
+    end
+
+    assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
+  end
+
+  test "response charset and content type from rackish app" do
+    @app = lambda { |env|
+      [200,
+        {'Content-Type' => 'application/xml; charset=utf-16'},
+        ['Hello']]
+    }
+
+    get '/'
+    assert_response :success
+
+    pending do
+      assert_equal('utf-16', @response.charset)
+      assert_equal(Mime::XML, @response.content_type)
+    end
+
+    assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
+  end
 end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index ca07bc7a28..c4b0b9cdbf 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -14,31 +14,37 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
   stub_controllers do |routes|
     Routes = routes
-    Routes.draw do |map|
+    Routes.draw do
       controller :sessions do
-        get  'login', :to => :new, :as => :login
-        post 'login', :to => :create
+        get  'login' => :new, :as => :login
+        post 'login' => :create
 
-        delete 'logout', :to => :destroy, :as => :logout
+        delete 'logout' => :destroy, :as => :logout
       end
 
+      match 'account/logout' => redirect("/logout"), :as => :logout_redirect
       match 'account/login', :to => redirect("/login")
 
+      match 'account/overview'
+
+      match 'account/modulo/:name', :to => redirect("/%{name}s")
+      match 'account/proc/:name', :to => redirect {|params| "/#{params[:name].pluralize}" }
+
       match 'openid/login', :via => [:get, :post], :to => "openid#login"
 
       controller(:global) do
-        match 'global/:action'
+        get   'global/hide_notice'
         match 'global/export',      :to => :export, :as => :export_request
-        match 'global/hide_notice', :to => :hide_notice, :as => :hide_notice
         match '/export/:id/:file',  :to => :export, :as => :export_download, :constraints => { :file => /.*/ }
+        match 'global/:action'
       end
 
       constraints(:ip => /192\.168\.1\.\d\d\d/) do
-        get 'admin', :to => "queenbee#index"
+        get 'admin' => "queenbee#index"
       end
 
       constraints ::TestRoutingMapper::IpRestrictor do
-        get 'admin/accounts', :to => "queenbee#accounts"
+        get 'admin/accounts' => "queenbee#accounts"
       end
 
       resources :projects, :controller => :project do
@@ -58,8 +64,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
 
         resources :people do
-          namespace ":access_token" do
-            resource :avatar
+          nested do
+            namespace ":access_token" do
+              resource :avatar
+            end
           end
 
           member do
@@ -80,7 +88,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
-      match 'sprockets.js', :to => ::TestRoutingMapper::SprocketsApp
+      match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
 
       match 'people/:id/update', :to => 'people#update', :as => :update_person
       match '/projects/:project_id/people/:id/update', :to => 'people#update', :as => :update_project_person
@@ -93,9 +101,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       controller :articles do
-        scope 'articles' do
-          scope ':title', :title => /[a-z]+/, :as => :with_title do
-            match ':id', :to => :with_id
+        scope '/articles', :name_prefix => 'article' do
+          scope :path => '/:title', :title => /[a-z]+/, :as => :with_title do
+            match '/:id', :to => :with_id
           end
         end
       end
@@ -103,6 +111,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       scope ':access_token', :constraints => { :access_token => /\w{5,5}/ } do
         resources :rooms
       end
+
+      match '/info' => 'projects#info', :as => 'info'
+
+      root :to => 'projects#index'
     end
   end
 
@@ -143,6 +155,34 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_logout_redirect_without_to
+    with_test_routes do
+      assert_equal '/account/logout', logout_redirect_path
+      get '/account/logout'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com/logout', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
+  def test_redirect_modulo
+    with_test_routes do
+      get '/account/modulo/name'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com/names', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
+  def test_redirect_proc
+    with_test_routes do
+      get '/account/proc/person'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com/people', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
   def test_openid
     with_test_routes do
       get '/openid/login'
@@ -183,7 +223,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal 'global#export', @response.body
 
       assert_equal '/global/export', export_request_path
-      assert_equal '/global/hide_notice', hide_notice_path
+      assert_equal '/global/hide_notice', global_hide_notice_path
       assert_equal '/export/123/foo.txt', export_download_path(:id => 123, :file => 'foo.txt')
     end
   end
@@ -194,14 +234,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal 'projects#index', @response.body
       assert_equal '/projects', projects_path
 
+      get '/projects.xml'
+      assert_equal 'projects#index', @response.body
+      assert_equal '/projects.xml', projects_path(:format => 'xml')
+
       get '/projects/new'
       assert_equal 'projects#new', @response.body
       assert_equal '/projects/new', new_project_path
 
+      get '/projects/new.xml'
+      assert_equal 'projects#new', @response.body
+      assert_equal '/projects/new.xml', new_project_path(:format => 'xml')
+
       get '/projects/1'
       assert_equal 'projects#show', @response.body
       assert_equal '/projects/1', project_path(:id => '1')
 
+      get '/projects/1.xml'
+      assert_equal 'projects#show', @response.body
+      assert_equal '/projects/1.xml', project_path(:id => '1', :format => 'xml')
+
       get '/projects/1/edit'
       assert_equal 'projects#edit', @response.body
       assert_equal '/projects/1/edit', edit_project_path(:id => '1')
@@ -212,9 +264,25 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/involvements'
       assert_equal 'involvements#index', @response.body
+      assert_equal '/projects/1/involvements', project_involvements_path(:project_id => '1')
+
+      get '/projects/1/involvements/new'
+      assert_equal 'involvements#new', @response.body
+      assert_equal '/projects/1/involvements/new', new_project_involvement_path(:project_id => '1')
 
       get '/projects/1/involvements/1'
       assert_equal 'involvements#show', @response.body
+      assert_equal '/projects/1/involvements/1', project_involvement_path(:project_id => '1', :id => '1')
+
+      put '/projects/1/involvements/1'
+      assert_equal 'involvements#update', @response.body
+
+      delete '/projects/1/involvements/1'
+      assert_equal 'involvements#destroy', @response.body
+
+      get '/projects/1/involvements/1/edit'
+      assert_equal 'involvements#edit', @response.body
+      assert_equal '/projects/1/involvements/1/edit', edit_project_involvement_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -222,6 +290,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/attachments'
       assert_equal 'attachments#index', @response.body
+      assert_equal '/projects/1/attachments', project_attachments_path(:project_id => '1')
     end
   end
 
@@ -229,9 +298,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/participants'
       assert_equal 'participants#index', @response.body
+      assert_equal '/projects/1/participants', project_participants_path(:project_id => '1')
 
       put '/projects/1/participants/update_all'
       assert_equal 'participants#update_all', @response.body
+      assert_equal '/projects/1/participants/update_all', update_all_project_participants_path(:project_id => '1')
     end
   end
 
@@ -239,12 +310,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/companies'
       assert_equal 'companies#index', @response.body
+      assert_equal '/projects/1/companies', project_companies_path(:project_id => '1')
 
       get '/projects/1/companies/1/people'
       assert_equal 'people#index', @response.body
+      assert_equal '/projects/1/companies/1/people', project_company_people_path(:project_id => '1', :company_id => '1')
 
       get '/projects/1/companies/1/avatar'
       assert_equal 'avatars#show', @response.body
+      assert_equal '/projects/1/companies/1/avatar', project_company_avatar_path(:project_id => '1', :company_id => '1')
     end
   end
 
@@ -252,9 +326,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/images'
       assert_equal 'images#index', @response.body
+      assert_equal '/projects/1/images', project_images_path(:project_id => '1')
 
       post '/projects/1/images/1/revise'
       assert_equal 'images#revise', @response.body
+      assert_equal '/projects/1/images/1/revise', revise_project_image_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -262,21 +338,27 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/people'
       assert_equal 'people#index', @response.body
+      assert_equal '/projects/1/people', project_people_path(:project_id => '1')
 
       get '/projects/1/people/1'
       assert_equal 'people#show', @response.body
+      assert_equal '/projects/1/people/1', project_person_path(:project_id => '1', :id => '1')
 
       get '/projects/1/people/1/7a2dec8/avatar'
       assert_equal 'avatars#show', @response.body
+      assert_equal '/projects/1/people/1/7a2dec8/avatar', project_person_avatar_path(:project_id => '1', :person_id => '1', :access_token => '7a2dec8')
 
       put '/projects/1/people/1/accessible_projects'
       assert_equal 'people#accessible_projects', @response.body
+      assert_equal '/projects/1/people/1/accessible_projects', accessible_projects_project_person_path(:project_id => '1', :id => '1')
 
       post '/projects/1/people/1/resend'
       assert_equal 'people#resend', @response.body
+      assert_equal '/projects/1/people/1/resend', resend_project_person_path(:project_id => '1', :id => '1')
 
       post '/projects/1/people/1/generate_new_password'
       assert_equal 'people#generate_new_password', @response.body
+      assert_equal '/projects/1/people/1/generate_new_password', generate_new_password_project_person_path(:project_id => '1', :id => '1')
     end
   end
 
@@ -284,24 +366,31 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/projects/1/posts'
       assert_equal 'posts#index', @response.body
+      assert_equal '/projects/1/posts', project_posts_path(:project_id => '1')
 
       get '/projects/1/posts/archive'
       assert_equal 'posts#archive', @response.body
+      assert_equal '/projects/1/posts/archive', archive_project_posts_path(:project_id => '1')
 
       get '/projects/1/posts/toggle_view'
       assert_equal 'posts#toggle_view', @response.body
+      assert_equal '/projects/1/posts/toggle_view', toggle_view_project_posts_path(:project_id => '1')
 
       post '/projects/1/posts/1/preview'
       assert_equal 'posts#preview', @response.body
+      assert_equal '/projects/1/posts/1/preview', preview_project_post_path(:project_id => '1', :id => '1')
 
       get '/projects/1/posts/1/subscription'
       assert_equal 'subscriptions#show', @response.body
+      assert_equal '/projects/1/posts/1/subscription', project_post_subscription_path(:project_id => '1', :post_id => '1')
 
       get '/projects/1/posts/1/comments'
       assert_equal 'comments#index', @response.body
+      assert_equal '/projects/1/posts/1/comments', project_post_comments_path(:project_id => '1', :post_id => '1')
 
       post '/projects/1/posts/1/comments/preview'
       assert_equal 'comments#preview', @response.body
+      assert_equal '/projects/1/posts/1/comments/preview', preview_project_post_comments_path(:project_id => '1', :post_id => '1')
     end
   end
 
@@ -359,7 +448,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       assert_raise(ActionController::RoutingError) { get '/articles/123/1' }
 
-      assert_equal '/articles/rails/1', with_title_path(:title => 'rails', :id => 1)
+      assert_equal '/articles/rails/1', article_with_title_path(:title => 'rails', :id => 1)
     end
   end
 
@@ -376,6 +465,38 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_root
+    with_test_routes do
+      assert_equal '/', root_path
+      get '/'
+      assert_equal 'projects#index', @response.body
+    end
+  end
+  
+  def test_index
+    with_test_routes do
+      assert_equal '/info', info_path
+      get '/info'
+      assert_equal 'projects#info', @response.body
+    end
+  end
+
+  def test_index
+    with_test_routes do
+      assert_equal '/info', info_path
+      get '/info'
+      assert_equal 'projects#info', @response.body
+    end
+  end
+  
+  def test_convention_match_with_no_scope
+    with_test_routes do
+      assert_equal '/account/overview', account_overview_path
+      get '/account/overview'
+      assert_equal 'account#overview', @response.body
+    end
+  end
+
   private
     def with_test_routes
       real_routes, temp_routes = ActionController::Routing::Routes, Routes
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb
index 5da02b2ea6..e42ade73d1 100644
--- a/actionpack/test/dispatch/test_request_test.rb
+++ b/actionpack/test/dispatch/test_request_test.rb
@@ -18,7 +18,7 @@ class TestRequestTest < ActiveSupport::TestCase
     assert_equal "0.0.0.0", env.delete("REMOTE_ADDR")
     assert_equal "Rails Testing", env.delete("HTTP_USER_AGENT")
 
-    assert_equal [1, 0], env.delete("rack.version")
+    assert_equal [1, 1], env.delete("rack.version")
     assert_equal "", env.delete("rack.input").string
     assert_kind_of StringIO, env.delete("rack.errors")
     assert_equal true, env.delete("rack.multithread")
diff --git a/actionpack/test/lib/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index 250327e6dc..09692f77b5 100644
--- a/actionpack/test/lib/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
@@ -1,37 +1,48 @@
 class << Object; alias_method :const_available?, :const_defined?; end
 
 class ContentController < ActionController::Base; end
-class NotAController; end
 
 module Admin
   class << self; alias_method :const_available?, :const_defined?; end
+  class AccountsController < ActionController::Base; end
   class NewsFeedController < ActionController::Base; end
   class PostsController < ActionController::Base; end
   class StuffController < ActionController::Base; end
   class UserController < ActionController::Base; end
+  class UsersController < ActionController::Base; end
 end
 
 module Api
+  class UsersController < ActionController::Base; end
   class ProductsController < ActionController::Base; end
 end
 
 # TODO: Reduce the number of test controllers we use
+class AccountController < ActionController::Base; end
 class AddressesController < ActionController::Base; end
+class ArchiveController < ActionController::Base; end
 class ArticlesController < ActionController::Base; end
 class BarController < ActionController::Base; end
+class BlogController < ActionController::Base; end
 class BooksController < ActionController::Base; end
 class BraveController < ActionController::Base; end
+class CarsController < ActionController::Base; end
+class CcController < ActionController::Base; end
 class CController < ActionController::Base; end
 class ElsewhereController < ActionController::Base; end
 class FooController < ActionController::Base; end
+class GeocodeController < ActionController::Base; end
 class HiController < ActionController::Base; end
 class ImageController < ActionController::Base; end
+class NewsController < ActionController::Base; end
 class NotesController < ActionController::Base; end
 class PeopleController < ActionController::Base; end
 class PostsController < ActionController::Base; end
 class SessionsController  < ActionController::Base; end
 class StuffController < ActionController::Base; end
 class SubpathBooksController < ActionController::Base; end
+class SymbolsController < ActionController::Base; end
+class UserController < ActionController::Base; end
 class WeblogController < ActionController::Base; end
 
 # For speed test
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb
index 823de8bdc7..b0e5d7a94c 100644
--- a/actionpack/test/lib/controller/fake_models.rb
+++ b/actionpack/test/lib/controller/fake_models.rb
@@ -54,6 +54,7 @@ end
 class Post < Struct.new(:title, :author_name, :body, :secret, :written_on, :cost)
   extend ActiveModel::Naming
   include ActiveModel::Conversion
+  extend ActiveModel::Translation
 
   alias_method :secret?, :secret
 
diff --git a/actionpack/test/template/ajax_test.rb b/actionpack/test/template/ajax_test.rb
index 670ba92697..aeb7c09b09 100644
--- a/actionpack/test/template/ajax_test.rb
+++ b/actionpack/test/template/ajax_test.rb
@@ -6,7 +6,7 @@ class AjaxTestCase < ActiveSupport::TestCase
 
   def assert_html(html, matches)
     matches.each do |match|
-      assert_match Regexp.new(Regexp.escape(match)), html
+      assert_match(Regexp.new(Regexp.escape(match)), html)
     end
   end
 
@@ -52,18 +52,18 @@ class LinkToRemoteTest < AjaxTestCase
 
   test "with a hash for :update" do
     link = link(:update => {:success => "#posts", :failure => "#error"})
-    assert_match /data-update-success="#posts"/, link
-    assert_match /data-update-failure="#error"/, link
+    assert_match(/data-update-success="#posts"/, link)
+    assert_match(/data-update-failure="#error"/, link)
   end
 
   test "with positional parameters" do
     link = link(:position => :top, :update => "#posts")
-    assert_match /data\-update\-position="top"/, link
+    assert_match(/data\-update\-position="top"/, link)
   end
 
   test "with an optional method" do
     link = link(:method => "delete")
-    assert_match /data-method="delete"/, link
+    assert_match(/data-method="delete"/, link)
   end
 
   class LegacyLinkToRemoteTest < AjaxTestCase
@@ -99,7 +99,7 @@ class ButtonToRemoteTest < AjaxTestCase
       button = button({:url => {:action => "whatnot"}}, {:class => "fine"})
       [/input/, /class="fine"/, /type="button"/, /value="Remote outpost"/,
        /data-url="\/whatnot"/].each do |match|
-         assert_match match, button
+         assert_match(match, button)
       end
     end
   end
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb
index 6a5fb0acff..347cb98303 100644
--- a/actionpack/test/template/atom_feed_helper_test.rb
+++ b/actionpack/test/template/atom_feed_helper_test.rb
@@ -187,10 +187,9 @@ class ScrollsController < ActionController::Base
   end
 
   protected
-
-  def rescue_action(e)
-    raise(e)
-  end
+    def rescue_action(e)
+      raise(e)
+    end
 end
 
 class AtomFeedTest < ActionController::TestCase
@@ -311,11 +310,12 @@ class AtomFeedTest < ActionController::TestCase
       assert_select "summary div p", :text => "after 2"
     end
   end
-private
+
+  private
     def with_restful_routing(resources)
       with_routing do |set|
         set.draw do |map|
-          map.resources(resources)
+          resources(resources)
         end
         yield
       end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 44734abb18..b1e9fe99a2 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -6,6 +6,25 @@ class FormHelperTest < ActionView::TestCase
 
   def setup
     super
+
+    # Create "label" locale for testing I18n label helpers
+    I18n.backend.store_translations 'label', {
+      :activemodel => {
+        :attributes => {
+          :post => {
+            :cost => "Total cost"
+          }
+        }
+      },
+      :views => {
+        :labels => {
+          :post => {
+            :body => "Write entire text here"
+          }
+        }
+      }
+    }
+
     @post = Post.new
     @comment = Comment.new
     def @post.errors()
@@ -51,6 +70,27 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal('<label for="post_secret">Secret?</label>', label(:post, :secret?))
   end
 
+  def test_label_with_locales_strings
+    old_locale, I18n.locale = I18n.locale, :label
+    assert_dom_equal('<label for="post_body">Write entire text here</label>', label("post", "body"))
+  ensure
+    I18n.locale = old_locale
+  end
+
+  def test_label_with_human_attribute_name
+    old_locale, I18n.locale = I18n.locale, :label
+    assert_dom_equal('<label for="post_cost">Total cost</label>', label(:post, :cost))
+  ensure
+    I18n.locale = old_locale
+  end
+
+  def test_label_with_locales_symbols
+    old_locale, I18n.locale = I18n.locale, :label
+    assert_dom_equal('<label for="post_body">Write entire text here</label>', label(:post, :body))
+  ensure
+    I18n.locale = old_locale
+  end
+
   def test_label_with_for_attribute_as_symbol
     assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, :for => "my_for"))
   end
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 35c51ca7ea..fdf3db1cdb 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -106,8 +106,8 @@ module RenderTestCases
 
   def test_render_partial_with_errors
     @view.render(:partial => "test/raise")
-    flunk "Render did not raise TemplateError"
-  rescue ActionView::TemplateError => e
+    flunk "Render did not raise Template::Error"
+  rescue ActionView::Template::Error => e
     assert_match "undefined local variable or method `doesnt_exist'", e.message
     assert_equal "", e.sub_template_message
     assert_equal "1", e.line_number
@@ -116,8 +116,8 @@ module RenderTestCases
 
   def test_render_sub_template_with_errors
     @view.render(:file => "test/sub_template_raise")
-    flunk "Render did not raise TemplateError"
-  rescue ActionView::TemplateError => e
+    flunk "Render did not raise Template::Error"
+  rescue ActionView::Template::Error => e
     assert_match "undefined local variable or method `doesnt_exist'", e.message
     assert_equal "Trace of template inclusion: #{File.expand_path("#{FIXTURE_LOAD_PATH}/test/sub_template_raise.html.erb")}", e.sub_template_message
     assert_equal "1", e.line_number
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 05a409d05a..9a448ce328 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -114,7 +114,7 @@ module ActionView
 
       test "is able to use named routes" do
         with_routing do |set|
-          set.draw { |map| map.resources :contents }
+          set.draw { |map| resources :contents }
           assert_equal 'http://test.host/contents/new', new_content_url
           assert_equal 'http://test.host/contents/1',   content_url(:id => 1)
         end
@@ -122,7 +122,7 @@ module ActionView
 
       test "named routes can be used from helper included in view" do
         with_routing do |set|
-          set.draw { |map| map.resources :contents }
+          set.draw { |map| resources :contents }
           _helpers.module_eval do
             def render_from_helper
               new_content_url
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index a20f3c394c..d67d2c7911 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -9,7 +9,7 @@ class TranslationHelperTest < Test::Unit::TestCase
   end
   
   def test_delegates_to_i18n_setting_the_raise_option
-    I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true)
+    I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true).returns("")
     translate :foo, :locale => 'en'
   end
   
@@ -26,7 +26,7 @@ class TranslationHelperTest < Test::Unit::TestCase
   
   def test_scoping_by_partial
     expects(:template).returns(stub(:path_without_format_and_extension => "people/index"))
-    I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true)
+    I18n.expects(:translate).with("people.index.foo", :locale => 'en', :raise => true).returns("")
     translate ".foo", :locale => 'en'
   end
 end
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index bf0b4ad3a7..d4b58efe1e 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -391,54 +391,47 @@ class UrlHelperTest < ActionView::TestCase
     end
 end
 
-class UrlHelperController < ActionController::Base
-  def self.controller_path; 'url_helper_with_controller' end
+class UrlHelperControllerTest < ActionController::TestCase
+  class UrlHelperController < ActionController::Base
+    def show_url_for
+      render :inline => "<%= url_for :controller => 'url_helper_controller_test/url_helper', :action => 'show_url_for' %>"
+    end
 
-  def show_url_for
-    render :inline => "<%= url_for :controller => 'url_helper_with_controller', :action => 'show_url_for' %>"
-  end
+    def show_named_route
+      render :inline => "<%= show_named_route_#{params[:kind]} %>"
+    end
 
-  def show_named_route
-    render :inline => "<%= show_named_route_#{params[:kind]} %>"
-  end
+    def nil_url_for
+      render :inline => '<%= url_for(nil) %>'
+    end
 
-  def nil_url_for
-    render :inline => '<%= url_for(nil) %>'
+    def rescue_action(e) raise e end
   end
 
-  def rescue_action(e) raise e end
-end
-
-class UrlHelperWithControllerTest < ActionController::TestCase
-  def setup
-    super
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = UrlHelperController.new
-  end
+  tests UrlHelperController
 
   def test_url_for_shows_only_path
     get :show_url_for
-    assert_equal '/url_helper_with_controller/show_url_for', @response.body
+    assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
   end
 
   def test_named_route_url_shows_host_and_path
     with_url_helper_routing do
       get :show_named_route, :kind => 'url'
-      assert_equal 'http://test.host/url_helper_with_controller/show_named_route', @response.body
+      assert_equal 'http://test.host/url_helper_controller_test/url_helper/show_named_route', @response.body
     end
   end
 
   def test_named_route_path_shows_only_path
     with_url_helper_routing do
       get :show_named_route, :kind => 'path'
-      assert_equal '/url_helper_with_controller/show_named_route', @response.body
+      assert_equal '/url_helper_controller_test/url_helper/show_named_route', @response.body
     end
   end
 
   def test_url_for_nil_returns_current_path
     get :nil_url_for
-    assert_equal '/url_helper/nil_url_for', @response.body
+    assert_equal '/url_helper_controller_test/url_helper/nil_url_for', @response.body
   end
 
   def test_named_route_should_show_host_and_path_using_controller_default_url_options
@@ -450,7 +443,7 @@ class UrlHelperWithControllerTest < ActionController::TestCase
 
     with_url_helper_routing do
       get :show_named_route, :kind => 'url'
-      assert_equal 'http://testtwo.host/url_helper_with_controller/show_named_route', @response.body
+      assert_equal 'http://testtwo.host/url_helper_controller_test/url_helper/show_named_route', @response.body
     end
   end
 
@@ -458,7 +451,7 @@ class UrlHelperWithControllerTest < ActionController::TestCase
     def with_url_helper_routing
       with_routing do |set|
         set.draw do |map|
-          map.show_named_route 'url_helper_with_controller/show_named_route', :controller => 'url_helper', :action => 'show_named_route'
+          match 'url_helper_controller_test/url_helper/show_named_route', :to => 'url_helper_controller_test/url_helper#show_named_route', :as => :show_named_route
         end
         yield
       end
@@ -512,7 +505,7 @@ class LinkToUnlessCurrentWithControllerTest < ActionController::TestCase
     def with_restful_routing
       with_routing do |set|
         set.draw do |map|
-          map.resources :tasks
+          resources :tasks
         end
         yield
       end
@@ -632,8 +625,8 @@ class PolymorphicControllerTest < ActionController::TestCase
     def with_restful_routing
       with_routing do |set|
         set.draw do |map|
-          map.resources :workshops do |w|
-            w.resources :sessions
+          resources :workshops do
+            resources :sessions
           end
         end
         yield