Merge commit 'mainstream/master'

69 files changed, 720 insertions, 646 deletions

diff --git a/actionpack/test/abstract_controller/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 7991436703..524381509d 100644
--- a/actionpack/test/abstract_controller/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module AbstractController
   module Testing
@@ -148,10 +148,10 @@ module AbstractController
       private
       def self.layout(formats)
         begin
-          view_paths.find(name.underscore, {:formats => formats}, "layouts")
+          find_template(name.underscore, {:formats => formats}, :_prefix => "layouts")
         rescue ActionView::MissingTemplate
           begin
-            view_paths.find("application", {:formats => formats}, "layouts")
+            find_template("application", {:formats => formats}, :_prefix => "layouts")
           rescue ActionView::MissingTemplate
           end
         end
diff --git a/actionpack/test/abstract_controller/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index 8f62adce8c..0ce1dc506b 100644
--- a/actionpack/test/abstract_controller/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module AbstractController
   module Testing
@@ -235,4 +235,4 @@ module AbstractController
     end
     
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/abstract_controller/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index 34a10cecc9..5a363c9aa5 100644
--- a/actionpack/test/abstract_controller/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module AbstractController
   module Testing
diff --git a/actionpack/test/abstract_controller/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 995aac7fad..453d31826e 100644
--- a/actionpack/test/abstract_controller/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 require 'active_support/core_ext/class/removal'
 
 module AbstractControllerTests
diff --git a/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/formatted.html.erb b/actionpack/test/abstract/views/abstract_controller/testing/me3/formatted.html.erb
index 785bf69191..785bf69191 100644
--- a/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/formatted.html.erb
+++ b/actionpack/test/abstract/views/abstract_controller/testing/me3/formatted.html.erb
diff --git a/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/index.erb b/actionpack/test/abstract/views/abstract_controller/testing/me3/index.erb
index f079ad8204..f079ad8204 100644
--- a/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/index.erb
+++ b/actionpack/test/abstract/views/abstract_controller/testing/me3/index.erb
diff --git a/actionpack/test/abstract_controller/views/abstract_controller/testing/me4/index.erb b/actionpack/test/abstract/views/abstract_controller/testing/me4/index.erb
index 89dce12bdc..89dce12bdc 100644
--- a/actionpack/test/abstract_controller/views/abstract_controller/testing/me4/index.erb
+++ b/actionpack/test/abstract/views/abstract_controller/testing/me4/index.erb
diff --git a/actionpack/test/abstract_controller/views/abstract_controller/testing/me5/index.erb b/actionpack/test/abstract/views/abstract_controller/testing/me5/index.erb
index 84d0b7417e..84d0b7417e 100644
--- a/actionpack/test/abstract_controller/views/abstract_controller/testing/me5/index.erb
+++ b/actionpack/test/abstract/views/abstract_controller/testing/me5/index.erb
diff --git a/actionpack/test/abstract_controller/views/action_with_ivars.erb b/actionpack/test/abstract/views/action_with_ivars.erb
index 8d8ae22fd7..8d8ae22fd7 100644
--- a/actionpack/test/abstract_controller/views/action_with_ivars.erb
+++ b/actionpack/test/abstract/views/action_with_ivars.erb
diff --git a/actionpack/test/abstract_controller/views/helper_test.erb b/actionpack/test/abstract/views/helper_test.erb
index 8ae45cc195..8ae45cc195 100644
--- a/actionpack/test/abstract_controller/views/helper_test.erb
+++ b/actionpack/test/abstract/views/helper_test.erb
diff --git a/actionpack/test/abstract_controller/views/index.erb b/actionpack/test/abstract/views/index.erb
index cc1a8b8c85..cc1a8b8c85 100644
--- a/actionpack/test/abstract_controller/views/index.erb
+++ b/actionpack/test/abstract/views/index.erb
diff --git a/actionpack/test/abstract_controller/views/layouts/abstract_controller/testing/me4.erb b/actionpack/test/abstract/views/layouts/abstract_controller/testing/me4.erb
index 172dd56569..172dd56569 100644
--- a/actionpack/test/abstract_controller/views/layouts/abstract_controller/testing/me4.erb
+++ b/actionpack/test/abstract/views/layouts/abstract_controller/testing/me4.erb
diff --git a/actionpack/test/abstract_controller/views/layouts/application.erb b/actionpack/test/abstract/views/layouts/application.erb
index 27317140ad..27317140ad 100644
--- a/actionpack/test/abstract_controller/views/layouts/application.erb
+++ b/actionpack/test/abstract/views/layouts/application.erb
diff --git a/actionpack/test/abstract_controller/views/naked_render.erb b/actionpack/test/abstract/views/naked_render.erb
index 1b3d03878b..1b3d03878b 100644
--- a/actionpack/test/abstract_controller/views/naked_render.erb
+++ b/actionpack/test/abstract/views/naked_render.erb
diff --git a/actionpack/test/abstract_controller/test_helper.rb b/actionpack/test/abstract_controller/test_helper.rb
deleted file mode 100644
index ba4302d914..0000000000
--- a/actionpack/test/abstract_controller/test_helper.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'test/unit'
-require 'active_support'
-require 'active_support/test_case'
-require 'abstract_controller'
-require 'action_view'
-require 'action_view/base'
-require 'action_dispatch'
-require 'fixture_template'
-
-begin
-  require 'ruby-debug'
-  Debugger.settings[:autoeval] = true
-  Debugger.start
-rescue LoadError
-  # Debugging disabled. `gem install ruby-debug` to enable.
-end
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 07ba37c51c..b9293ffb9f 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -1,29 +1,36 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
 $:.unshift(File.dirname(__FILE__) + '/../../activemodel/lib')
-$:.unshift(File.dirname(__FILE__) + '/lib')
 
+$:.unshift(File.dirname(__FILE__) + '/lib')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
 
-ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp')
+bundler = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment')
+require bundler if File.exist?("#{bundler}.rb")
 
-ENV['new_base'] = "true"
-$stderr.puts "Running old tests on new_base"
+begin
+  %w( rack rack/test sqlite3 ).each { |lib| require lib }
+rescue LoadError => e
+  abort e.message
+end
+
+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 'action_controller/testing/process'
-require 'action_view/test_case'
 require 'action_controller/testing/integration'
+require 'action_view/test_case'
 require 'active_support/dependencies'
-require 'active_model'
-
-$tags[:new_base] = true
 
 begin
   require 'ruby-debug'
@@ -33,6 +40,8 @@ rescue LoadError
   # Debugging disabled. `gem install ruby-debug` to enable.
 end
 
+require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
+
 ActiveSupport::Dependencies.hook!
 
 # Show backtraces for deprecated behavior for quicker cleanup.
@@ -55,6 +64,61 @@ module ActionView
   end
 end
 
+# Temporary base class
+class Rack::TestCase < ActionController::IntegrationTest
+  setup do
+    ActionController::Base.session_options[:key] = "abc"
+    ActionController::Base.session_options[:secret] = ("*" * 30)
+  end
+
+  def app
+    @app ||= ActionController::Dispatcher.new
+  end
+
+  def self.testing(klass = nil)
+    if klass
+      @testing = "/#{klass.name.underscore}".sub!(/_controller$/, '')
+    else
+      @testing
+    end
+  end
+
+  def get(thing, *args)
+    if thing.is_a?(Symbol)
+      super("#{self.class.testing}/#{thing}", *args)
+    else
+      super
+    end
+  end
+
+  def assert_body(body)
+    assert_equal body, Array.wrap(response.body).join
+  end
+
+  def assert_status(code)
+    assert_equal code, response.status
+  end
+
+  def assert_response(body, status = 200, headers = {})
+    assert_body   body
+    assert_status status
+    headers.each do |header, value|
+      assert_header header, value
+    end
+  end
+
+  def assert_content_type(type)
+    assert_equal type, response.headers["Content-Type"]
+  end
+
+  def assert_header(name, value)
+    assert_equal value, response.headers[name]
+  end
+end
+
+class ::ApplicationController < ActionController::Base
+end
+
 module ActionController
   Base.session = {
     :key         => '_testing_session',
@@ -131,3 +195,11 @@ module ActionController
     end
   end
 end
+
+class SimpleRouteCase < Rack::TestCase
+  setup do
+    ActionController::Routing::Routes.draw do |map|
+      map.connect ':controller/:action/:id'
+    end
+  end
+end
diff --git a/actionpack/test/lib/active_record_unit.rb b/actionpack/test/active_record_unit.rb
index 1ba308e9d7..9e0c66055d 100644
--- a/actionpack/test/lib/active_record_unit.rb
+++ b/actionpack/test/active_record_unit.rb
@@ -16,7 +16,7 @@ if defined?(ActiveRecord) && defined?(Fixtures)
 else
   $stderr.print 'Attempting to load Active Record... '
   begin
-    PATH_TO_AR = "#{File.dirname(__FILE__)}/../../../activerecord/lib"
+    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'
@@ -72,13 +72,13 @@ class ActiveRecordTestConnector
 
       # Load actionpack sqlite tables
       def load_schema
-        File.read(File.dirname(__FILE__) + "/../fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
+        File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
           ActiveRecord::Base.connection.execute(sql) unless sql.blank?
         end
       end
 
       def require_fixture_models
-        Dir.glob(File.dirname(__FILE__) + "/../fixtures/*.rb").each {|f| require f}
+        Dir.glob(File.dirname(__FILE__) + "/fixtures/*.rb").each {|f| require f}
       end
   end
 end
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index a46ce7a0aa..19d9c955a5 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -176,6 +176,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
             c.connect "/:action"
           end
         end
+        reset_app!
         yield
       end
     end
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 453812c128..901cb940ea 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'action_controller/vendor/html-scanner'
+require 'controller/fake_controllers'
 
 # a controller class to facilitate the tests
 class ActionPackAssertionsController < ActionController::Base
diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
index 2d2a2745b0..c1cd22113d 100644
--- a/actionpack/test/controller/addresses_render_test.rb
+++ b/actionpack/test/controller/addresses_render_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'logger'
+require 'controller/fake_controllers'
 
 class Address
   def Address.count(conditions = nil, join = nil)
@@ -15,13 +16,8 @@ class Address
   end
 end
 
-class AddressesTestController < ActionController::Base
-  def self.controller_name; "addresses"; end
-  def self.controller_path; "addresses"; end
-end
-
 class AddressesTest < ActionController::TestCase
-  tests AddressesTestController
+  tests AddressesController
 
   def setup
     super
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 82c790bc19..bd17df73c7 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -441,8 +441,8 @@ class ActionCacheTest < ActionController::TestCase
 
   def test_correct_content_type_is_returned_for_cache_hit
     # run it twice to cache it the first time
-    get :index, :id => 'content-type.xml'
-    get :index, :id => 'content-type.xml'
+    get :index, :id => 'content-type', :format => 'xml'
+    get :index, :id => 'content-type', :format => 'xml'
     assert_equal 'application/xml', @response.content_type
   end
 
@@ -625,15 +625,20 @@ class FragmentCachingTest < ActionController::TestCase
   def test_fragment_for_logging
     fragment_computed = false
 
-    @controller.class.expects(:benchmark).with('Cached fragment exists?: views/expensive')
-    @controller.class.expects(:benchmark).with('Cached fragment miss: views/expensive')
-    @controller.class.expects(:benchmark).with('Cached fragment hit: views/expensive').never
+    listener = []
+    ActiveSupport::Orchestra.register listener
 
     buffer = 'generated till now -> '
     @controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
 
+    assert_equal 2, listener.size
+    assert_equal :fragment_exist?, listener[0].name
+    assert_equal :write_fragment, listener[1].name
+
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
+  ensure
+    ActiveSupport::Orchestra.unregister listener
   end
 
 end
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index c249788c67..e5ffe20ecc 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class ContentTypeController < ActionController::Base
+class OldContentTypeController < ActionController::Base
   # :ported:
   def render_content_type_from_body
     response.content_type = Mime::RSS
@@ -56,7 +56,7 @@ class ContentTypeController < ActionController::Base
 end
 
 class ContentTypeTest < ActionController::TestCase
-  tests ContentTypeController
+  tests OldContentTypeController
 
   def setup
     super
@@ -73,11 +73,11 @@ class ContentTypeTest < ActionController::TestCase
   end
 
   def test_render_changed_charset_default
-    ContentTypeController.default_charset = "utf-16"
+    OldContentTypeController.default_charset = "utf-16"
     get :render_defaults
     assert_equal "utf-16", @response.charset
     assert_equal Mime::HTML, @response.content_type
-    ContentTypeController.default_charset = "utf-8"
+    OldContentTypeController.default_charset = "utf-8"
   end
 
   # :ported:
@@ -109,12 +109,12 @@ class ContentTypeTest < ActionController::TestCase
   end
 
   def test_nil_default_for_rhtml
-    ContentTypeController.default_charset = nil
+    OldContentTypeController.default_charset = nil
     get :render_default_for_rhtml
     assert_equal Mime::HTML, @response.content_type
     assert_nil @response.charset, @response.headers.inspect
   ensure
-    ContentTypeController.default_charset = "utf-8"
+    OldContentTypeController.default_charset = "utf-8"
   end
 
   def test_default_for_rhtml
@@ -143,8 +143,7 @@ class ContentTypeTest < ActionController::TestCase
 end
 
 class AcceptBasedContentTypeTest < ActionController::TestCase
-
-  tests ContentTypeController
+  tests OldContentTypeController
 
   def setup
     super
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb
index 9fae1fcf63..150fc83cde 100644
--- a/actionpack/test/controller/dispatcher_test.rb
+++ b/actionpack/test/controller/dispatcher_test.rb
@@ -3,13 +3,16 @@ require 'abstract_unit'
 class DispatcherTest < Test::Unit::TestCase
   Dispatcher = ActionController::Dispatcher
 
+  class Foo
+    cattr_accessor :a, :b
+  end
+
   def setup
     ENV['REQUEST_METHOD'] = 'GET'
 
     # Clear callbacks as they are redefined by Dispatcher#define_dispatcher_callbacks
-    ActionDispatch::Callbacks.instance_variable_set("@prepare_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    ActionDispatch::Callbacks.instance_variable_set("@before_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
-    ActionDispatch::Callbacks.instance_variable_set("@after_callbacks", ActiveSupport::Callbacks::CallbackChain.new)
+    ActionDispatch::Callbacks.reset_callbacks(:prepare)
+    ActionDispatch::Callbacks.reset_callbacks(:call)
 
     @old_router, Dispatcher.router = Dispatcher.router, mock()
     Dispatcher.router.stubs(:call).returns([200, {}, 'response'])
@@ -68,13 +71,12 @@ class DispatcherTest < Test::Unit::TestCase
   end
 
   def test_to_prepare_with_identifier_replaces
-    a = b = nil
-    Dispatcher.to_prepare(:unique_id) { |*args| a = b = 1 }
-    Dispatcher.to_prepare(:unique_id) { |*args| a = 2 }
+    Dispatcher.to_prepare(:unique_id) { |*args| Foo.a, Foo.b = 1, 1 }
+    Dispatcher.to_prepare(:unique_id) { |*args| Foo.a = 2 }
 
     dispatch
-    assert_equal 2, a
-    assert_equal nil, b
+    assert_equal 2, Foo.a
+    assert_equal nil, Foo.b
   end
 
   private
diff --git a/actionpack/test/controller/filter_params_test.rb b/actionpack/test/controller/filter_params_test.rb
index f7864745eb..19232c6bc9 100644
--- a/actionpack/test/controller/filter_params_test.rb
+++ b/actionpack/test/controller/filter_params_test.rb
@@ -35,6 +35,7 @@ class FilterParamTest < ActionController::TestCase
     test_hashes = [[{},{},[]],
     [{'foo'=>nil},{'foo'=>nil},[]],
     [{'foo'=>'bar'},{'foo'=>'bar'},[]],
+    [{'foo'=>1},{'foo'=>1},[]],
     [{'foo'=>'bar'},{'foo'=>'bar'},%w'food'],
     [{'foo'=>'bar'},{'foo'=>'[FILTERED]'},%w'foo'],
     [{'foo'=>'bar', 'bar'=>'foo'},{'foo'=>'[FILTERED]', 'bar'=>'foo'},%w'foo baz'],
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 197ba0c69c..9f56bbfd46 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -371,12 +371,13 @@ class IntegrationProcessTest < ActionController::IntegrationTest
             c.connect "/:action"
           end
         end
+        reset!
         yield
       end
     end
 end
 
-class MetalTest < ActionController::IntegrationTest
+class MetalIntegrationTest < ActionController::IntegrationTest
   class Poller
     def self.call(env)
       if env["PATH_INFO"] =~ /^\/success/
diff --git a/actionpack/test/controller/render_js_test.rb b/actionpack/test/controller/render_js_test.rb
index bc850de733..491c98a0fd 100644
--- a/actionpack/test/controller/render_js_test.rb
+++ b/actionpack/test/controller/render_js_test.rb
@@ -2,23 +2,27 @@ require 'abstract_unit'
 require 'controller/fake_models'
 require 'pathname'
 
-class TestController < ActionController::Base
-  protect_from_forgery
+class RenderJSTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    protect_from_forgery
 
-  def render_vanilla_js_hello
-    render :js => "alert('hello')"
-  end
-  
-  def greeting
-    # let's just rely on the template
+    def self.controller_path
+      'test'
+    end
+
+    def render_vanilla_js_hello
+      render :js => "alert('hello')"
+    end
+
+    def greeting
+      # let's just rely on the template
+    end
+
+    def show_partial
+      render :partial => 'partial'
+    end
   end
-  
-  def show_partial
-    render :partial => 'partial'
-  end  
-end
 
-class RenderTest < ActionController::TestCase
   tests TestController
 
   def test_render_vanilla_js
@@ -26,14 +30,14 @@ class RenderTest < ActionController::TestCase
     assert_equal "alert('hello')", @response.body
     assert_equal "text/javascript", @response.content_type
   end
-  
+
   def test_render_with_default_from_accept_header
     xhr :get, :greeting
     assert_equal "$(\"body\").visualEffect(\"highlight\");", @response.body
   end
-  
+
   def test_should_render_js_partial
     xhr :get, :show_partial, :format => 'js'
     assert_equal 'partial js', @response.body
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index 233b2dfd89..3938fc7061 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -2,35 +2,39 @@ require 'abstract_unit'
 require 'controller/fake_models'
 require 'pathname'
 
-class TestController < ActionController::Base
-  protect_from_forgery
-  
-  def render_json_nil
-    render :json => nil
-  end
+class RenderJsonTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    protect_from_forgery
 
-  def render_json_hello_world
-    render :json => ActiveSupport::JSON.encode(:hello => 'world')
-  end
+    def self.controller_path
+      'test'
+    end
 
-  def render_json_hello_world_with_callback
-    render :json => ActiveSupport::JSON.encode(:hello => 'world'), :callback => 'alert'
-  end
+    def render_json_nil
+      render :json => nil
+    end
 
-  def render_json_with_custom_content_type
-    render :json => ActiveSupport::JSON.encode(:hello => 'world'), :content_type => 'text/javascript'
-  end
+    def render_json_hello_world
+      render :json => ActiveSupport::JSON.encode(:hello => 'world')
+    end
 
-  def render_symbol_json
-    render :json => ActiveSupport::JSON.encode(:hello => 'world')
-  end
+    def render_json_hello_world_with_callback
+      render :json => ActiveSupport::JSON.encode(:hello => 'world'), :callback => 'alert'
+    end
 
-  def render_json_with_render_to_string
-    render :json => {:hello => render_to_string(:partial => 'partial')}
-  end  
-end
+    def render_json_with_custom_content_type
+      render :json => ActiveSupport::JSON.encode(:hello => 'world'), :content_type => 'text/javascript'
+    end
+
+    def render_symbol_json
+      render :json => ActiveSupport::JSON.encode(:hello => 'world')
+    end
+
+    def render_json_with_render_to_string
+      render :json => {:hello => render_to_string(:partial => 'partial')}
+    end
+  end
 
-class RenderTest < ActionController::TestCase
   tests TestController
 
   def setup
@@ -40,8 +44,8 @@ class RenderTest < ActionController::TestCase
     @controller.logger = Logger.new(nil)
 
     @request.host = "www.nextangle.com"
-  end  
-  
+  end
+
   def test_render_json_nil
     get :render_json_nil
     assert_equal 'null', @response.body
@@ -76,5 +80,5 @@ class RenderTest < ActionController::TestCase
     get :render_json_with_render_to_string
     assert_equal '{"hello":"partial html"}', @response.body
     assert_equal 'application/json', @response.content_type
-  end  
-end
\ No newline at end of file
+  end
+end
diff --git a/actionpack/test/controller/render_other_test.rb b/actionpack/test/controller/render_other_test.rb
index 05645e47fa..51c3c55545 100644
--- a/actionpack/test/controller/render_other_test.rb
+++ b/actionpack/test/controller/render_other_test.rb
@@ -2,139 +2,144 @@ require 'abstract_unit'
 require 'controller/fake_models'
 require 'pathname'
 
-class TestController < ActionController::Base
-  protect_from_forgery
-  layout :determine_layout
+class RenderOtherTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    protect_from_forgery
 
-  module RenderTestHelper
-    def rjs_helper_method_from_module
-      page.visual_effect :highlight
+    def self.controller_path
+      'test'
     end
-  end
 
-  helper RenderTestHelper
-  helper do
-    def rjs_helper_method(value)
-      page.visual_effect :highlight, value
+    layout :determine_layout
+
+    module RenderTestHelper
+      def rjs_helper_method_from_module
+        page.visual_effect :highlight
+      end
     end
-  end
 
-  def enum_rjs_test
-    render :update do |page|
-      page.select('.product').each do |value|
-        page.rjs_helper_method_from_module
-        page.rjs_helper_method(value)
-        page.sortable(value, :url => { :action => "order" })
-        page.draggable(value)
+    helper RenderTestHelper
+    helper do
+      def rjs_helper_method(value)
+        page.visual_effect :highlight, value
       end
     end
-  end
-  
-  def render_explicit_html_template
-  end
-  
-  def render_custom_code_rjs
-    render :update, :status => 404 do |page|
-      page.replace :foo, :partial => 'partial'
+
+    def enum_rjs_test
+      render :update do |page|
+        page.select('.product').each do |value|
+          page.rjs_helper_method_from_module
+          page.rjs_helper_method(value)
+          page.sortable(value, :url => { :action => "order" })
+          page.draggable(value)
+        end
+      end
     end
-  end
-  
-  def render_implicit_html_template
-  end
-  
-  def render_js_with_explicit_template
-    @project_id = 4
-    render :template => 'test/delete_with_js'
-  end
 
-  def render_js_with_explicit_action_template
-    @project_id = 4
-    render :action => 'delete_with_js'
-  end
-  
-  def delete_with_js
-    @project_id = 4
-  end
-  
-  def update_page
-    render :update do |page|
-      page.replace_html 'balance', '$37,000,000.00'
-      page.visual_effect :highlight, 'balance'
+    def render_explicit_html_template
+    end
+
+    def render_custom_code_rjs
+      render :update, :status => 404 do |page|
+        page.replace :foo, :partial => 'partial'
+      end
     end
-  end
 
-  def update_page_with_instance_variables
-    @money = '$37,000,000.00'
-    @div_id = 'balance'
-    render :update do |page|
-      page.replace_html @div_id, @money
-      page.visual_effect :highlight, @div_id
+    def render_implicit_html_template
     end
-  end
 
-  def update_page_with_view_method
-    render :update do |page|
-      page.replace_html 'person', pluralize(2, 'person')
+    def render_js_with_explicit_template
+      @project_id = 4
+      render :template => 'test/delete_with_js'
     end
-  end
-  
-  def partial_as_rjs
-    render :update do |page|
-      page.replace :foo, :partial => 'partial'
+
+    def render_js_with_explicit_action_template
+      @project_id = 4
+      render :action => 'delete_with_js'
     end
-  end
 
-  def respond_to_partial_as_rjs
-    respond_to do |format|
-      format.js do
-        render :update do |page|
-          page.replace :foo, :partial => 'partial'
-        end
+    def delete_with_js
+      @project_id = 4
+    end
+
+    def update_page
+      render :update do |page|
+        page.replace_html 'balance', '$37,000,000.00'
+        page.visual_effect :highlight, 'balance'
       end
     end
-  end
-  
-  def render_alternate_default
-    # For this test, the method "default_render" is overridden:
-    @alternate_default_render = lambda do
+
+    def update_page_with_instance_variables
+      @money = '$37,000,000.00'
+      @div_id = 'balance'
+      render :update do |page|
+        page.replace_html @div_id, @money
+        page.visual_effect :highlight, @div_id
+      end
+    end
+
+    def update_page_with_view_method
+      render :update do |page|
+        page.replace_html 'person', pluralize(2, 'person')
+      end
+    end
+
+    def partial_as_rjs
       render :update do |page|
         page.replace :foo, :partial => 'partial'
       end
     end
-  end  
-  
-private
-  def default_render
-    if @alternate_default_render
-      @alternate_default_render.call
-    else
-      super
+
+    def respond_to_partial_as_rjs
+      respond_to do |format|
+        format.js do
+          render :update do |page|
+            page.replace :foo, :partial => 'partial'
+          end
+        end
+      end
     end
-  end
 
-  def determine_layout
-    case action_name
-      when "hello_world", "layout_test", "rendering_without_layout",
-           "rendering_nothing_on_layout", "render_text_hello_world",
-           "render_text_hello_world_with_layout",
-           "hello_world_with_layout_false",
-           "partial_only", "partial_only_with_layout",
-           "accessing_params_in_template",
-           "accessing_params_in_template_with_layout",
-           "render_with_explicit_template",
-           "render_with_explicit_string_template",
-           "update_page", "update_page_with_instance_variables"
-
-        "layouts/standard"
-      when "action_talk_to_layout", "layout_overriding_layout"
-        "layouts/talk_from_action"
-      when "render_implicit_html_template_from_xhr_request"
-        (request.xhr? ? 'layouts/xhr' : 'layouts/standard')
-    end
-  end    
-end
+    def render_alternate_default
+      # For this test, the method "default_render" is overridden:
+      @alternate_default_render = lambda do
+        render :update do |page|
+          page.replace :foo, :partial => 'partial'
+        end
+      end
+    end
+
+    private
+      def default_render
+        if @alternate_default_render
+          @alternate_default_render.call
+        else
+          super
+        end
+      end
+
+      def determine_layout
+        case action_name
+          when "hello_world", "layout_test", "rendering_without_layout",
+               "rendering_nothing_on_layout", "render_text_hello_world",
+               "render_text_hello_world_with_layout",
+               "hello_world_with_layout_false",
+               "partial_only", "partial_only_with_layout",
+               "accessing_params_in_template",
+               "accessing_params_in_template_with_layout",
+               "render_with_explicit_template",
+               "render_with_explicit_string_template",
+               "update_page", "update_page_with_instance_variables"
+
+            "layouts/standard"
+          when "action_talk_to_layout", "layout_overriding_layout"
+            "layouts/talk_from_action"
+          when "render_implicit_html_template_from_xhr_request"
+            (request.xhr? ? 'layouts/xhr' : 'layouts/standard')
+        end
+      end
+  end
 
-class RenderTest < ActionController::TestCase
   tests TestController
 
   def setup
@@ -144,8 +149,8 @@ class RenderTest < ActionController::TestCase
     @controller.logger = Logger.new(nil)
 
     @request.host = "www.nextangle.com"
-  end  
-  
+  end
+
   def test_enum_rjs_test
     ActiveSupport::SecureRandom.stubs(:base64).returns("asdf")
     get :enum_rjs_test
@@ -153,13 +158,13 @@ class RenderTest < ActionController::TestCase
       $$(".product").each(function(value, index) {
       new Effect.Highlight(element,{});
       new Effect.Highlight(value,{});
-      Sortable.create(value, {onUpdate:function(){new Ajax.Request('/test/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(value) + '&authenticity_token=' + encodeURIComponent('asdf')})}});
+      Sortable.create(value, {onUpdate:function(){new Ajax.Request('/render_other_test/test/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(value) + '&authenticity_token=' + encodeURIComponent('asdf')})}});
       new Draggable(value, {});
       });
     }.gsub(/^      /, '').strip
     assert_equal body, @response.body
   end
-  
+
   def test_explicitly_rendering_an_html_template_with_implicit_html_template_renders_should_be_possible_from_an_rjs_template
     [:js, "js"].each do |format|
       assert_nothing_raised do
@@ -167,14 +172,14 @@ class RenderTest < ActionController::TestCase
         assert_equal %(document.write("Hello world\\n");), @response.body
       end
     end
-  end 
-  
+  end
+
   def test_render_custom_code_rjs
     get :render_custom_code_rjs
     assert_response 404
     assert_equal %(Element.replace("foo", "partial html");), @response.body
   end
-  
+
   def test_render_in_an_rjs_template_should_pick_html_templates_when_available
     [:js, "js"].each do |format|
       assert_nothing_raised do
@@ -183,7 +188,7 @@ class RenderTest < ActionController::TestCase
       end
     end
   end
-  
+
   def test_render_rjs_template_explicitly
     get :render_js_with_explicit_template
     assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
@@ -193,12 +198,12 @@ class RenderTest < ActionController::TestCase
     get :render_js_with_explicit_action_template
     assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
   end
-  
+
   def test_render_rjs_with_default
     get :delete_with_js
     assert_equal %!Element.remove("person");\nnew Effect.Highlight(\"project-4\",{});!, @response.body
   end
-  
+
   def test_update_page
     get :update_page
     assert_template nil
@@ -219,8 +224,8 @@ class RenderTest < ActionController::TestCase
     assert_template nil
     assert_equal 'text/javascript; charset=utf-8', @response.headers["Content-Type"]
     assert_match /2 people/, @response.body
-  end  
-  
+  end
+
   def test_should_render_html_formatted_partial_with_rjs
     xhr :get, :partial_as_rjs
     assert_equal %(Element.replace("foo", "partial html");), @response.body
@@ -230,9 +235,9 @@ class RenderTest < ActionController::TestCase
     xhr :get, :respond_to_partial_as_rjs
     assert_equal %(Element.replace("foo", "partial html");), @response.body
   end
-  
+
   def test_should_render_with_alternate_default_render
     xhr :get, :render_alternate_default
     assert_equal %(Element.replace("foo", "partial html");), @response.body
-  end  
-end
\ No newline at end of file
+  end
+end
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index e96e8a4d57..68a52c3e8c 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -2,37 +2,41 @@ require 'abstract_unit'
 require 'controller/fake_models'
 require 'pathname'
 
-class TestController < ActionController::Base
-  protect_from_forgery
+class RenderXmlTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    protect_from_forgery
 
-  def render_with_location
-    render :xml => "<hello/>", :location => "http://example.com", :status => 201
-  end
+    def self.controller_path
+      'test'
+    end
 
-  def render_with_object_location
-    customer = Customer.new("Some guy", 1)
-    render :xml => "<customer/>", :location => customer, :status => :created
-  end
+    def render_with_location
+      render :xml => "<hello/>", :location => "http://example.com", :status => 201
+    end
 
-  def render_with_to_xml
-    to_xmlable = Class.new do
-      def to_xml
-        "<i-am-xml/>"
-      end
-    end.new
+    def render_with_object_location
+      customer = Customer.new("Some guy", 1)
+      render :xml => "<customer/>", :location => customer, :status => :created
+    end
 
-    render :xml => to_xmlable
-  end
-  
-  def formatted_xml_erb
+    def render_with_to_xml
+      to_xmlable = Class.new do
+        def to_xml
+          "<i-am-xml/>"
+        end
+      end.new
+
+      render :xml => to_xmlable
+    end
+
+    def formatted_xml_erb
+    end
+
+    def render_xml_with_custom_content_type
+      render :xml => "<blah/>", :content_type => "application/atomsvc+xml"
+    end
   end
-  
-  def render_xml_with_custom_content_type
-    render :xml => "<blah/>", :content_type => "application/atomsvc+xml"
-  end    
-end
 
-class RenderTest < ActionController::TestCase
   tests TestController
 
   def setup
@@ -42,8 +46,8 @@ class RenderTest < ActionController::TestCase
     @controller.logger = Logger.new(nil)
 
     @request.host = "www.nextangle.com"
-  end  
-  
+  end
+
   def test_rendering_with_location_should_set_header
     get :render_with_location
     assert_equal "http://example.com", @response.headers["Location"]
@@ -53,7 +57,7 @@ class RenderTest < ActionController::TestCase
     get :render_with_to_xml
     assert_equal "<i-am-xml/>", @response.body
   end
-  
+
   def test_rendering_with_object_location_should_set_header_with_url_for
     with_routing do |set|
       set.draw do |map|
@@ -65,19 +69,19 @@ class RenderTest < ActionController::TestCase
       assert_equal "http://www.nextangle.com/customers/1", @response.headers["Location"]
     end
   end
-  
+
   def test_should_render_formatted_xml_erb_template
     get :formatted_xml_erb, :format => :xml
     assert_equal '<test>passed formatted xml erb</test>', @response.body
   end
-  
+
   def test_should_render_xml_but_keep_custom_content_type
     get :render_xml_with_custom_content_type
     assert_equal "application/atomsvc+xml", @response.content_type
   end
-  
+
   def test_should_use_implicit_content_type
     get :implicit_content_type, :format => 'atom'
     assert_equal Mime::ATOM, @response.content_type
-  end    
+  end
 end
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index 490a4ff3b3..09eddfe4a7 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -227,12 +227,6 @@ class ControllerInheritanceRescueControllerTest < ActionController::TestCase
   end
 end
 
-class ApplicationController < ActionController::Base
-  rescue_from ActionController::RoutingError do
-    render :text => 'no way'
-  end
-end
-
 class RescueControllerTest < ActionController::TestCase
   def test_rescue_handler
     get :not_authorized
@@ -332,23 +326,20 @@ class RescueTest < ActionController::IntegrationTest
   end
 
   test 'rescue routing exceptions' do
-    assert_equal 1, ApplicationController.rescue_handlers.length
-
-    begin
-      with_test_routing do
-        get '/no_way'
-        assert_equal 'no way', response.body
-      end
-    ensure
-      ActionController::Base.rescue_handlers.clear
+    app = ActionDispatch::Rescue.new(ActionController::Routing::Routes) do
+      rescue_from ActionController::RoutingError, lambda { |env| [200, {"Content-Type" => "text/html"}, "Gotcha!"] }
     end
+    @integration_session = open_session(app)
+
+    get '/b00m'
+    assert_equal "Gotcha!", response.body
   end
 
   test 'unrescued exception' do
-    with_test_routing do
-      get '/b00m'
-      assert_match(/Action Controller: Exception caught/, response.body)
-    end
+    app = ActionDispatch::Rescue.new(ActionController::Routing::Routes)
+    @integration_session = open_session(app)
+
+    assert_raise(ActionController::RoutingError) { get '/b00m' }
   end
 
   private
@@ -359,6 +350,7 @@ class RescueTest < ActionController::IntegrationTest
           map.connect 'invalid', :controller => "rescue_test/test", :action => 'invalid'
           map.connect 'b00m', :controller => "rescue_test/test", :action => 'b00m'
         end
+        reset!
         yield
       end
     end
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 0b639e363d..5b47de19ae 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -135,7 +135,7 @@ class ResourcesTest < ActionController::TestCase
 
   def test_with_custom_conditions
     with_restful_routing :messages, :conditions => { :subdomain => 'app' } do
-      assert_equal 'app', ActionController::Routing::Routes.named_routes.routes[:messages].conditions[:subdomain]
+      assert ActionController::Routing::Routes.recognize_path("/messages", :method => :get, :subdomain => 'app')
     end
   end
 
@@ -1130,7 +1130,8 @@ class ResourcesTest < ActionController::TestCase
         map.resource :product
       end
 
-      assert_equal :get, set.named_routes.routes[:product].conditions[:method]
+      assert_routing '/product', :controller => 'products', :action => 'show'
+      assert set.recognize_path("/product", :method => :get)
     end
   end
 
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index d20684296f..1aabf71cad 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -232,14 +232,18 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_basic_named_route
-    rs.add_named_route :home, '', :controller => 'content', :action => 'list'
+    rs.draw do |map|
+      map.home '', :controller => 'content', :action => 'list'
+    end
     x = setup_for_named_route
     assert_equal("http://test.host/",
                  x.send(:home_url))
   end
 
   def test_basic_named_route_with_relative_url_root
-    rs.add_named_route :home, '', :controller => 'content', :action => 'list'
+    rs.draw do |map|
+      map.home '', :controller => 'content', :action => 'list'
+    end
     x = setup_for_named_route
     ActionController::Base.relative_url_root = "/foo"
     assert_equal("http://test.host/foo/",
@@ -249,14 +253,18 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_with_option
-    rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page'
+    rs.draw do |map|
+      map.page 'page/:title', :controller => 'content', :action => 'show_page'
+    end
     x = setup_for_named_route
     assert_equal("http://test.host/page/new%20stuff",
                  x.send(:page_url, :title => 'new stuff'))
   end
 
   def test_named_route_with_default
-    rs.add_named_route :page, 'page/:title', :controller => 'content', :action => 'show_page', :title => 'AboutPage'
+    rs.draw do |map|
+      map.page 'page/:title', :controller => 'content', :action => 'show_page', :title => 'AboutPage'
+    end
     x = setup_for_named_route
     assert_equal("http://test.host/page/AboutRails",
                  x.send(:page_url, :title => "AboutRails"))
@@ -264,36 +272,46 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_named_route_with_name_prefix
-    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :name_prefix => 'my_'
+    rs.draw do |map|
+      map.page 'page', :controller => 'content', :action => 'show_page', :name_prefix => 'my_'
+    end
     x = setup_for_named_route
     assert_equal("http://test.host/page",
                  x.send(:my_page_url))
   end
 
   def test_named_route_with_path_prefix
-    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => 'my'
+    rs.draw do |map|
+      map.page 'page', :controller => 'content', :action => 'show_page', :path_prefix => 'my'
+    end
     x = setup_for_named_route
     assert_equal("http://test.host/my/page",
                  x.send(:page_url))
   end
 
   def test_named_route_with_blank_path_prefix
-    rs.add_named_route :page, 'page', :controller => 'content', :action => 'show_page', :path_prefix => ''
+    rs.draw do |map|
+      map.page 'page', :controller => 'content', :action => 'show_page', :path_prefix => ''
+    end
     x = setup_for_named_route
     assert_equal("http://test.host/page",
                  x.send(:page_url))
   end
 
   def test_named_route_with_nested_controller
-    rs.add_named_route :users, 'admin/user', :controller => 'admin/user', :action => 'index'
+    rs.draw do |map|
+      map.users 'admin/user', :controller => 'admin/user', :action => 'index'
+    end
     x = setup_for_named_route
     assert_equal("http://test.host/admin/user",
                  x.send(:users_url))
   end
 
   def test_optimised_named_route_call_never_uses_url_for
-    rs.add_named_route :users, 'admin/user', :controller => '/admin/user', :action => 'index'
-    rs.add_named_route :user, 'admin/user/:id', :controller=>'/admin/user', :action=>'show'
+    rs.draw do |map|
+      map.users 'admin/user', :controller => '/admin/user', :action => 'index'
+      map.user 'admin/user/:id', :controller=>'/admin/user', :action=>'show'
+    end
     x = setup_for_named_route
     x.expects(:url_for).never
     x.send(:users_url)
@@ -303,7 +321,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_optimised_named_route_with_host
-    rs.add_named_route :pages, 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com'
+    rs.draw do |map|
+      map.pages 'pages', :controller => 'content', :action => 'show_page', :host => 'foo.com'
+    end
     x = setup_for_named_route
     x.expects(:url_for).with(:host => 'foo.com', :only_path => false, :controller => 'content', :action => 'show_page', :use_route => :pages).once
     x.send(:pages_url)
@@ -378,7 +398,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_paths_slashes_unescaped_with_ordered_parameters
-    rs.add_named_route :path, '/file/*path', :controller => 'content'
+    rs.draw do |map|
+      map.path '/file/*path', :controller => 'content'
+    end
 
     # No / to %2F in URI, only for query params.
     x = setup_for_named_route
@@ -1781,23 +1803,23 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_default_route_recognition
-    expected = {:controller => 'accounts', :action => 'show', :id => '10'}
-    assert_equal expected, default_route_set.recognize_path('/accounts/show/10')
-    assert_equal expected, default_route_set.recognize_path('/accounts/show/10/')
+    expected = {:controller => 'pages', :action => 'show', :id => '10'}
+    assert_equal expected, default_route_set.recognize_path('/pages/show/10')
+    assert_equal expected, default_route_set.recognize_path('/pages/show/10/')
 
     expected[:id] = 'jamis'
-    assert_equal expected, default_route_set.recognize_path('/accounts/show/jamis/')
+    assert_equal expected, default_route_set.recognize_path('/pages/show/jamis/')
 
     expected.delete :id
-    assert_equal expected, default_route_set.recognize_path('/accounts/show')
-    assert_equal expected, default_route_set.recognize_path('/accounts/show/')
+    assert_equal expected, default_route_set.recognize_path('/pages/show')
+    assert_equal expected, default_route_set.recognize_path('/pages/show/')
 
     expected[:action] = 'index'
-    assert_equal expected, default_route_set.recognize_path('/accounts/')
-    assert_equal expected, default_route_set.recognize_path('/accounts')
+    assert_equal expected, default_route_set.recognize_path('/pages/')
+    assert_equal expected, default_route_set.recognize_path('/pages')
 
     assert_raise(ActionController::RoutingError) { default_route_set.recognize_path('/') }
-    assert_raise(ActionController::RoutingError) { default_route_set.recognize_path('/accounts/how/goood/it/is/to/be/free') }
+    assert_raise(ActionController::RoutingError) { default_route_set.recognize_path('/pages/how/goood/it/is/to/be/free') }
   end
 
   def test_default_route_should_omit_default_action
@@ -1813,15 +1835,15 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_default_route_should_uri_escape_pluses
-    expected = { :controller => 'accounts', :action => 'show', :id => 'hello world' }
-    assert_equal expected, default_route_set.recognize_path('/accounts/show/hello world')
-    assert_equal expected, default_route_set.recognize_path('/accounts/show/hello%20world')
-    assert_equal '/accounts/show/hello%20world', default_route_set.generate(expected, expected)
+    expected = { :controller => 'pages', :action => 'show', :id => 'hello world' }
+    assert_equal expected, default_route_set.recognize_path('/pages/show/hello world')
+    assert_equal expected, default_route_set.recognize_path('/pages/show/hello%20world')
+    assert_equal '/pages/show/hello%20world', default_route_set.generate(expected, expected)
 
     expected[:id] = 'hello+world'
-    assert_equal expected, default_route_set.recognize_path('/accounts/show/hello+world')
-    assert_equal expected, default_route_set.recognize_path('/accounts/show/hello%2Bworld')
-    assert_equal '/accounts/show/hello+world', default_route_set.generate(expected, expected)
+    assert_equal expected, default_route_set.recognize_path('/pages/show/hello+world')
+    assert_equal expected, default_route_set.recognize_path('/pages/show/hello%2Bworld')
+    assert_equal '/pages/show/hello+world', default_route_set.generate(expected, expected)
   end
 
   def test_parameter_shell
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 9b8d07222b..4c4bf9ade4 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'controller/fake_controllers'
 
 ActionController::UrlRewriter
 
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index c732d1c910..05d2c8407c 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -43,7 +43,7 @@ class ViewLoadPathsTest < ActionController::TestCase
   end
 
   def expand(array)
-    array.map {|x| File.expand_path(x)}
+    array.map {|x| File.expand_path(x.to_s)}
   end
 
   def assert_paths(*paths)
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 0723a76d2b..d695be0be4 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -30,7 +30,7 @@ class CookieStoreTest < ActionController::IntegrationTest
     end
 
     def get_session_id
-      render :text => "foo: #{session[:foo].inspect}; id: #{request.session_options[:id]}"
+      render :text => "id: #{request.session_options[:id]}"
     end
 
     def call_reset_session
@@ -119,7 +119,7 @@ class CookieStoreTest < ActionController::IntegrationTest
 
       get '/get_session_id'
       assert_response :success
-      assert_equal "foo: \"bar\"; id: #{session_id}", response.body
+      assert_equal "id: #{session_id}", response.body
     end
   end
 
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index ce1973853e..d4800e4edb 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -70,8 +70,7 @@ class ShowExceptionsTest < ActionController::IntegrationTest
 
   test "localize public rescue message" do
     # Change locale
-    old_locale = I18n.locale
-    I18n.locale = :da
+    old_locale, I18n.locale = I18n.locale, :da
 
     begin
       @integration_session = open_session(ProductionApp)
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb
index 5da02b2ea6..b8e340e055 100644
--- a/actionpack/test/dispatch/test_request_test.rb
+++ b/actionpack/test/dispatch/test_request_test.rb
@@ -5,7 +5,7 @@ class TestRequestTest < ActiveSupport::TestCase
     env = ActionDispatch::TestRequest.new.env
 
     assert_equal "GET", env.delete("REQUEST_METHOD")
-    assert_equal "off", env.delete("HTTPS")
+    assert_equal nil, env.delete("HTTPS")
     assert_equal "http", env.delete("rack.url_scheme")
     assert_equal "example.org", env.delete("SERVER_NAME")
     assert_equal "80", env.delete("SERVER_PORT")
@@ -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 [0, 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/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb b/actionpack/test/fixtures/old_content_type/render_default_content_types_for_respond_to.xml.erb
index 25dc746886..25dc746886 100644
--- a/actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb
+++ b/actionpack/test/fixtures/old_content_type/render_default_content_types_for_respond_to.xml.erb
diff --git a/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml b/actionpack/test/fixtures/old_content_type/render_default_for_rhtml.rhtml
index c7926d48bb..c7926d48bb 100644
--- a/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml
+++ b/actionpack/test/fixtures/old_content_type/render_default_for_rhtml.rhtml
diff --git a/actionpack/test/fixtures/content_type/render_default_for_rjs.rjs b/actionpack/test/fixtures/old_content_type/render_default_for_rjs.rjs
index 8d614d04ad..8d614d04ad 100644
--- a/actionpack/test/fixtures/content_type/render_default_for_rjs.rjs
+++ b/actionpack/test/fixtures/old_content_type/render_default_for_rjs.rjs
diff --git a/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml b/actionpack/test/fixtures/old_content_type/render_default_for_rxml.rxml
index 598d62e2fc..598d62e2fc 100644
--- a/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml
+++ b/actionpack/test/fixtures/old_content_type/render_default_for_rxml.rxml
diff --git a/actionpack/test/lib/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index 6e02e2d21b..5dcca2e148 100644
--- a/actionpack/test/lib/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
@@ -9,7 +9,15 @@ module Admin
   class UserController < ActionController::Base; end
   class NewsFeedController < ActionController::Base; end
 end
-
+class ElsewhereController < ActionController::Base; end
+class AddressesController < ActionController::Base; end
+class SessionsController  < ActionController::Base; end
+class FooController < ActionController::Base; end
+class CController < ActionController::Base; end
+class HiController < ActionController::Base; end
+class BraveController < ActionController::Base; end
+class ImageController < ActionController::Base; end
+class WeblogController < ActionController::Base; end
 
 # For speed test
 class SpeedController < ActionController::Base;  end
@@ -24,7 +32,6 @@ class UsersController         < SpeedController; end
 class SettingsController      < SpeedController; end
 class ChannelsController      < SpeedController; end
 class ChannelVideosController < SpeedController; end
-class SessionsController      < SpeedController; end
 class LostPasswordsController < SpeedController; end
 class PagesController         < SpeedController; end
 
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb
index 8da92180d1..6b9e7c5270 100644
--- a/actionpack/test/lib/fixture_template.rb
+++ b/actionpack/test/lib/fixture_template.rb
@@ -1,67 +1,24 @@
 module ActionView #:nodoc:
-  class FixtureResolver < Resolver
+  class FixtureResolver < PathResolver
     def initialize(hash = {}, options = {})
       super(options)
       @hash = hash
     end
 
-    def find_templates(name, details, prefix, partial)
-      if regexp = details_to_regexp(name, details, prefix, partial)
-        cached(regexp) do
-          templates = []
-          @hash.select { |k,v| k =~ regexp }.each do |path, source|
-            templates << Template.new(source, path, *path_to_details(path))
-          end
-          templates.sort_by {|t| -t.details.values.compact.size }
-        end
-      end
-    end
-
   private
 
-    def formats_regexp
-      @formats_regexp ||= begin
-        formats = Mime::SET.symbols
-        '(?:' + formats.map { |l| "\\.#{Regexp.escape(l.to_s)}" }.join('|') + ')?'
+    def query(path, exts)
+      query = Regexp.escape(path)
+      exts.each do |ext|
+        query << '(?:' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << ')'
       end
-    end
-
-    def handler_regexp
-      e = TemplateHandlers.extensions.map{|h| "\\.#{Regexp.escape(h.to_s)}"}.join("|")
-      "(?:#{e})"
-    end
 
-    def details_to_regexp(name, details, prefix, partial)
-      path = ""
-      path << "#{prefix}/" unless prefix.empty?
-      path << (partial ? "_#{name}" : name)
-
-      extensions = ""
-      [:locales, :formats].each do |k|
-        extensions << if exts = details[k]
-          '(?:' + exts.map {|e| "\\.#{Regexp.escape(e.to_s)}"}.join('|') + ')?'
-        else
-          k == :formats ? formats_regexp : ''
-        end
+      templates = []
+      @hash.select { |k,v| k =~ /^#{query}$/ }.each do |path, source|
+        templates << Template.new(source, path, *path_to_details(path))
       end
-
-      %r'^#{Regexp.escape(path)}#{extensions}#{handler_regexp}$'
+      templates.sort_by {|t| -t.details.values.compact.size }
     end
 
-    # TODO: fix me
-    # :api: plugin
-    def path_to_details(path)
-      # [:erb, :format => :html, :locale => :en, :partial => true/false]
-      if m = path.match(%r'(_)?[\w-]+((?:\.[\w-]+)*)\.(\w+)$')
-        partial = m[1] == '_'
-        details = (m[2]||"").split('.').reject { |e| e.empty? }
-        handler = Template.handler_class_for_extension(m[3])
-
-        format  = Mime[details.last] && details.pop.to_sym
-        locale  = details.last && details.pop.to_sym
-
-        return handler, :format => format, :locale => locale, :partial => partial
-      end
-    end
   end
 end
\ No newline at end of file
diff --git a/actionpack/test/new_base/base_test.rb b/actionpack/test/new_base/base_test.rb
index 1b2e917ced..effde324bc 100644
--- a/actionpack/test/new_base/base_test.rb
+++ b/actionpack/test/new_base/base_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 # Tests the controller dispatching happy path
 module Dispatching
@@ -65,4 +65,4 @@ module Dispatching
       assert_equal 'contained_empty', Submodule::ContainedEmptyController.controller_name
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/content_negotiation_test.rb b/actionpack/test/new_base/content_negotiation_test.rb
new file mode 100644
index 0000000000..c43cb677f8
--- /dev/null
+++ b/actionpack/test/new_base/content_negotiation_test.rb
@@ -0,0 +1,18 @@
+require 'abstract_unit'
+
+module ContentNegotiation
+
+  # This has no layout and it works
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "content_negotiation/basic/hello.html.erb" => "Hello world <%= request.formats %>!"
+    )]
+  end
+
+  class TestContentNegotiation < SimpleRouteCase
+    test "A */* Accept header will return HTML" do
+      get "/content_negotiation/basic/hello", {}, "HTTP_ACCEPT" => "*/*"
+      assert_body "Hello world */*!"
+    end
+  end
+end
diff --git a/actionpack/test/new_base/content_type_test.rb b/actionpack/test/new_base/content_type_test.rb
index ceee508224..898d0bb9f3 100644
--- a/actionpack/test/new_base/content_type_test.rb
+++ b/actionpack/test/new_base/content_type_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module ContentType
   class BaseController < ActionController::Base
diff --git a/actionpack/test/new_base/etag_test.rb b/actionpack/test/new_base/etag_test.rb
index 3a69e7dac4..d5b7942ab6 100644
--- a/actionpack/test/new_base/etag_test.rb
+++ b/actionpack/test/new_base/etag_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module Etags
   class BasicController < ActionController::Base
@@ -43,4 +43,4 @@ module Etags
       %("#{Digest::MD5.hexdigest(text)}")
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/metal_test.rb b/actionpack/test/new_base/metal_test.rb
index 2b7720863a..e1d46b906e 100644
--- a/actionpack/test/new_base/metal_test.rb
+++ b/actionpack/test/new_base/metal_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module MetalTest
   class MetalMiddleware < ActionController::Middleware
@@ -41,4 +41,3 @@ module MetalTest
     end
   end
 end
-
diff --git a/actionpack/test/new_base/middleware_test.rb b/actionpack/test/new_base/middleware_test.rb
new file mode 100644
index 0000000000..ada0215b1a
--- /dev/null
+++ b/actionpack/test/new_base/middleware_test.rb
@@ -0,0 +1,77 @@
+require 'abstract_unit'
+
+module MiddlewareTest
+  class MyMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      result = @app.call(env)
+      result[1]["Middleware-Test"] = "Success"
+      result[1]["Middleware-Order"] = "First"
+      result
+    end
+  end
+
+  class ExclaimerMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      result = @app.call(env)
+      result[1]["Middleware-Order"] << "!"
+      result
+    end
+  end
+
+  class MyController < ActionController::Metal
+    use MyMiddleware
+
+    middleware.insert_before MyMiddleware, ExclaimerMiddleware
+
+    def index
+      self.response_body = "Hello World"
+    end
+  end
+
+  class InheritedController < MyController
+  end
+
+  module MiddlewareTests
+    extend ActiveSupport::Testing::Declarative
+
+    test "middleware that is 'use'd is called as part of the Rack application" do
+      result = @app.call(env_for("/"))
+      assert_equal "Hello World", result[2]
+      assert_equal "Success", result[1]["Middleware-Test"]
+    end
+
+    test "the middleware stack is exposed as 'middleware' in the controller" do
+      result = @app.call(env_for("/"))
+      assert_equal "First!", result[1]["Middleware-Order"]
+    end
+  end
+
+  class TestMiddleware < ActiveSupport::TestCase
+    include MiddlewareTests
+
+    def setup
+      @app = MyController.action(:index)
+    end
+
+    def env_for(url)
+      Rack::MockRequest.env_for(url)
+    end
+  end
+
+  class TestInheritedMiddleware < TestMiddleware
+    def setup
+      @app = InheritedController.action(:index)
+    end
+
+    test "middleware inherits" do
+    end
+  end
+end
diff --git a/actionpack/test/new_base/redirect_test.rb b/actionpack/test/new_base/redirect_test.rb
deleted file mode 100644
index e591ebd05f..0000000000
--- a/actionpack/test/new_base/redirect_test.rb
+++ /dev/null
@@ -1 +0,0 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
\ No newline at end of file
diff --git a/actionpack/test/new_base/render_action_test.rb b/actionpack/test/new_base/render_action_test.rb
index dfa7cc2141..d5896c1ebd 100644
--- a/actionpack/test/new_base/render_action_test.rb
+++ b/actionpack/test/new_base/render_action_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module RenderAction
   # This has no layout and it works
@@ -317,4 +317,4 @@ module RenderActionWithBothLayouts
       assert_status 200
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_file_test.rb b/actionpack/test/new_base/render_file_test.rb
index 769949be0c..c4098855e6 100644
--- a/actionpack/test/new_base/render_file_test.rb
+++ b/actionpack/test/new_base/render_file_test.rb
@@ -1,9 +1,9 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module RenderFile
   
   class BasicController < ActionController::Base
-    self.view_paths = "."
+      self.view_paths = File.dirname(__FILE__)
     
     def index
       render :file => File.join(File.dirname(__FILE__), *%w[.. fixtures test hello_world])
@@ -107,4 +107,4 @@ module RenderFile
     end
   end
   
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_implicit_action_test.rb b/actionpack/test/new_base/render_implicit_action_test.rb
index fd96e1955f..2b78fa7d4f 100644
--- a/actionpack/test/new_base/render_implicit_action_test.rb
+++ b/actionpack/test/new_base/render_implicit_action_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module RenderImplicitAction
   class SimpleController < ::ApplicationController
@@ -25,4 +25,4 @@ module RenderImplicitAction
       assert_status 200
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_layout_test.rb b/actionpack/test/new_base/render_layout_test.rb
index 933eef58e7..f840a47ecf 100644
--- a/actionpack/test/new_base/render_layout_test.rb
+++ b/actionpack/test/new_base/render_layout_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module ControllerLayouts
   class ImplicitController < ::ApplicationController
@@ -98,4 +98,4 @@ module ControllerLayouts
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_partial_test.rb b/actionpack/test/new_base/render_partial_test.rb
index bbb98a0c01..7c2c20e1c7 100644
--- a/actionpack/test/new_base/render_partial_test.rb
+++ b/actionpack/test/new_base/render_partial_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module RenderPartial
   
@@ -24,4 +24,4 @@ module RenderPartial
     end
   end
   
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_rjs_test.rb b/actionpack/test/new_base/render_rjs_test.rb
index 3d3e516905..7b76c54ab9 100644
--- a/actionpack/test/new_base/render_rjs_test.rb
+++ b/actionpack/test/new_base/render_rjs_test.rb
@@ -1,9 +1,7 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module RenderRjs
-
   class BasicController < ActionController::Base
-
     self.view_paths = [ActionView::FixtureResolver.new(
       "render_rjs/basic/index.js.rjs"          => "page[:customer].replace_html render(:partial => 'customer')",
       "render_rjs/basic/index_html.js.rjs"     => "page[:customer].replace_html :partial => 'customer'",
@@ -26,6 +24,14 @@ module RenderRjs
   class TestBasic < SimpleRouteCase
     testing BasicController
 
+    def setup
+      @old_locale = I18n.locale
+    end
+
+    def teardown
+      I18n.locale = @old_locale
+    end
+
     test "rendering a partial in an RJS template should pick the JS template over the HTML one" do
       get :index, "format" => "js"
       assert_response("$(\"customer\").update(\"JS Partial\");")
@@ -40,6 +46,5 @@ module RenderRjs
       get :index_locale, "format" => "js"
       assert_response("$(\"customer\").update(\"Danish HTML Partial\");")
     end
-
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_template_test.rb b/actionpack/test/new_base/render_template_test.rb
index 967cbd07b0..3b24c2d75a 100644
--- a/actionpack/test/new_base/render_template_test.rb
+++ b/actionpack/test/new_base/render_template_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module RenderTemplate
   class WithoutLayoutController < ActionController::Base
@@ -167,4 +167,4 @@ module RenderTemplate
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_test.rb b/actionpack/test/new_base/render_test.rb
index 5783b4766a..804be79d17 100644
--- a/actionpack/test/new_base/render_test.rb
+++ b/actionpack/test/new_base/render_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module Render
   class BlankRenderController < ActionController::Base
@@ -82,4 +82,4 @@ module Render
       assert_body "Controller Name: blank_render"
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_text_test.rb b/actionpack/test/new_base/render_text_test.rb
index 84f77432c9..f5839ee16f 100644
--- a/actionpack/test/new_base/render_text_test.rb
+++ b/actionpack/test/new_base/render_text_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module RenderText
   class SimpleController < ActionController::Base
@@ -134,4 +134,4 @@ module RenderText
       assert_status 200
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/render_xml_test.rb b/actionpack/test/new_base/render_xml_test.rb
index a3890ddfb2..d044738a78 100644
--- a/actionpack/test/new_base/render_xml_test.rb
+++ b/actionpack/test/new_base/render_xml_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit'
 
 module RenderXml
   
@@ -8,4 +8,4 @@ module RenderXml
       "render_xml/basic/with_render_erb" => "Hello world!"
     )]
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb
deleted file mode 100644
index b7ccd3db8d..0000000000
--- a/actionpack/test/new_base/test_helper.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'test/unit'
-require 'active_support'
-require 'active_support/test_case'
-require 'action_view'
-require 'fixture_template'
-
-begin
-  require 'ruby-debug'
-  Debugger.settings[:autoeval] = true
-  Debugger.start
-rescue LoadError
-  # Debugging disabled. `gem install ruby-debug` to enable.
-end
-
-require 'action_controller'
-require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
-
-require 'action_controller/testing/process'
-require 'action_controller/testing/integration'
-
-module Rails
-  def self.env
-    x = Object.new
-    def x.test?() true end
-    x
-  end
-end
-
-# Temporary base class
-class Rack::TestCase < ActionController::IntegrationTest
-  setup do
-    ActionController::Base.session_options[:key] = "abc"
-    ActionController::Base.session_options[:secret] = ("*" * 30)
-  end
-
-  def app
-    @app ||= ActionController::Dispatcher.new
-  end
-
-  def self.testing(klass = nil)
-    if klass
-      @testing = "/#{klass.name.underscore}".sub!(/_controller$/, '')
-    else
-      @testing
-    end
-  end
-
-  def get(thing, *args)
-    if thing.is_a?(Symbol)
-      super("#{self.class.testing}/#{thing}", *args)
-    else
-      super
-    end
-  end
-
-  def assert_body(body)
-    assert_equal body, Array.wrap(response.body).join
-  end
-
-  def assert_status(code)
-    assert_equal code, response.status
-  end
-
-  def assert_response(body, status = 200, headers = {})
-    assert_body   body
-    assert_status status
-    headers.each do |header, value|
-      assert_header header, value
-    end
-  end
-
-  def assert_content_type(type)
-    assert_equal type, response.headers["Content-Type"]
-  end
-
-  def assert_header(name, value)
-    assert_equal value, response.headers[name]
-  end
-end
-
-class ::ApplicationController < ActionController::Base
-end
-
-module ActionController
-  class << Routing
-    def possible_controllers
-      @@possible_controllers ||= []
-    end
-  end
-
-  class Base
-    def self.inherited(klass)
-      name = klass.name.underscore.sub(/_controller$/, '')
-      ActionController::Routing.possible_controllers << name unless name.blank?
-      super
-    end
-  end
-end
-
-class SimpleRouteCase < Rack::TestCase
-  setup do
-    ActionController::Routing::Routes.draw do |map|
-      map.connect ':controller/:action/:id'
-    end
-  end
-end
diff --git a/actionpack/test/old_base/abstract_unit.rb b/actionpack/test/old_base/abstract_unit.rb
deleted file mode 100644
index 3301041a41..0000000000
--- a/actionpack/test/old_base/abstract_unit.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-if ENV['new_base']
-  puts *caller
-  raise 'new_base/abstract_unit already loaded'
-end
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
-$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
-$:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
-
-require 'rubygems'
-require 'yaml'
-require 'stringio'
-require 'test/unit'
-
-begin
-  require 'ruby-debug'
-  Debugger.settings[:autoeval] = true
-  Debugger.start
-rescue LoadError
-  # Debugging disabled. `gem install ruby-debug` to enable.
-end
-
-require 'action_controller'
-require 'action_controller/testing/process'
-require 'action_view/test_case'
-
-$tags[:old_base] = true
-
-# Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true
-
-ActionController::Base.logger = nil
-ActionController::Routing::Routes.reload rescue nil
-
-ActionController::Base.session_store = nil
-
-# Register danish language for testing
-I18n.backend.store_translations 'da', {}
-I18n.backend.store_translations 'pt-BR', {}
-ORIGINAL_LOCALES = I18n.available_locales.map {|locale| locale.to_s }.sort
-
-FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
-ActionController::Base.view_paths = FIXTURE_LOAD_PATH
diff --git a/actionpack/test/runner b/actionpack/test/runner
deleted file mode 100755
index c2bbe63c75..0000000000
--- a/actionpack/test/runner
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-
-ARGV.each do |arg|
-  Dir["#{Dir.pwd}/#{arg}/**/*_test.rb"].each do |file|
-    require file
-  end
-end
\ No newline at end of file
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 28f9d48671..83fc6a282c 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -213,11 +213,11 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_javascript_include_tag_with_missing_source
-    assert_raise(Errno::ENOENT) {
+    assert_nothing_raised {
       javascript_include_tag('missing_security_guard')
     }
 
-    assert_raise(Errno::ENOENT) {
+    assert_nothing_raised {
       javascript_include_tag(:defaults, 'missing_security_guard')
     }
 
@@ -276,7 +276,7 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_stylesheet_link_tag_with_missing_source
-    assert_raise(Errno::ENOENT) {
+    assert_nothing_raised {
       stylesheet_link_tag('missing_security_guard')
     }
 
@@ -639,6 +639,40 @@ class AssetTagHelperTest < ActionView::TestCase
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
   end
 
+  def test_caching_javascript_include_tag_when_caching_on_and_missing_javascript_file
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.perform_caching = true
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'missing_security_guard', :cache => true)
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'missing_security_guard', :cache => "money")
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+  end
+
+  def test_caching_javascript_include_tag_when_caching_off_and_missing_javascript_file
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.perform_caching = false
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'missing_security_guard', :cache => true)
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'missing_security_guard', :cache => "money")
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
+  end
+
   def test_caching_stylesheet_link_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = 'http://a0.example.com'
@@ -709,7 +743,6 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_when_caching_on_and_missing_css_file
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_raise(Errno::ENOENT) {
@@ -729,6 +762,27 @@ class AssetTagHelperTest < ActionView::TestCase
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   end
 
+  def test_caching_stylesheet_link_tag_when_caching_off_and_missing_css_file
+    ENV["RAILS_ASSET_ID"] = ""
+    ActionController::Base.perform_caching = false
+
+    assert_raise(Errno::ENOENT) {
+      stylesheet_link_tag('bank', 'robber', 'missing_security_guard', :cache => true)
+    }
+
+    assert ! File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+
+    assert_raise(Errno::ENOENT) {
+      stylesheet_link_tag('bank', 'robber', 'missing_security_guard', :cache => "money")
+    }
+
+    assert ! File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+
+  ensure
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+    FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
+  end
+
   def test_caching_stylesheet_link_tag_when_caching_on_with_proc_asset_host
     ENV["RAILS_ASSET_ID"] = ""
     ActionController::Base.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index 7734e6da73..632988bb2e 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -14,6 +14,9 @@ class CompiledTemplatesTest < Test::Unit::TestCase
     assert_equal "two", render(:file => "test/render_file_with_locals_and_default.erb", :locals => { :secret => "two" })
   end
 
+  # This is broken in 1.8.6 (not supported in Rails 3.0) because the cache uses a Hash
+  # key. Since Ruby 1.8.6 implements Hash#hash using the hash's object_id, it will never
+  # successfully get a cache hit here.
   def test_template_changes_are_not_reflected_with_cached_templates
     assert_equal "Hello world!", render(:file => "test/hello_world.erb")
     modify_template "test/hello_world.erb", "Goodbye world!" do
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 8fd018f86d..be15b06372 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -784,6 +784,42 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_with_an_empty_supplied_attributes_collection
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:comments, []) do |cf|
+        concat cf.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_supplied_nested_attributes_collection
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+
+    form_for(:post, @post) do |f|
+      concat f.text_field(:title)
+      f.fields_for(:comments, @post.comments) do |cf|
+        concat cf.text_field(:name)
+      end
+    end
+
+    expected = '<form action="http://www.example.com" method="post">' +
+               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+               '</form>'
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_nested_fields_for_on_a_nested_attributes_collection_association_yields_only_builder
     @post.comments = [Comment.new(321), Comment.new]
     yielded_comments = []
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index aa40e46aa8..f3cdab05bf 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'tzinfo'
+require 'active_support/vendor/tzinfo'
 
 TZInfo::Timezone.cattr_reader :loaded_zones
 
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index c86d5215cd..3c192906ae 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -33,18 +33,14 @@ module RenderTestCases
   end
 
   def test_render_file_with_localization
-    begin
-      old_locale = I18n.locale
-      I18n.locale = :da
-      assert_equal "Hey verden", @view.render(:file => "test/hello_world")
-    ensure
-      I18n.locale = old_locale
-    end
+    old_locale, I18n.locale = I18n.locale, :da
+    assert_equal "Hey verden", @view.render(:file => "test/hello_world")
+  ensure
+    I18n.locale = old_locale
   end
 
   def test_render_file_with_dashed_locale
-    old_locale = I18n.locale
-    I18n.locale = :"pt-BR"
+    old_locale, I18n.locale = I18n.locale, :"pt-BR"
     assert_equal "Ola mundo", @view.render(:file => "test/hello_world")
   ensure
     I18n.locale = old_locale
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 0e24fbd24d..447d520ef1 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'abstract_unit'
+require 'controller/fake_controllers'
 
 RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)
 
@@ -367,25 +368,25 @@ class UrlHelperTest < ActionView::TestCase
   end
 end
 
-class UrlHelperWithControllerTest < ActionView::TestCase
-  class UrlHelperController < ActionController::Base
-    def self.controller_path; 'url_helper_with_controller' end
-
-    def show_url_for
-      render :inline => "<%= url_for :controller => 'url_helper_with_controller', :action => 'show_url_for' %>"
-    end
+class UrlHelperController < ActionController::Base
+  def self.controller_path; 'url_helper_with_controller' end
 
-    def show_named_route
-      render :inline => "<%= show_named_route_#{params[:kind]} %>"
-    end
+  def show_url_for
+    render :inline => "<%= url_for :controller => 'url_helper_with_controller', :action => 'show_url_for' %>"
+  end
 
-    def nil_url_for
-      render :inline => '<%= url_for(nil) %>'
-    end
+  def show_named_route
+    render :inline => "<%= show_named_route_#{params[:kind]} %>"
+  end
 
-    def rescue_action(e) raise e end
+  def nil_url_for
+    render :inline => '<%= url_for(nil) %>'
   end
 
+  def rescue_action(e) raise e end
+end
+
+class UrlHelperWithControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup
@@ -416,7 +417,7 @@ class UrlHelperWithControllerTest < ActionView::TestCase
 
   def test_url_for_nil_returns_current_path
     get :nil_url_for
-    assert_equal '/url_helper_with_controller/nil_url_for', @response.body
+    assert_equal '/url_helper/nil_url_for', @response.body
   end
 
   def test_named_route_should_show_host_and_path_using_controller_default_url_options
@@ -436,35 +437,33 @@ class UrlHelperWithControllerTest < ActionView::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_with_controller', :action => 'show_named_route'
+          map.show_named_route 'url_helper_with_controller/show_named_route', :controller => 'url_helper', :action => 'show_named_route'
         end
         yield
       end
     end
 end
 
-class LinkToUnlessCurrentWithControllerTest < ActionView::TestCase
-  class TasksController < ActionController::Base
-    def self.controller_path; 'tasks' end
-
-    def index
-      render_default
-    end
+class TasksController < ActionController::Base
+  def index
+    render_default
+  end
 
-    def show
-      render_default
-    end
+  def show
+    render_default
+  end
 
-    def rescue_action(e) raise e end
+  def rescue_action(e) raise e end
 
-    protected
-      def render_default
-        render :inline =>
-          "<%= link_to_unless_current(\"tasks\", tasks_path) %>\n" +
-          "<%= link_to_unless_current(\"tasks\", tasks_url) %>"
-      end
-  end
+  protected
+    def render_default
+      render :inline =>
+        "<%= link_to_unless_current(\"tasks\", tasks_path) %>\n" +
+        "<%= link_to_unless_current(\"tasks\", tasks_url) %>"
+    end
+end
 
+class LinkToUnlessCurrentWithControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup
@@ -537,41 +536,37 @@ class Session
   end
 end
 
-class PolymorphicControllerTest < ActionView::TestCase
-  class WorkshopsController < ActionController::Base
-    def self.controller_path; 'workshops' end
-
-    def index
-      @workshop = Workshop.new(1, true)
-      render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
-    end
-
-    def show
-      @workshop = Workshop.new(params[:id], false)
-      render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
-    end
-
-    def rescue_action(e) raise e end
+class WorkshopsController < ActionController::Base
+  def index
+    @workshop = Workshop.new(1, true)
+    render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
   end
 
-  class SessionsController < ActionController::Base
-    def self.controller_path; 'sessions' end
+  def show
+    @workshop = Workshop.new(params[:id], false)
+    render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
+  end
 
-    def index
-      @workshop = Workshop.new(params[:workshop_id], false)
-      @session = Session.new(1, true)
-      render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
-    end
+  def rescue_action(e) raise e end
+end
 
-    def show
-      @workshop = Workshop.new(params[:workshop_id], false)
-      @session = Session.new(params[:id], false)
-      render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
-    end
+class SessionsController < ActionController::Base
+  def index
+    @workshop = Workshop.new(params[:workshop_id], false)
+    @session = Session.new(1, true)
+    render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
+  end
 
-    def rescue_action(e) raise e end
+  def show
+    @workshop = Workshop.new(params[:workshop_id], false)
+    @session = Session.new(params[:id], false)
+    render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
   end
 
+  def rescue_action(e) raise e end
+end
+
+class PolymorphicControllerTest < ActionView::TestCase
   tests ActionView::Helpers::UrlHelper
 
   def setup