Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

60 files changed, 1262 insertions, 919 deletions

diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 4ad87d9762..f70d497481 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -59,11 +59,11 @@ module AbstractController
       end
 
       def rendering_to_body
-        self.response_body = render_to_body :_template_name => "naked_render.erb"
+        self.response_body = render_to_body :template => "naked_render.erb"
       end
 
       def rendering_to_string
-        self.response_body = render_to_string :_template_name => "naked_render.erb"
+        self.response_body = render_to_string :template => "naked_render.erb"
       end
     end
 
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index b6d89ea489..65a50807fd 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -8,41 +8,52 @@ module AbstractControllerTests
       include AbstractController::Rendering
       include AbstractController::Layouts
 
+      def _prefix
+        "template"
+      end
+
       self.view_paths = [ActionView::FixtureResolver.new(
-        "layouts/hello.erb"                     => "With String <%= yield %>",
-        "layouts/hello_override.erb"            => "With Override <%= yield %>",
-        "layouts/abstract_controller_tests/layouts/with_string_implied_child.erb" =>
-                                                   "With Implied <%= yield %>",
-        "layouts/overwrite.erb"                  => "Overwrite <%= yield %>",
-        "layouts/with_false_layout.erb"         => "False Layout <%= yield %>"
+        "abstract_controller_tests/layouts/with_string_implied_child.erb" =>
+                                           "With Implied <%= yield %>",
+        "layouts/hello.erb"             => "With String <%= yield %>",
+        "layouts/hello_override.erb"    => "With Override <%= yield %>",
+        "layouts/overwrite.erb"         => "Overwrite <%= yield %>",
+        "layouts/with_false_layout.erb" => "False Layout <%= yield %>"
       )]
     end
     
     class Blank < Base
-      self.view_paths = []
-      
+      self.view_paths = ActionView::FixtureResolver.new("template/index.erb" => "Hello blank!")
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello blank!")
+        render 
       end
     end
     
     class WithString < Base
       layout "hello"
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb"             => "Hello string!",
+        "template/overwrite_default.erb" => "Hello string!",
+        "template/overwrite_false.erb"   => "Hello string!",
+        "template/overwrite_string.erb"  => "Hello string!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello string!")
+        render
       end
 
       def overwrite_default
-        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => :default
+        render :layout => :default
       end
 
       def overwrite_false
-        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => false
+        render :layout => false
       end
 
       def overwrite_string
-        render :_template => ActionView::Template::Text.new("Hello string!"), :layout => "overwrite"
+        render :layout => "overwrite"
       end
 
       def overwrite_skip
@@ -70,18 +81,28 @@ module AbstractControllerTests
     class WithProc < Base
       layout proc { |c| "overwrite" }
 
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello proc!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello proc!")
+        render
       end
     end
 
     class WithSymbol < Base
       layout :hello
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello symbol!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello symbol!")
+        render
       end
-    private  
+
+    private
+
       def hello
         "overwrite"
       end
@@ -89,11 +110,17 @@ module AbstractControllerTests
     
     class WithSymbolReturningString < Base
       layout :no_hello
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello missing symbol!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello missing symbol!")
+        render
       end
-    private  
+
+    private
+
       def no_hello
         nil
       end
@@ -101,19 +128,28 @@ module AbstractControllerTests
     
     class WithSymbolReturningNil < Base
       layout :nilz
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello nilz!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello nilz!")
+        render
       end
       
-      def nilz() end
+      def nilz
+      end
     end
     
     class WithSymbolReturningObj < Base
       layout :objekt
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello object!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello nilz!")
+        render
       end
       
       def objekt
@@ -123,33 +159,49 @@ module AbstractControllerTests
     
     class WithSymbolAndNoMethod < Base
       layout :no_method
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello boom!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello boom!")
+        render
       end
     end
     
     class WithMissingLayout < Base
       layout "missing"
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello missing!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello missing!")
+        render
       end
     end
     
     class WithFalseLayout < Base
       layout false
-      
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello false!"
+      )
+
       def index
-        render :_template => ActionView::Template::Text.new("Hello false!")
+        render
       end
     end
     
     class WithNilLayout < Base
       layout nil
+
+      append_view_path ActionView::FixtureResolver.new(
+        "template/index.erb" => "Hello nil!"
+      )
       
       def index
-        render :_template => ActionView::Template::Text.new("Hello nil!")
+        render
       end
     end
     
diff --git a/actionpack/test/abstract/localized_cache_test.rb b/actionpack/test/abstract/localized_cache_test.rb
deleted file mode 100644
index 8b0b0fff03..0000000000
--- a/actionpack/test/abstract/localized_cache_test.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'abstract_unit'
-
-module AbstractController
-  module Testing
-  
-    class CachedController < AbstractController::Base
-      include AbstractController::Rendering
-      include AbstractController::LocalizedCache
-
-      self.view_paths = [ActionView::FixtureResolver.new(
-        "default.erb" => "With Default",
-        "template.erb" => "With Template",
-        "some/file.erb" => "With File",
-        "template_name.erb" => "With Template Name"
-      )]
-    end
-
-    class TestLocalizedCache < ActiveSupport::TestCase
-
-      def setup
-        @controller = CachedController.new
-        CachedController.clear_template_caches!
-      end
-
-      def test_templates_are_cached
-        @controller.render :template => "default.erb"
-        assert_equal "With Default", @controller.response_body
-
-        cached = @controller.class.template_cache
-        assert_equal 1, cached.size
-        assert_kind_of ActionView::Template, cached.values.first["default.erb"]
-      end
-
-      def test_cache_is_used
-        CachedController.new.render :template => "default.erb"
-
-        @controller.expects(:find_template).never
-        @controller.render :template => "default.erb"
-
-        assert_equal 1, @controller.class.template_cache.size
-      end
-
-      def test_cache_changes_with_locale
-        CachedController.new.render :template => "default.erb"
-
-        I18n.locale = :es
-        @controller.render :template => "default.erb"
-
-        assert_equal 2, @controller.class.template_cache.size
-      ensure
-        I18n.locale = :en
-      end
-
-    end
-
-  end
-end
diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index db924633ca..25dc8bd804 100644
--- a/actionpack/test/abstract/render_test.rb
+++ b/actionpack/test/abstract/render_test.rb
@@ -15,13 +15,8 @@ module AbstractController
         "renderer/default.erb" => "With Default",
         "renderer/string.erb" => "With String",
         "renderer/symbol.erb" => "With Symbol",
-        "renderer/template_name.erb" => "With Template Name",
         "string/with_path.erb" => "With String With Path",
-        "some/file.erb" => "With File",
-        "with_format.html.erb" => "With html format",
-        "with_format.xml.erb" => "With xml format",
-        "with_locale.en.erb" => "With en locale",
-        "with_locale.pl.erb" => "With pl locale"
+        "some/file.erb" => "With File"
       )]
 
       def template
@@ -55,30 +50,6 @@ module AbstractController
       def symbol
         render :symbol
       end
-
-      def template_name
-        render :_template_name => :template_name
-      end
-
-      def object
-        render :_template => ActionView::Template::Text.new("With Object")
-      end
-
-      def with_html_format
-        render :template => "with_format", :format => :html
-      end
-
-      def with_xml_format
-        render :template => "with_format", :format => :xml
-      end
-
-      def with_en_locale
-        render :template => "with_locale"
-      end
-
-      def with_pl_locale
-        render :template => "with_locale", :locale => :pl
-      end
     end
 
     class TestRenderer < ActiveSupport::TestCase
@@ -126,36 +97,6 @@ module AbstractController
         @controller.process(:string_with_path)
         assert_equal "With String With Path", @controller.response_body
       end
-
-      def test_render_template_name
-        @controller.process(:template_name)
-        assert_equal "With Template Name", @controller.response_body
-      end
-
-      def test_render_object
-        @controller.process(:object)
-        assert_equal "With Object", @controller.response_body
-      end
-
-      def test_render_with_html_format
-        @controller.process(:with_html_format)
-        assert_equal "With html format", @controller.response_body
-      end
-
-      def test_render_with_xml_format
-        @controller.process(:with_xml_format)
-        assert_equal "With xml format", @controller.response_body
-      end
-
-      def test_render_with_en_locale
-        @controller.process(:with_en_locale)
-        assert_equal "With en locale", @controller.response_body
-      end
-
-      def test_render_with_pl_locale
-        @controller.process(:with_pl_locale)
-        assert_equal "With pl locale", @controller.response_body
-      end
     end
   end
 end
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 867e50d5b9..67aa412d3d 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -1,5 +1,11 @@
 require File.expand_path('../../../load_paths', __FILE__)
 
+lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
+activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
+$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
+
 $:.unshift(File.dirname(__FILE__) + '/lib')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
@@ -10,7 +16,6 @@ require 'test/unit'
 require 'abstract_controller'
 require 'action_controller'
 require 'action_view'
-require 'action_view/base'
 require 'action_dispatch'
 require 'fixture_template'
 require 'active_support/dependencies'
@@ -64,29 +69,66 @@ module SetupOnce
     end
 end
 
-class ActiveSupport::TestCase
-  include SetupOnce
+SharedTestRoutes = ActionDispatch::Routing::RouteSet.new
+
+module ActiveSupport
+  class TestCase
+    include SetupOnce
+    # Hold off drawing routes until all the possible controller classes
+    # have been loaded.
+    setup_once do
+      SharedTestRoutes.draw do |map|
+        # FIXME: match ':controller(/:action(/:id))'
+        map.connect ':controller/:action/:id'
+      end
+
+      ActionController::IntegrationTest.app.router.draw do |map|
+        # FIXME: match ':controller(/:action(/:id))'
+        map.connect ':controller/:action/:id'
+      end
+    end
+  end
+end
+
+class RoutedRackApp
+  attr_reader :router
+  alias routes router
+
+  def initialize(router, &blk)
+    @router = router
+    @stack = ActionDispatch::MiddlewareStack.new(&blk).build(@router)
+  end
+
+  def call(env)
+    @stack.call(env)
+  end
+end
 
-  # Hold off drawing routes until all the possible controller classes
-  # have been loaded.
-  setup_once do
-    ActionController::Routing::Routes.draw do |map|
-      match ':controller(/:action(/:id))'
+class BasicController
+  attr_accessor :request
+
+  def config
+    @config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|
+      # VIEW TODO: View tests should not require a controller
+      public_dir = File.expand_path("../fixtures/public", __FILE__)
+      config.assets_dir = public_dir
+      config.javascripts_dir = "#{public_dir}/javascripts"
+      config.stylesheets_dir = "#{public_dir}/stylesheets"
+      config
     end
   end
 end
 
 class ActionController::IntegrationTest < ActiveSupport::TestCase
   def self.build_app(routes = nil)
-    ActionDispatch::Flash
-    ActionDispatch::MiddlewareStack.new { |middleware|
+    RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
       middleware.use "ActionDispatch::ShowExceptions"
       middleware.use "ActionDispatch::Callbacks"
       middleware.use "ActionDispatch::ParamsParser"
       middleware.use "ActionDispatch::Cookies"
       middleware.use "ActionDispatch::Flash"
       middleware.use "ActionDispatch::Head"
-    }.build(routes || ActionController::Routing::Routes)
+    end
   end
 
   self.app = build_app
@@ -112,28 +154,22 @@ class ActionController::IntegrationTest < ActiveSupport::TestCase
   end
 
   def with_routing(&block)
-    real_routes = ActionController::Routing::Routes
-    ActionController::Routing.module_eval { remove_const :Routes }
-
-    temporary_routes = ActionController::Routing::RouteSet.new
-    self.class.app = self.class.build_app(temporary_routes)
-    ActionController::Routing.module_eval { const_set :Routes, temporary_routes }
+    temporary_routes = ActionDispatch::Routing::RouteSet.new
+    old_app, self.class.app = self.class.app, self.class.build_app(temporary_routes)
+    old_routes = SharedTestRoutes
+    silence_warnings { Object.const_set(:SharedTestRoutes, temporary_routes) }
 
     yield temporary_routes
   ensure
-    if ActionController::Routing.const_defined? :Routes
-      ActionController::Routing.module_eval { remove_const :Routes }
-    end
-    ActionController::Routing.const_set(:Routes, real_routes) if real_routes
-    self.class.app = self.class.build_app
+    self.class.app = old_app
+    silence_warnings { Object.const_set(:SharedTestRoutes, old_routes) }
   end
 end
 
 # Temporary base class
 class Rack::TestCase < ActionController::IntegrationTest
   setup do
-    ActionController::Base.session_options[:key] = "abc"
-    ActionController::Base.session_options[:secret] = ("*" * 30)
+    ActionController::Base.config.secret = "abc" * 30
   end
 
   def self.testing(klass = nil)
@@ -180,6 +216,16 @@ end
 class ::ApplicationController < ActionController::Base
 end
 
+module ActionView
+  class TestCase
+    # Must repeat the setup because AV::TestCase is a duplication
+    # of AC::TestCase
+    setup do
+      @router = SharedTestRoutes
+    end
+  end
+end
+
 module ActionController
   class Base
     include ActionController::Testing
@@ -190,6 +236,10 @@ module ActionController
   class TestCase
     include ActionDispatch::TestProcess
 
+    setup do
+      @router = SharedTestRoutes
+    end
+
     def assert_template(options = {}, message = nil)
       validate_request!
 
@@ -232,3 +282,10 @@ module ActionController
     end
   end
 end
+
+# This stub emulates the Railtie including the URL helpers from a Rails application
+module ActionController
+  class Base
+    include SharedTestRoutes.url_helpers
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
index ed8e324938..331f861d8f 100644
--- a/actionpack/test/activerecord/controller_runtime_test.rb
+++ b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -1,37 +1,37 @@
 require 'active_record_unit'
 require 'active_record/railties/controller_runtime'
 require 'fixtures/project'
-require 'rails/subscriber/test_helper'
-require 'action_controller/railties/subscriber'
+require 'rails/log_subscriber/test_helper'
+require 'action_controller/railties/log_subscriber'
 
 ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime
 
-class ControllerRuntimeSubscriberTest < ActionController::TestCase
-  class SubscriberController < ActionController::Base
+class ControllerRuntimeLogSubscriberTest < ActionController::TestCase
+  class LogSubscriberController < ActionController::Base
     def show
       render :inline => "<%= Project.all %>"
     end
   end
-  
-  include Rails::Subscriber::TestHelper
-  tests SubscriberController
+
+  include Rails::LogSubscriber::TestHelper
+  tests LogSubscriberController
 
   def setup
-    @old_logger = ActionController::Base.logger
-    Rails::Subscriber.add(:action_controller, ActionController::Railties::Subscriber.new)
     super
+    @old_logger = ActionController::Base.logger
+    Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
   end
 
   def teardown
     super
-    Rails::Subscriber.subscribers.clear
+    Rails::LogSubscriber.log_subscribers.clear
     ActionController::Base.logger = @old_logger
   end
 
   def set_logger(logger)
     ActionController::Base.logger = logger
   end
- 
+
   def test_log_with_active_record
     get :show
     wait
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index ea82758cf5..5643ad5ad6 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -26,7 +26,7 @@ class Series < ActiveRecord::Base
 end
 
 class PolymorphicRoutesTest < ActionController::TestCase
-  include ActionController::UrlFor
+  include SharedTestRoutes.url_helpers
   self.default_url_options[:host] = 'example.com'
 
   def setup
@@ -400,7 +400,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
         map.resources :series
       end
 
-      ActionController::Routing::Routes.install_helpers(self.class)
+      self.class.send(:include, @router.url_helpers)
       yield
     end
   end
@@ -422,7 +422,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
         end
       end
 
-      ActionController::Routing::Routes.install_helpers(self.class)
+      self.class.send(:include, @router.url_helpers)
       yield
     end
   end
@@ -441,7 +441,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
         end
       end
 
-      ActionController::Routing::Routes.install_helpers(self.class)
+      self.class.send(:include, @router.url_helpers)
       yield
     end
   end
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index d54be9bdc0..26e0d6d844 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -253,12 +253,14 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   end
 
   def test_assert_redirect_to_nested_named_route
+    @controller = Admin::InnerModuleController.new
+
     with_routing do |set|
       set.draw do |map|
         match 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
-        match ':controller/:action'
+        # match ':controller/:action'
+        map.connect ':controller/:action/:id'
       end
-      @controller = Admin::InnerModuleController.new
       process :redirect_to_index
       # redirection is <{"action"=>"index", "controller"=>"admin/admin/inner_module"}>
       assert_redirected_to admin_inner_module_path
@@ -266,12 +268,14 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   end
 
   def test_assert_redirected_to_top_level_named_route_from_nested_controller
+    @controller = Admin::InnerModuleController.new
+
     with_routing do |set|
       set.draw do |map|
         match '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
-        match ':controller/:action'
+        # match ':controller/:action'
+        map.connect ':controller/:action/:id'
       end
-      @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
       # assert_redirected_to "http://test.host/action_pack_assertions/foo" would pass because of exact match early return
       assert_redirected_to "/action_pack_assertions/foo"
@@ -279,13 +283,15 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   end
 
   def test_assert_redirected_to_top_level_named_route_with_same_controller_name_in_both_namespaces
+    @controller = Admin::InnerModuleController.new
+
     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
         match '/user/:id', :to => 'user#index', :as => :top_level
-        match ':controller/:action'
+        # match ':controller/:action'
+        map.connect ':controller/:action/:id'
       end
-      @controller = Admin::InnerModuleController.new
       process :redirect_to_top_level_named_route
       # assert_redirected_to top_level_url('foo') would pass because of exact match early return
       assert_redirected_to top_level_path('foo')
@@ -463,9 +469,11 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     assert_redirected_to '/some/path'
   end
 
-  def test_redirected_to_url_no_leadling_slash
+  def test_redirected_to_url_no_leading_slash_fails
     process :redirect_to_path
-    assert_redirected_to 'some/path'
+    assert_raise ActiveSupport::TestCase::Assertion do
+      assert_redirected_to 'some/path'
+    end
   end
 
   def test_redirected_to_url_full_url
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index 612827dd41..cb3e848dfa 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -6,18 +6,7 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 
-
-unless defined?(ActionMailer)
-  begin
-    $:.unshift("#{File.dirname(__FILE__)}/../../../actionmailer/lib")
-    require 'action_mailer'
-  rescue LoadError => e
-    raise unless e.message =~ /action_mailer/
-    require 'rubygems'
-    gem 'actionmailer'
-  end
-end
-
+require 'action_mailer'
 ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
 
 class AssertSelectTest < ActionController::TestCase
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 4fcfbacf4e..f047e7da30 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -66,6 +66,19 @@ class DefaultUrlOptionsController < ActionController::Base
   end
 end
 
+class UrlOptionsController < ActionController::Base
+  def from_view
+    render :inline => "<%= #{params[:route]} %>"
+  end
+
+  def url_options
+    super.merge(:host => 'www.override.com', :action => 'new', :locale => 'en')
+  end
+end
+
+class RecordIdentifierController < ActionController::Base
+end
+
 class ControllerClassTests < ActiveSupport::TestCase
   def test_controller_path
     assert_equal 'empty', EmptyController.controller_path
@@ -92,6 +105,11 @@ class ControllerClassTests < ActiveSupport::TestCase
 
     assert_equal [:password], parameters
   end
+
+  def test_record_identifier
+    assert_respond_to RecordIdentifierController.new, :dom_id
+    assert_respond_to RecordIdentifierController.new, :dom_class
+  end
 end
 
 class ControllerInstanceTests < Test::Unit::TestCase
@@ -113,6 +131,15 @@ class ControllerInstanceTests < Test::Unit::TestCase
       assert_equal Set.new(%w(public_action)), c.class.__send__(:action_methods), "#{c.controller_path} should not be empty!"
     end
   end
+
+  def test_temporary_anonymous_controllers
+    name = 'ExamplesController'
+    klass = Class.new(ActionController::Base)
+    Object.const_set(name, klass)
+
+    controller = klass.new
+    assert_equal "examples", controller.controller_path
+  end
 end
 
 class PerformActionTest < ActionController::TestCase
@@ -153,6 +180,31 @@ class PerformActionTest < ActionController::TestCase
   end
 end
 
+class UrlOptionsTest < ActionController::TestCase
+  tests UrlOptionsController
+
+  def setup
+    super
+    @request.host = 'www.example.com'
+    rescue_action_in_public!
+  end
+
+  def test_url_options_override
+    with_routing do |set|
+      set.draw do |map|
+        match 'from_view', :to => 'url_options#from_view', :as => :from_view
+        match ':controller/:action'
+      end
+
+      get :from_view, :route => "from_view_url"
+
+      assert_equal 'http://www.override.com/from_view?locale=en', @response.body
+      assert_equal 'http://www.override.com/from_view?locale=en', @controller.send(:from_view_url)
+      assert_equal 'http://www.override.com/default_url_options/new?locale=en', @controller.url_for(:controller => 'default_url_options')
+    end
+  end  
+end
+
 class DefaultUrlOptionsTest < ActionController::TestCase
   tests DefaultUrlOptionsController
 
@@ -162,7 +214,7 @@ class DefaultUrlOptionsTest < ActionController::TestCase
     rescue_action_in_public!
   end
 
-  def test_default_url_options_are_used_if_set
+  def test_default_url_options_override
     with_routing do |set|
       set.draw do |map|
         match 'from_view', :to => 'default_url_options#from_view', :as => :from_view
@@ -219,12 +271,15 @@ class EmptyUrlOptionsTest < ActionController::TestCase
   end
 
   def test_named_routes_with_path_without_doing_a_request_first
+    @controller = EmptyController.new
+    @controller.request = @request
+
     with_routing do |set|
       set.draw do |map|
         resources :things
       end
 
-      assert_equal '/things', EmptyController.new.send(:things_path)
+      assert_equal '/things', @controller.send(:things_path)
     end
   end
 end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index de92fc56fd..a3c8fdbb6e 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -6,12 +6,18 @@ CACHE_DIR = 'test_cache'
 # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
 FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
 ActionController::Base.page_cache_directory = FILE_STORE_PATH
-ActionController::Base.cache_store = :file_store, FILE_STORE_PATH
 
-class PageCachingTestController < ActionController::Base
+class CachingController < ActionController::Base
+  abstract!
+
+  self.cache_store = :file_store, FILE_STORE_PATH
+end
+
+class PageCachingTestController < CachingController
   caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? }
   caches_page :found, :not_found
 
+
   def ok
     head :ok
   end
@@ -51,12 +57,13 @@ class PageCachingTest < ActionController::TestCase
 
     @request = ActionController::TestRequest.new
     @request.host = 'hostname.com'
+    @request.env.delete('PATH_INFO')
 
     @response   = ActionController::TestResponse.new
     @controller = PageCachingTestController.new
+    @controller.cache_store = :file_store, FILE_STORE_PATH
 
-    @params = {:controller => 'posts', :action => 'index', :only_path => true, :skip_relative_url_root => true}
-    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+    @params = {:controller => 'posts', :action => 'index', :only_path => true}
 
     FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
     FileUtils.mkdir_p(FILE_STORE_PATH)
@@ -74,9 +81,9 @@ class PageCachingTest < ActionController::TestCase
         match '/', :to => 'posts#index', :as => :main
       end
       @params[:format] = 'rss'
-      assert_equal '/posts.rss', @rewriter.rewrite(@params)
+      assert_equal '/posts.rss', @router.url_for(@params)
       @params[:format] = nil
-      assert_equal '/', @rewriter.rewrite(@params)
+      assert_equal '/', @router.url_for(@params)
     end
   end
 
@@ -110,7 +117,7 @@ class PageCachingTest < ActionController::TestCase
   end
 
   def test_should_cache_ok_at_custom_path
-    @request.request_uri = "/index.html"
+    @request.env['PATH_INFO'] = '/index.html'
     get :ok
     assert_response :ok
     assert File.exist?("#{FILE_STORE_PATH}/index.html")
@@ -147,7 +154,7 @@ class PageCachingTest < ActionController::TestCase
     end
 end
 
-class ActionCachingTestController < ActionController::Base
+class ActionCachingTestController < CachingController
   rescue_from(Exception) { head 500 }
   if defined? ActiveRecord
     rescue_from(ActiveRecord::RecordNotFound) { head :not_found }
@@ -305,12 +312,9 @@ class ActionCacheTest < ActionController::TestCase
   end
 
   def test_action_cache_conditional_options
-    old_use_accept_header = ActionController::Base.use_accept_header
-    ActionController::Base.use_accept_header = true
     @request.env['HTTP_ACCEPT'] = 'application/json'
     get :index
     assert !fragment_exist?('hostname.com/action_caching_test')
-    ActionController::Base.use_accept_header = old_use_accept_header
   end
 
   def test_action_cache_with_store_options
@@ -511,6 +515,7 @@ class ActionCacheTest < ActionController::TestCase
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       @controller = ActionCachingTestController.new
+      @controller.singleton_class.send(:include, @router.url_helpers)
       @request.host = 'hostname.com'
     end
 
@@ -523,7 +528,7 @@ class ActionCacheTest < ActionController::TestCase
     end
 end
 
-class FragmentCachingTestController < ActionController::Base
+class FragmentCachingTestController < CachingController
   def some_action; end;
 end
 
@@ -532,8 +537,8 @@ class FragmentCachingTest < ActionController::TestCase
     super
     ActionController::Base.perform_caching = true
     @store = ActiveSupport::Cache::MemoryStore.new
-    ActionController::Base.cache_store = @store
     @controller = FragmentCachingTestController.new
+    @controller.cache_store = @store
     @params = {:controller => 'posts', :action => 'index'}
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
@@ -631,7 +636,7 @@ class FragmentCachingTest < ActionController::TestCase
 
 end
 
-class FunctionalCachingController < ActionController::Base
+class FunctionalCachingController < CachingController
   def fragment_cached
   end
 
@@ -665,8 +670,8 @@ class FunctionalFragmentCachingTest < ActionController::TestCase
     super
     ActionController::Base.perform_caching = true
     @store = ActiveSupport::Cache::MemoryStore.new
-    ActionController::Base.cache_store = @store
     @controller = FunctionalCachingController.new
+    @controller.cache_store = @store
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
   end
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index e5ffe20ecc..967107853b 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -145,18 +145,6 @@ end
 class AcceptBasedContentTypeTest < ActionController::TestCase
   tests OldContentTypeController
 
-  def setup
-    super
-    @_old_accept_header = ActionController::Base.use_accept_header
-    ActionController::Base.use_accept_header = true
-  end
-
-  def teardown
-    super
-    ActionController::Base.use_accept_header = @_old_accept_header
-  end
-
-
   def test_render_default_content_types_for_respond_to
     @request.accept = Mime::HTML.to_s
     get :render_default_content_types_for_respond_to
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
index f5ccef8aaf..908967a110 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/controller/cookie_test.rb
@@ -157,7 +157,7 @@ class CookieTest < ActionController::TestCase
     def assert_cookie_header(expected)
       header = @response.headers["Set-Cookie"]
       if header.respond_to?(:to_str)
-        assert_equal expected, header
+        assert_equal expected.split("\n").sort, header.split("\n").sort
       else
         assert_equal expected.split("\n"), header
       end
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index 7e9a2625f1..eb2af523a2 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -40,11 +40,13 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   setup do
     # Used as secret in generating nonce to prevent tampering of timestamp
-    @old_secret, ActionController::Base.session_options[:secret] = ActionController::Base.session_options[:secret], "session_options_secret"
+    @secret = "session_options_secret"
+    @controller.config.secret = @secret
+    # @old_secret, ActionController::Base.config.secret[:secret] = ActionController::Base.session_options[:secret], @secret
   end
 
   teardown do
-    ActionController::Base.session_options[:secret] = @old_secret
+    # ActionController::Base.session_options[:secret] = @old_secret
   end
 
   AUTH_HEADERS.each do |header|
@@ -138,7 +140,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "authentication request with request-uri that doesn't match credentials digest-uri" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
-    @request.env['REQUEST_URI'] = "/http_digest_authentication_test/dummy_digest/altered/uri"
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/altered/uri"
     get :display
 
     assert_response :unauthorized
@@ -147,7 +149,8 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "authentication request with absolute request uri (as in webrick)" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
-    @request.env['REQUEST_URI'] = "http://test.host/http_digest_authentication_test/dummy_digest"
+    @request.env["SERVER_NAME"] = "test.host"
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
 
     get :display
 
@@ -170,7 +173,8 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
   test "authentication request with absolute uri in both request and credentials (as in Webrick with IE)" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:url => "http://test.host/http_digest_authentication_test/dummy_digest",
                                                             :username => 'pretty', :password => 'please')
-    @request.env['REQUEST_URI'] = "http://test.host/http_digest_authentication_test/dummy_digest"
+    @request.env['SERVER_NAME'] = "test.host"
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
 
     get :display
 
@@ -202,7 +206,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "validate_digest_response should fail with nil returning password_procedure" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => nil, :password => nil)
-    assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@request, "SuperSecret"){nil}
+    assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@secret, @request, "SuperSecret"){nil}
   end
 
   private
@@ -225,7 +229,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
     credentials = decode_credentials(@response.headers['WWW-Authenticate'])
     credentials.merge!(options)
-    credentials.merge!(:uri => @request.env['REQUEST_URI'].to_s)
+    credentials.merge!(:uri => @request.env['PATH_INFO'].to_s)
     ActionController::HttpAuthentication::Digest.encode_credentials(method, credentials, password, options[:password_is_ha1])
   end
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 683ab5236c..2180466ca7 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -75,23 +75,6 @@ class SessionTest < Test::Unit::TestCase
     @session.delete_via_redirect(path, args, headers)
   end
 
-  def test_url_for_with_controller
-    options = {:action => 'show'}
-    mock_controller = mock()
-    mock_controller.expects(:url_for).with(options).returns('/show')
-    @session.stubs(:controller).returns(mock_controller)
-    assert_equal '/show', @session.url_for(options)
-  end
-
-  def test_url_for_without_controller
-    options = {:action => 'show'}
-    mock_rewriter = mock()
-    mock_rewriter.expects(:rewrite).with(options).returns('/show')
-    @session.stubs(:generic_url_rewriter).returns(mock_rewriter)
-    @session.stubs(:controller).returns(nil)
-    assert_equal '/show', @session.url_for(options)
-  end
-
   def test_get
     path = "/index"; params = "blah"; headers = {:location => 'blah'}
     @session.expects(:process).with(:get,path,params,headers)
@@ -195,8 +178,8 @@ class IntegrationTestTest < Test::Unit::TestCase
     session1 = @test.open_session { |sess| }
     session2 = @test.open_session # implicit session
 
-    assert_equal ::ActionController::Integration::Session, session1.class
-    assert_equal ::ActionController::Integration::Session, session2.class
+    assert_kind_of ::ActionController::Integration::Session, session1
+    assert_kind_of ::ActionController::Integration::Session, session2
     assert_not_equal session1, session2
   end
 
@@ -301,18 +284,13 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     end
   end
 
-  def test_cookie_monster
+  test 'response cookies are added to the cookie jar for the next request' do
     with_test_route_set do
       self.cookies['cookie_1'] = "sugar"
       self.cookies['cookie_2'] = "oatmeal"
       get '/cookie_monster'
-      assert_equal 410, status
-      assert_equal "Gone", status_message
-      assert_response 410
-      assert_response :gone
       assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"]
       assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies.to_hash)
-      assert_equal "Gone", response.body
     end
   end
 
@@ -350,7 +328,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     with_test_route_set do
       get '/get_with_params?foo=bar'
       assert_equal '/get_with_params?foo=bar', request.env["REQUEST_URI"]
-      assert_equal '/get_with_params?foo=bar', request.request_uri
+      assert_equal '/get_with_params?foo=bar', request.fullpath
       assert_equal "foo=bar", request.env["QUERY_STRING"]
       assert_equal 'foo=bar', request.query_string
       assert_equal 'bar', request.parameters['foo']
@@ -363,8 +341,8 @@ class IntegrationProcessTest < ActionController::IntegrationTest
   def test_get_with_parameters
     with_test_route_set do
       get '/get_with_params', :foo => "bar"
-      assert_equal '/get_with_params', request.env["REQUEST_URI"]
-      assert_equal '/get_with_params', request.request_uri
+      assert_equal '/get_with_params', request.env["PATH_INFO"]
+      assert_equal '/get_with_params', request.path_info
       assert_equal 'foo=bar', request.env["QUERY_STRING"]
       assert_equal 'foo=bar', request.query_string
       assert_equal 'bar', request.parameters['foo']
@@ -401,16 +379,26 @@ class IntegrationProcessTest < ActionController::IntegrationTest
   private
     def with_test_route_set
       with_routing do |set|
+        controller = ::IntegrationProcessTest::IntegrationController.clone
+        controller.class_eval do
+          include set.url_helpers
+        end
+
         set.draw do |map|
-          match ':action', :to => ::IntegrationProcessTest::IntegrationController
-          get 'get/:action', :to => ::IntegrationProcessTest::IntegrationController
+          match ':action', :to => controller
+          get 'get/:action', :to => controller
         end
+
+        self.singleton_class.send(:include, set.url_helpers)
+
         yield
       end
     end
 end
 
 class MetalIntegrationTest < ActionController::IntegrationTest
+  include SharedTestRoutes.url_helpers
+
   class Poller
     def self.call(env)
       if env["PATH_INFO"] =~ /^\/success/
diff --git a/actionpack/test/controller/subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index d7c1166f14..20d3e77b6e 100644
--- a/actionpack/test/controller/subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -1,9 +1,9 @@
 require "abstract_unit"
-require "rails/subscriber/test_helper"
-require "action_controller/railties/subscriber"
+require "rails/log_subscriber/test_helper"
+require "action_controller/railties/log_subscriber"
 
 module Another
-  class SubscribersController < ActionController::Base
+  class LogSubscribersController < ActionController::Base
     def show
       render :nothing => true
     end
@@ -35,24 +35,24 @@ module Another
   end
 end
 
-class ACSubscriberTest < ActionController::TestCase
-  tests Another::SubscribersController
-  include Rails::Subscriber::TestHelper
+class ACLogSubscriberTest < ActionController::TestCase
+  tests Another::LogSubscribersController
+  include Rails::LogSubscriber::TestHelper
 
   def setup
+    super
+
     @old_logger = ActionController::Base.logger
 
     @cache_path = File.expand_path('../temp/test_cache', File.dirname(__FILE__))
     ActionController::Base.page_cache_directory = @cache_path
-    ActionController::Base.cache_store = :file_store, @cache_path
-
-    Rails::Subscriber.add(:action_controller, ActionController::Railties::Subscriber.new)
-    super
+    @controller.cache_store = :file_store, @cache_path
+    Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
   end
 
   def teardown
     super
-    Rails::Subscriber.subscribers.clear
+    Rails::LogSubscriber.log_subscribers.clear
     FileUtils.rm_rf(@cache_path)
     ActionController::Base.logger = @old_logger
   end
@@ -65,7 +65,7 @@ class ACSubscriberTest < ActionController::TestCase
     get :show
     wait
     assert_equal 2, logs.size
-    assert_equal "Processing by Another::SubscribersController#show as HTML", logs.first
+    assert_equal "Processing by Another::LogSubscribersController#show as HTML", logs.first
   end
 
   def test_process_action
@@ -134,11 +134,11 @@ class ACSubscriberTest < ActionController::TestCase
   end
 
   def test_send_xfile
-    get :xfile_sender
+    assert_deprecated { get :xfile_sender }
     wait
 
     assert_equal 3, logs.size
-    assert_match /Sent X\-Sendfile header/, logs[1]
+    assert_match /Sent file/, logs[1]
     assert_match /test\/fixtures\/company\.rb/, logs[1]
   end
 
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 3bd3369242..5c1eaf453c 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -155,13 +155,11 @@ class RespondToControllerTest < ActionController::TestCase
 
   def setup
     super
-    ActionController::Base.use_accept_header = true
     @request.host = "www.example.com"
   end
 
   def teardown
     super
-    ActionController::Base.use_accept_header = false
   end
 
   def test_html
@@ -513,7 +511,7 @@ class RespondWithController < ActionController::Base
 protected
 
   def resource
-    Customer.new("david", 13)
+    Customer.new("david", request.delete? ? nil : 13)
   end
 
   def _render_js(js, options)
@@ -544,13 +542,11 @@ class RespondWithControllerTest < ActionController::TestCase
 
   def setup
     super
-    ActionController::Base.use_accept_header = true
     @request.host = "www.example.com"
   end
 
   def teardown
     super
-    ActionController::Base.use_accept_header = false
   end
 
   def test_using_resource
@@ -717,7 +713,7 @@ class RespondWithControllerTest < ActionController::TestCase
       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
+      assert_equal "http://www.example.com/customers", @response.location
     end
   end
 
diff --git a/actionpack/test/controller/new_base/render_rjs_test.rb b/actionpack/test/controller/new_base/render_rjs_test.rb
index 8c47b38ab6..f4516ade63 100644
--- a/actionpack/test/controller/new_base/render_rjs_test.rb
+++ b/actionpack/test/controller/new_base/render_rjs_test.rb
@@ -17,7 +17,7 @@ module RenderRjs
     end
 
     def index_locale
-      old_locale, I18n.locale = I18n.locale, :da
+      self.locale = :da
     end
   end
 
diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/controller/record_identifier_test.rb
index 6b6d154faa..813dedc80d 100644
--- a/actionpack/test/controller/record_identifier_test.rb
+++ b/actionpack/test/controller/record_identifier_test.rb
@@ -5,6 +5,7 @@ class Comment
   include ActiveModel::Conversion
 
   attr_reader :id
+  def to_key; id ? [id] : nil end
   def save; @id = 1 end
   def new_record?; @id.nil? end
   def name
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 570ff4a41b..441bc47908 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -6,14 +6,14 @@ end
 class Workshop
   extend ActiveModel::Naming
   include ActiveModel::Conversion
-  attr_accessor :id, :new_record
+  attr_accessor :id
 
-  def initialize(id, new_record)
-    @id, @new_record = id, new_record
+  def initialize(id)
+    @id = id
   end
 
-  def new_record?
-    @new_record
+  def persisted?
+    id.present?
   end
 
   def to_s
@@ -88,11 +88,11 @@ class RedirectController < ActionController::Base
   end
 
   def redirect_to_existing_record
-    redirect_to Workshop.new(5, false)
+    redirect_to Workshop.new(5)
   end
 
   def redirect_to_new_record
-    redirect_to Workshop.new(5, true)
+    redirect_to Workshop.new(nil)
   end
 
   def redirect_to_nil
@@ -239,11 +239,11 @@ class RedirectTest < ActionController::TestCase
 
       get :redirect_to_existing_record
       assert_equal "http://test.host/workshops/5", redirect_to_url
-      assert_redirected_to Workshop.new(5, false)
+      assert_redirected_to Workshop.new(5)
 
       get :redirect_to_new_record
       assert_equal "http://test.host/workshops", redirect_to_url
-      assert_redirected_to Workshop.new(5, true)
+      assert_redirected_to Workshop.new(nil)
     end
   end
 
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index 3938fc7061..2580ada88b 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -18,6 +18,10 @@ class RenderJsonTest < ActionController::TestCase
       render :json => ActiveSupport::JSON.encode(:hello => 'world')
     end
 
+    def render_json_hello_world_with_status
+      render :json => ActiveSupport::JSON.encode(:hello => 'world'), :status => 401
+    end
+
     def render_json_hello_world_with_callback
       render :json => ActiveSupport::JSON.encode(:hello => 'world'), :callback => 'alert'
     end
@@ -58,6 +62,12 @@ class RenderJsonTest < ActionController::TestCase
     assert_equal 'application/json', @response.content_type
   end
 
+  def test_render_json_with_status
+    get :render_json_hello_world_with_status
+    assert_equal '{"hello":"world"}', @response.body
+    assert_equal 401, @response.status
+  end
+
   def test_render_json_with_callback
     get :render_json_hello_world_with_callback
     assert_equal 'alert({"hello":"world"})', @response.body
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 2c3dc2a72d..e3c4869391 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -21,6 +21,10 @@ class TestController < ActionController::Base
   def hello_world
   end
 
+  def hello_world_file
+    render :file => File.expand_path("../../fixtures/hello.html", __FILE__)
+  end
+
   def conditional_hello
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123])
       render :action => 'hello_world'
@@ -214,6 +218,10 @@ class TestController < ActionController::Base
     render :text => false
   end
 
+  def render_text_with_resource
+    render :text => Customer.new("David")
+  end
+
   # :ported:
   def render_nothing_with_appendix
     render :text => "appended"
@@ -347,7 +355,7 @@ class TestController < ActionController::Base
     @before = "i'm before the render"
     render_to_string :text => "foo"
     @after = "i'm after the render"
-    render :action => "test/hello_world"
+    render :template => "test/hello_world"
   end
 
   def render_to_string_with_exception
@@ -361,7 +369,7 @@ class TestController < ActionController::Base
     rescue
     end
     @after = "i'm after the render"
-    render :action => "test/hello_world"
+    render :template => "test/hello_world"
   end
 
   def accessing_params_in_template_with_layout
@@ -506,7 +514,7 @@ class TestController < ActionController::Base
   def render_to_string_with_partial
     @partial_only = render_to_string :partial => "partial_only"
     @partial_with_locals = render_to_string :partial => "customer", :locals => { :customer => Customer.new("david") }
-    render :action => "test/hello_world"
+    render :template => "test/hello_world"
   end
 
   def partial_with_counter
@@ -747,6 +755,11 @@ class RenderTest < ActionController::TestCase
     assert_equal "The secret is in the sauce\n", @response.body
   end
 
+  def test_render_file
+    get :hello_world_file
+    assert_equal "Hello world!", @response.body
+  end
+
   # :ported:
   def test_render_file_as_string_with_instance_variables
     get :render_file_as_string_with_instance_variables
@@ -817,6 +830,11 @@ class RenderTest < ActionController::TestCase
     assert_equal 'appended', @response.body
   end
 
+  def test_render_text_with_resource
+    get :render_text_with_resource
+    assert_equal 'name: "David"', @response.body
+  end
+
   # :ported:
   def test_attempt_to_access_object_method
     assert_raise(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index b5b0d0b9d5..4da6c954cf 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -62,7 +62,8 @@ class RenderXmlTest < ActionController::TestCase
     with_routing do |set|
       set.draw do |map|
         resources :customers
-        match ':controller/:action'
+        # match ':controller/:action'
+        map.connect ':controller/:action/:id'
       end
 
       get :render_with_object_location
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index 37367eaafc..dd991898a8 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -326,7 +326,7 @@ class RescueTest < ActionController::IntegrationTest
   end
 
   test 'rescue routing exceptions' do
-    @app = ActionDispatch::Rescue.new(ActionController::Routing::Routes) do
+    @app = ActionDispatch::Rescue.new(SharedTestRoutes) do
       rescue_from ActionController::RoutingError, lambda { |env| [200, {"Content-Type" => "text/html"}, ["Gotcha!"]] }
     end
 
@@ -335,7 +335,7 @@ class RescueTest < ActionController::IntegrationTest
   end
 
   test 'unrescued exception' do
-    @app = ActionDispatch::Rescue.new(ActionController::Routing::Routes)
+    @app = ActionDispatch::Rescue.new(SharedTestRoutes)
     assert_raise(ActionController::RoutingError) { get '/b00m' }
   end
 
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 01ed491732..f60045bba6 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -31,10 +31,10 @@ end
 
 class ResourcesTest < ActionController::TestCase
   def test_should_arrange_actions
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages,
+    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
       :collection => { :rss => :get, :reorder => :post, :csv => :post },
       :member     => { :rss => :get, :atom => :get, :upload => :post, :fix => :post },
-      :new        => { :preview => :get, :draft => :get })
+      :new        => { :preview => :get, :draft => :get }}, {})
 
     assert_resource_methods [:rss],                   resource, :collection, :get
     assert_resource_methods [:csv, :reorder],         resource, :collection, :post
@@ -44,18 +44,18 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_should_resource_controller_name_equal_resource_name_by_default
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {})
+    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {}, {})
     assert_equal 'messages', resource.controller
   end
 
   def test_should_resource_controller_name_equal_controller_option
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, :controller => 'posts')
+    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {:controller => 'posts'}, {})
     assert_equal 'posts', resource.controller
   end
 
   def test_should_all_singleton_paths_be_the_same
     [ :path, :nesting_path_prefix, :member_path ].each do |method|
-      resource = ActionDispatch::Routing::DeprecatedMapper::SingletonResource.new(:messages, :path_prefix => 'admin')
+      resource = ActionDispatch::Routing::DeprecatedMapper::SingletonResource.new(:messages, {:path_prefix => 'admin'}, {})
       assert_equal 'admin/messages', resource.send(method)
     end
   end
@@ -111,8 +111,8 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_override_paths_for_default_restful_actions
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages,
-      :path_names => {:new => 'nuevo', :edit => 'editar'})
+    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
+      :path_names => {:new => 'nuevo', :edit => 'editar'}}, {})
     assert_equal resource.new_path, "#{resource.path}/nuevo"
   end
 
@@ -125,7 +125,7 @@ class ResourcesTest < ActionController::TestCase
 
   def test_with_custom_conditions
     with_restful_routing :messages, :conditions => { :subdomain => 'app' } do
-      assert ActionDispatch::Routing::Routes.recognize_path("/messages", :method => :get, :subdomain => 'app')
+      assert @router.recognize_path("/messages", :method => :get, :subdomain => 'app')
     end
   end
 
@@ -394,7 +394,7 @@ class ResourcesTest < ActionController::TestCase
       assert_restful_routes_for :messages do |options|
         assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
         assert_raise(ActionController::RoutingError) do
-          ActionController::Routing::Routes.recognize_path("/messages/new", :method => :post)
+          @router.recognize_path("/messages/new", :method => :post)
         end
       end
     end
@@ -504,7 +504,7 @@ class ResourcesTest < ActionController::TestCase
 
   def test_restful_routes_dont_generate_duplicates
     with_restful_routing :messages do
-      routes = ActionController::Routing::Routes.routes
+      routes = @router.routes
       routes.each do |route|
         routes.each do |r|
           next if route === r # skip the comparison instance
@@ -1162,8 +1162,9 @@ class ResourcesTest < ActionController::TestCase
         options[:shallow_options] = options[:options]
       end
 
-      new_action    = ActionController::Base.resources_path_names[:new] || "new"
-      edit_action   = ActionController::Base.resources_path_names[:edit] || "edit"
+      new_action    = @router.resources_path_names[:new] || "new"
+      edit_action   = @router.resources_path_names[:edit] || "edit"
+
       if options[:path_names]
         new_action  = options[:path_names][:new] if options[:path_names][:new]
         edit_action = options[:path_names][:edit] if options[:path_names][:edit]
@@ -1229,6 +1230,7 @@ class ResourcesTest < ActionController::TestCase
       end
 
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
+      @controller.singleton_class.send(:include, @router.url_helpers)
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       get :index, options[:options]
@@ -1298,6 +1300,7 @@ class ResourcesTest < ActionController::TestCase
     def assert_singleton_named_routes_for(singleton_name, options = {})
       (options[:options] ||= {})[:controller] ||= singleton_name.to_s.pluralize
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
+      @controller.singleton_class.send(:include, @router.url_helpers)
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       get :show, options[:options]
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index f390bbdc89..fc85b01394 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -52,29 +52,17 @@ class UriReservedCharactersRoutingTest < Test::Unit::TestCase
 end
 
 class MockController
-  attr_accessor :routes
+  def self.build(helpers)
+    Class.new do
+      def url_for(options)
+        options[:protocol] ||= "http"
+        options[:host] ||= "test.host"
 
-  def initialize(routes)
-    self.routes = routes
-  end
-
-  def url_for(options)
-    only_path = options.delete(:only_path)
-
-    port        = options.delete(:port) || 80
-    port_string = port == 80 ? '' : ":#{port}"
-
-    protocol = options.delete(:protocol) || "http"
-    host     = options.delete(:host) || "test.host"
-    anchor   = "##{options.delete(:anchor)}" if options.key?(:anchor)
-
-    path = routes.generate(options)
-
-    only_path ? "#{path}#{anchor}" : "#{protocol}://#{host}#{port_string}#{path}#{anchor}"
-  end
+        super(options)
+      end
 
-  def request
-    @request ||= ActionController::TestRequest.new
+      include helpers
+    end
   end
 end
 
@@ -268,9 +256,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def setup_for_named_route
-    klass = Class.new(MockController)
-    rs.install_helpers(klass)
-    klass.new(rs)
+    MockController.build(rs.url_helpers).new
   end
 
   def test_named_route_without_hash
@@ -759,9 +745,7 @@ class RouteSetTest < ActiveSupport::TestCase
       map.users '/admin/users', :controller => 'admin/users', :action => 'index'
     end
 
-    klass = Class.new(MockController)
-    set.install_helpers(klass)
-    klass.new(set)
+    MockController.build(set.url_helpers).new
   end
 
   def test_named_route_hash_access_method
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 0afebac68c..30c9a65b7c 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -46,44 +46,32 @@ class SendFileTest < ActionController::TestCase
     response = nil
     assert_nothing_raised { response = process('file') }
     assert_not_nil response
-    assert_kind_of String, response.body
-    assert_equal file_data, response.body
+    body = response.body
+    assert_kind_of String, body
+    assert_equal file_data, body
   end
 
   def test_file_stream
-    pending do
-      response = nil
-      assert_nothing_raised { response = process('file') }
-      assert_not_nil response
-      assert_kind_of Array, response.body_parts
-
-      require 'stringio'
-      output = StringIO.new
-      output.binmode
-      output.string.force_encoding(file_data.encoding) if output.string.respond_to?(:force_encoding)
-      assert_nothing_raised { response.body_parts.each { |part| output << part.to_s } }
-      assert_equal file_data, output.string
-    end
-  end
-
-  def test_file_url_based_filename
-    @controller.options = { :url_based_filename => true }
     response = nil
     assert_nothing_raised { response = process('file') }
     assert_not_nil response
-    assert_equal "attachment", response.headers["Content-Disposition"]
-  end
+    assert response.body_parts.respond_to?(:each)
+    assert response.body_parts.respond_to?(:to_path)
 
-  def test_x_sendfile_header
-    @controller.options = { :x_sendfile => true }
+    require 'stringio'
+    output = StringIO.new
+    output.binmode
+    output.string.force_encoding(file_data.encoding) if output.string.respond_to?(:force_encoding)
+    assert_nothing_raised { response.body_parts.each { |part| output << part.to_s } }
+    assert_equal file_data, output.string
+  end
 
+  def test_file_url_based_filename
+    @controller.options = { :url_based_filename => true }
     response = nil
     assert_nothing_raised { response = process('file') }
     assert_not_nil response
-
-    assert_equal @controller.file_path, response.headers['X-Sendfile']
-    assert response.body.blank?
-    assert !response.etag?
+    assert_equal "attachment", response.headers["Content-Disposition"]
   end
 
   def test_data
@@ -104,9 +92,8 @@ class SendFileTest < ActionController::TestCase
   end
 
   # Test that send_file_headers! is setting the correct HTTP headers.
-  def test_send_file_headers!
+  def test_send_file_headers_bang
     options = {
-      :length => 1,
       :type => Mime::PNG,
       :disposition => 'disposition',
       :filename => 'filename'
@@ -121,13 +108,11 @@ class SendFileTest < ActionController::TestCase
     @controller.send(:send_file_headers!, options)
 
     h = @controller.headers
-    assert_equal '1', h['Content-Length']
     assert_equal 'image/png', @controller.content_type
     assert_equal 'disposition; filename="filename"', h['Content-Disposition']
     assert_equal 'binary', h['Content-Transfer-Encoding']
 
     # test overriding Cache-Control: no-cache header to fix IE open/save dialog
-    @controller.headers = { 'Cache-Control' => 'no-cache' }
     @controller.send(:send_file_headers!, options)
     @controller.response.prepare!
     assert_equal 'private', h['Cache-Control']
@@ -135,7 +120,6 @@ class SendFileTest < ActionController::TestCase
 
   def test_send_file_headers_with_mime_lookup_with_symbol
     options = {
-      :length => 1,
       :type => :png
     }
 
@@ -148,7 +132,6 @@ class SendFileTest < ActionController::TestCase
 
   def test_send_file_headers_with_bad_symbol
     options = {
-      :length => 1,
       :type => :this_type_is_not_registered
     }
 
@@ -163,17 +146,16 @@ class SendFileTest < ActionController::TestCase
       assert_equal 500, @response.status
     end
 
+    define_method "test_send_#{method}_content_type" do
+      @controller.options = { :stream => false, :content_type => "application/x-ruby" }
+      assert_nothing_raised { assert_not_nil process(method) }
+      assert_equal "application/x-ruby", @response.content_type
+    end
+
     define_method "test_default_send_#{method}_status" do
       @controller.options = { :stream => false }
       assert_nothing_raised { assert_not_nil process(method) }
       assert_equal 200, @response.status
     end
   end
-
-  def test_send_data_content_length_header
-    @controller.headers = {}
-    @controller.options = { :type => :text, :filename => 'file_with_utf8_text' }
-    process('multibyte_text_data')
-    assert_equal '29', @controller.headers['Content-Length']
-  end
 end
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 0f074b32e6..f6ba275849 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -42,7 +42,7 @@ class TestTest < ActionController::TestCase
     end
 
     def test_uri
-      render :text => request.request_uri
+      render :text => request.fullpath
     end
 
     def test_query_string
@@ -128,6 +128,7 @@ XML
     @controller = TestController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @request.env['PATH_INFO'] = nil
   end
 
   def test_raw_post_handling
@@ -199,7 +200,7 @@ XML
   end
 
   def test_process_with_request_uri_with_params_with_explicit_uri
-    @request.request_uri = "/explicit/uri"
+    @request.env['PATH_INFO'] = "/explicit/uri"
     process :test_uri, :id => 7
     assert_equal "/explicit/uri", @response.body
   end
@@ -210,7 +211,8 @@ XML
   end
 
   def test_process_with_query_string_with_explicit_uri
-    @request.request_uri = "/explicit/uri?q=test?extra=question"
+    @request.env['PATH_INFO'] = '/explicit/uri'
+    @request.env['QUERY_STRING'] = 'q=test?extra=question'
     process :test_query_string
     assert_equal "q=test?extra=question", @response.body
   end
@@ -476,8 +478,8 @@ XML
   end
 
   def test_with_routing_places_routes_back
-    assert ActionController::Routing::Routes
-    routes_id = ActionController::Routing::Routes.object_id
+    assert @router
+    routes_id = @router.object_id
 
     begin
       with_routing { raise 'fail' }
@@ -485,8 +487,8 @@ XML
     rescue RuntimeError
     end
 
-    assert ActionController::Routing::Routes
-    assert_equal routes_id, ActionController::Routing::Routes.object_id
+    assert @router
+    assert_equal routes_id, @router.object_id
   end
 
   def test_remote_addr
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 749fa5861f..fc7773dffe 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -5,7 +5,7 @@ module AbstractController
 
     class UrlForTests < ActionController::TestCase
       class W
-        include ActionController::UrlFor
+        include SharedTestRoutes.url_helpers
       end
 
       def teardown
@@ -113,15 +113,13 @@ module AbstractController
       end
 
       def test_relative_url_root_is_respected
-        orig_relative_url_root = ActionController::Base.relative_url_root
-        ActionController::Base.relative_url_root = '/subdir'
+        # ROUTES TODO: Tests should not have to pass :relative_url_root directly. This
+        # should probably come from the router.
 
         add_host!
         assert_equal('https://www.basecamphq.com/subdir/c/a/i',
-          W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
+          W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https', :script_name => '/subdir')
         )
-      ensure
-        ActionController::Base.relative_url_root = orig_relative_url_root
       end
 
       def test_named_routes
@@ -132,7 +130,8 @@ module AbstractController
           end
 
           # We need to create a new class in order to install the new named route.
-          kls = Class.new { include ActionController::UrlFor }
+          kls = Class.new { include set.url_helpers }
+
           controller = kls.new
           assert controller.respond_to?(:home_url)
           assert_equal 'http://www.basecamphq.com/home/sweet/home/again',
@@ -145,22 +144,17 @@ module AbstractController
       end
 
       def test_relative_url_root_is_respected_for_named_routes
-        orig_relative_url_root = ActionController::Base.relative_url_root
-        ActionController::Base.relative_url_root = '/subdir'
-
         with_routing do |set|
           set.draw do |map|
             match '/home/sweet/home/:user', :to => 'home#index', :as => :home
           end
 
-          kls = Class.new { include ActionController::UrlFor }
+          kls = Class.new { include set.url_helpers }
           controller = kls.new
 
           assert_equal 'http://www.basecamphq.com/subdir/home/sweet/home/again',
-            controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again')
+            controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again', :script_name => "/subdir")
         end
-      ensure
-        ActionController::Base.relative_url_root = orig_relative_url_root
       end
 
       def test_only_path
@@ -171,7 +165,7 @@ module AbstractController
           end
 
           # We need to create a new class in order to install the new named route.
-          kls = Class.new { include ActionController::UrlFor }
+          kls = Class.new { include set.url_helpers }
           controller = kls.new
           assert controller.respond_to?(:home_url)
           assert_equal '/brave/new/world',
@@ -239,7 +233,7 @@ module AbstractController
           end
 
           # We need to create a new class in order to install the new named route.
-          kls = Class.new { include ActionController::UrlFor }
+          kls = Class.new { include set.url_helpers }
           kls.default_url_options[:host] = 'www.basecamphq.com'
 
           controller = kls.new
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index c2b8cd85d8..7b46a48a1d 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -1,102 +1,85 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 
-ActionController::UrlRewriter
-
 class UrlRewriterTests < ActionController::TestCase
+  class Rewriter
+    def initialize(request)
+      @options = {
+        :host => request.host_with_port,
+        :protocol => request.protocol
+      }
+    end
+
+    def rewrite(router, options)
+      router.url_for(@options.merge(options))
+    end
+  end
+
   def setup
     @request = ActionController::TestRequest.new
     @params = {}
-    @rewriter = ActionController::UrlRewriter.new(@request, @params)
+    @rewriter = Rewriter.new(@request) #.new(@request, @params)
   end
 
   def test_port
     assert_equal('http://test.host:1271/c/a/i',
-      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :port => 1271)
+      @rewriter.rewrite(@router, :controller => 'c', :action => 'a', :id => 'i', :port => 1271)
     )
   end
 
   def test_protocol_with_and_without_separator
     assert_equal('https://test.host/c/a/i',
-      @rewriter.rewrite(:protocol => 'https', :controller => 'c', :action => 'a', :id => 'i')
+      @rewriter.rewrite(@router, :protocol => 'https', :controller => 'c', :action => 'a', :id => 'i')
     )
 
     assert_equal('https://test.host/c/a/i',
-      @rewriter.rewrite(:protocol => 'https://', :controller => 'c', :action => 'a', :id => 'i')
+      @rewriter.rewrite(@router, :protocol => 'https://', :controller => 'c', :action => 'a', :id => 'i')
     )
   end
 
   def test_user_name_and_password
     assert_equal(
       'http://david:secret@test.host/c/a/i',
-      @rewriter.rewrite(:user => "david", :password => "secret", :controller => 'c', :action => 'a', :id => 'i')
+      @rewriter.rewrite(@router, :user => "david", :password => "secret", :controller => 'c', :action => 'a', :id => 'i')
     )
   end
 
   def test_user_name_and_password_with_escape_codes
     assert_equal(
       'http://openid.aol.com%2Fnextangler:one+two%3F@test.host/c/a/i',
-      @rewriter.rewrite(:user => "openid.aol.com/nextangler", :password => "one two?", :controller => 'c', :action => 'a', :id => 'i')
+      @rewriter.rewrite(@router, :user => "openid.aol.com/nextangler", :password => "one two?", :controller => 'c', :action => 'a', :id => 'i')
     )
   end
 
   def test_anchor
     assert_equal(
       'http://test.host/c/a/i#anchor',
-      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor')
+      @rewriter.rewrite(@router, :controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor')
     )
   end
 
   def test_anchor_should_call_to_param
     assert_equal(
       'http://test.host/c/a/i#anchor',
-      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anchor'))
+      @rewriter.rewrite(@router, :controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anchor'))
     )
   end
 
   def test_anchor_should_be_cgi_escaped
     assert_equal(
       'http://test.host/c/a/i#anc%2Fhor',
-      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anc/hor'))
+      @rewriter.rewrite(@router, :controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anc/hor'))
     )
   end
 
-  def test_overwrite_params
-    @params[:controller] = 'hi'
-    @params[:action] = 'bye'
-    @params[:id] = '2'
-
-    assert_equal '/hi/hi/2', @rewriter.rewrite(:only_path => true, :overwrite_params => {:action => 'hi'})
-    u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:action => 'hi'})
-    assert_match %r(/hi/hi/2$), u
-  end
-
-  def test_overwrite_removes_original
-    @params[:controller] = 'search'
-    @params[:action] = 'list'
-    @params[:list_page] = 1
-
-    assert_equal '/search/list?list_page=2', @rewriter.rewrite(:only_path => true, :overwrite_params => {"list_page" => 2})
-    u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:list_page => 2})
-    assert_equal 'http://test.host/search/list?list_page=2', u
-  end
-
-  def test_to_str
-    @params[:controller] = 'hi'
-    @params[:action] = 'bye'
-    @request.parameters[:id] = '2'
-
-    assert_equal 'http://, test.host, /, hi, bye, {"id"=>"2"}', @rewriter.to_str
-  end
-
   def test_trailing_slash
     options = {:controller => 'foo', :action => 'bar', :id => '3', :only_path => true}
-    assert_equal '/foo/bar/3', @rewriter.rewrite(options)
-    assert_equal '/foo/bar/3?query=string', @rewriter.rewrite(options.merge({:query => 'string'}))
+    assert_equal '/foo/bar/3', @rewriter.rewrite(@router, options)
+    assert_equal '/foo/bar/3?query=string', @rewriter.rewrite(@router, options.merge({:query => 'string'}))
     options.update({:trailing_slash => true})
-    assert_equal '/foo/bar/3/', @rewriter.rewrite(options)
+    assert_equal '/foo/bar/3/', @rewriter.rewrite(@router, options)
     options.update({:query => 'string'})
-    assert_equal '/foo/bar/3/?query=string', @rewriter.rewrite(options)
+    assert_equal '/foo/bar/3/?query=string', @rewriter.rewrite(@router, options)
   end
 end
 
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 56821332c5..b8972b04b6 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -36,9 +36,12 @@ class ViewLoadPathsTest < ActionController::TestCase
     @old_behavior = ActiveSupport::Deprecation.behavior
     @last_message = nil
     ActiveSupport::Deprecation.behavior = Proc.new { |message, callback| @last_message = message }
+
+    @paths = TestController.view_paths
   end
 
   def teardown
+    TestController.view_paths = @paths
     ActiveSupport::Deprecation.behavior = @old_behavior
   end
 
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 5882a8cfa3..05545395fb 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -245,7 +245,7 @@ class WebServiceTest < ActionController::IntegrationTest
   private
     def with_params_parsers(parsers = {})
       old_session = @integration_session
-      @app = ActionDispatch::ParamsParser.new(ActionController::Routing::Routes, parsers)
+      @app = ActionDispatch::ParamsParser.new(app.router, parsers)
       reset!
       yield
     ensure
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
new file mode 100644
index 0000000000..00ca5ec9dc
--- /dev/null
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -0,0 +1,36 @@
+require 'abstract_unit'
+
+class TestRoutingMount < ActionDispatch::IntegrationTest
+  Router = ActionDispatch::Routing::RouteSet.new
+  Router.draw do
+    SprocketsApp = lambda { |env|
+      [200, {"Content-Type" => "text/html"}, ["#{env["SCRIPT_NAME"]} -- #{env["PATH_INFO"]}"]]
+    }
+
+    mount SprocketsApp, :at => "/sprockets"
+    mount SprocketsApp => "/shorthand"
+
+    scope "/its_a" do
+      mount SprocketsApp, :at => "/sprocket"
+    end
+  end
+
+  def app
+    Router
+  end
+
+  def test_mounting_sets_script_name
+    get "/sprockets/omg"
+    assert_equal "/sprockets -- /omg", response.body
+  end
+
+  def test_mounting_works_with_scope
+    get "/its_a/sprocket/omg"
+    assert_equal "/its_a/sprocket -- /omg", response.body
+  end
+  
+  def test_mounting_with_shorthand
+    get "/shorthand/omg"
+    assert_equal "/shorthand -- /omg", response.body
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 2b5c19361a..badef4e92e 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -1,14 +1,6 @@
 require 'abstract_unit'
 
 class RequestTest < ActiveSupport::TestCase
-  def setup
-    ActionController::Base.relative_url_root = nil
-  end
-
-  def teardown
-    ActionController::Base.relative_url_root = nil
-  end
-
   test "remote ip" do
     request = stub_request 'REMOTE_ADDR' => '1.2.3.4'
     assert_equal '1.2.3.4', request.remote_ip
@@ -50,7 +42,7 @@ class RequestTest < ActiveSupport::TestCase
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '1.1.1.1',
                            'HTTP_CLIENT_IP'       => '2.2.2.2'
-    e = assert_raise(ActionController::ActionControllerError) {
+    e = assert_raise(ActionDispatch::RemoteIp::IpSpoofAttackError) {
       request.remote_ip
     }
     assert_match /IP spoofing attack/, e.message
@@ -62,18 +54,17 @@ class RequestTest < ActiveSupport::TestCase
     # example is WAP.  Since the cellular network is not IP based, it's a
     # leap of faith to assume that their proxies are ever going to set the
     # HTTP_CLIENT_IP/HTTP_X_FORWARDED_FOR headers properly.
-    ActionController::Base.ip_spoofing_check = false
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '1.1.1.1',
-                           'HTTP_CLIENT_IP'       => '2.2.2.2'
+                           'HTTP_CLIENT_IP'       => '2.2.2.2',
+                           :ip_spoofing_check => false
     assert_equal '2.2.2.2', request.remote_ip
-    ActionController::Base.ip_spoofing_check = true
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '8.8.8.8, 9.9.9.9'
     assert_equal '9.9.9.9', request.remote_ip
   end
 
   test "remote ip with user specified trusted proxies" do
-    ActionController::Base.trusted_proxies = /^67\.205\.106\.73$/i
+    @trusted_proxies = /^67\.205\.106\.73$/i
 
     request = stub_request 'REMOTE_ADDR' => '67.205.106.73',
                            'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
@@ -96,8 +87,6 @@ class RequestTest < ActiveSupport::TestCase
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 3.4.5.6, 10.0.0.1, 67.205.106.73'
     assert_equal '3.4.5.6', request.remote_ip
-
-    ActionController::Base.trusted_proxies = nil
   end
 
   test "domains" do
@@ -151,104 +140,34 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal ":8080", request.port_string
   end
 
-  test "request uri" do
-    request = stub_request 'REQUEST_URI' => "http://www.rubyonrails.org/path/of/some/uri?mapped=1"
-    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
-    assert_equal "/path/of/some/uri",          request.path
-
-    request = stub_request 'REQUEST_URI' => "http://www.rubyonrails.org/path/of/some/uri"
-    assert_equal "/path/of/some/uri", request.request_uri
-    assert_equal "/path/of/some/uri", request.path
-
-    request = stub_request 'REQUEST_URI' => "/path/of/some/uri"
-    assert_equal "/path/of/some/uri", request.request_uri
-    assert_equal "/path/of/some/uri", request.path
-
-    request = stub_request 'REQUEST_URI' => "/"
-    assert_equal "/", request.request_uri
-    assert_equal "/", request.path
-
-    request = stub_request 'REQUEST_URI' => "/?m=b"
-    assert_equal "/?m=b", request.request_uri
-    assert_equal "/",     request.path
-
-    request = stub_request 'REQUEST_URI' => "/", 'SCRIPT_NAME' => '/dispatch.cgi'
-    assert_equal "/", request.request_uri
-    assert_equal "/", request.path
-
-    ActionController::Base.relative_url_root = "/hieraki"
-    request = stub_request 'REQUEST_URI' => "/hieraki/", 'SCRIPT_NAME' => "/hieraki/dispatch.cgi"
-    assert_equal "/hieraki/", request.request_uri
-    assert_equal "/",         request.path
-    ActionController::Base.relative_url_root = nil
-
-    ActionController::Base.relative_url_root = "/collaboration/hieraki"
-    request = stub_request 'REQUEST_URI' => "/collaboration/hieraki/books/edit/2",
-      'SCRIPT_NAME' => "/collaboration/hieraki/dispatch.cgi"
-    assert_equal "/collaboration/hieraki/books/edit/2", request.request_uri
-    assert_equal "/books/edit/2",                       request.path
-    ActionController::Base.relative_url_root = nil
-
-    # The following tests are for when REQUEST_URI is not supplied (as in IIS)
-    request = stub_request 'PATH_INFO'   => "/path/of/some/uri?mapped=1",
-                           'SCRIPT_NAME' => nil,
-                           'REQUEST_URI' => nil
-    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
-    assert_equal "/path/of/some/uri",          request.path
-
-    ActionController::Base.relative_url_root = '/path'
-    request = stub_request 'PATH_INFO'   => "/path/of/some/uri?mapped=1",
-                           'SCRIPT_NAME' => "/path/dispatch.rb",
-                           'REQUEST_URI' => nil
-    assert_equal "/path/of/some/uri?mapped=1", request.request_uri
-    assert_equal "/of/some/uri",               request.path
-    ActionController::Base.relative_url_root = nil
-
-    request = stub_request 'PATH_INFO'   => "/path/of/some/uri",
-                           'SCRIPT_NAME' => nil,
-                           'REQUEST_URI' => nil
-    assert_equal "/path/of/some/uri", request.request_uri
-    assert_equal "/path/of/some/uri", request.path
-
-    request = stub_request 'PATH_INFO' => '/', 'REQUEST_URI' => nil
-    assert_equal "/", request.request_uri
-    assert_equal "/", request.path
-
-    request = stub_request 'PATH_INFO' => '/?m=b', 'REQUEST_URI' => nil
-    assert_equal "/?m=b", request.request_uri
-    assert_equal "/",     request.path
-
-    request = stub_request 'PATH_INFO'   => "/",
-                           'SCRIPT_NAME' => "/dispatch.cgi",
-                           'REQUEST_URI' => nil
-    assert_equal "/", request.request_uri
-    assert_equal "/", request.path
-
-    ActionController::Base.relative_url_root = '/hieraki'
-    request = stub_request 'PATH_INFO'   => "/hieraki/",
-                           'SCRIPT_NAME' => "/hieraki/dispatch.cgi",
-                           'REQUEST_URI' => nil
-    assert_equal "/hieraki/", request.request_uri
-    assert_equal "/",         request.path
-    ActionController::Base.relative_url_root = nil
-
-    request = stub_request 'REQUEST_URI' => '/hieraki/dispatch.cgi'
-    ActionController::Base.relative_url_root = '/hieraki'
-    assert_equal "/dispatch.cgi", request.path
-    ActionController::Base.relative_url_root = nil
-
-    request = stub_request 'REQUEST_URI' => '/hieraki/dispatch.cgi'
-    ActionController::Base.relative_url_root = '/foo'
-    assert_equal "/hieraki/dispatch.cgi", request.path
-    ActionController::Base.relative_url_root = nil
-
-    # This test ensures that Rails uses REQUEST_URI over PATH_INFO
-    ActionController::Base.relative_url_root = nil
-    request = stub_request 'REQUEST_URI' => "/some/path",
-                           'PATH_INFO'   => "/another/path",
-                           'SCRIPT_NAME' => "/dispatch.cgi"
-    assert_equal "/some/path", request.request_uri
-    assert_equal "/some/path", request.path
+  test "full path" do
+    request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/path/of/some/uri', 'QUERY_STRING' => 'mapped=1'
+    assert_equal "/path/of/some/uri?mapped=1", request.fullpath
+    assert_equal "/path/of/some/uri",          request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/path/of/some/uri'
+    assert_equal "/path/of/some/uri", request.fullpath
+    assert_equal "/path/of/some/uri", request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/'
+    assert_equal "/", request.fullpath
+    assert_equal "/", request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '', 'PATH_INFO' => '/', 'QUERY_STRING' => 'm=b'
+    assert_equal "/?m=b", request.fullpath
+    assert_equal "/",     request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '/hieraki', 'PATH_INFO' => '/'
+    assert_equal "/hieraki/", request.fullpath
+    assert_equal "/",         request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '/collaboration/hieraki', 'PATH_INFO' => '/books/edit/2'
+    assert_equal "/collaboration/hieraki/books/edit/2", request.fullpath
+    assert_equal "/books/edit/2",                       request.path_info
+
+    request = stub_request 'SCRIPT_NAME' => '/path', 'PATH_INFO' => '/of/some/uri', 'QUERY_STRING' => 'mapped=1'
+    assert_equal "/path/of/some/uri?mapped=1", request.fullpath
+    assert_equal "/of/some/uri",               request.path_info
   end
 
 
@@ -462,7 +381,7 @@ class RequestTest < ActiveSupport::TestCase
     [{'foo'=>'bar', 'baz'=>'foo'},{'foo'=>'[FILTERED]', 'baz'=>'[FILTERED]'},%w'foo baz'],
     [{'bar'=>{'foo'=>'bar','bar'=>'foo'}},{'bar'=>{'foo'=>'[FILTERED]','bar'=>'foo'}},%w'fo'],
     [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana'],
-    [{'baz'=>[{'foo'=>'baz'}]}, {'baz'=>[{'foo'=>'[FILTERED]'}]}, [/foo/]]]
+    [{'baz'=>[{'foo'=>'baz'}, "1"]}, {'baz'=>[{'foo'=>'[FILTERED]'}, "1"]}, [/foo/]]]
 
     test_hashes.each do |before_filter, after_filter, filter_words|
       request = stub_request('action_dispatch.parameter_filter' => filter_words)
@@ -506,18 +425,14 @@ class RequestTest < ActiveSupport::TestCase
 
 protected
 
-  def stub_request(env={})
+  def stub_request(env = {})
+    ip_spoofing_check = env.key?(:ip_spoofing_check) ? env.delete(:ip_spoofing_check) : true
+    ip_app = ActionDispatch::RemoteIp.new(Proc.new { }, ip_spoofing_check, @trusted_proxies)
+    ip_app.call(env)
     ActionDispatch::Request.new(env)
   end
 
   def with_set(*args)
     args
   end
-
-  def with_accept_header(value)
-    ActionController::Base.use_accept_header, old = value, ActionController::Base.use_accept_header
-    yield
-  ensure
-    ActionController::Base.use_accept_header = old
-  end
 end
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 4697fa3e2b..c7f7f3102d 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -165,10 +165,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
     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
+    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+    assert_equal({:public => true}, @response.cache_control)
   end
 
   test "response cache control from rackish app" do
@@ -184,10 +182,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
     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
+    assert_equal('"202cb962ac59075b964b07152d234b70"', @response.etag)
+    assert_equal({:public => true}, @response.cache_control)
   end
 
   test "response charset and content type from railsish app" do
@@ -202,10 +198,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
     get '/'
     assert_response :success
 
-    pending do
-      assert_equal('utf-16', @response.charset)
-      assert_equal(Mime::XML, @response.content_type)
-    end
+    assert_equal('utf-16', @response.charset)
+    assert_equal(Mime::XML, @response.content_type)
 
     assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
   end
@@ -220,10 +214,8 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest
     get '/'
     assert_response :success
 
-    pending do
-      assert_equal('utf-16', @response.charset)
-      assert_equal(Mime::XML, @response.content_type)
-    end
+    assert_equal('utf-16', @response.charset)
+    assert_equal(Mime::XML, @response.content_type)
 
     assert_equal('application/xml; charset=utf-16', @response.headers['Content-Type'])
   end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index bcb97e4ae0..f5fcf9b0df 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -15,6 +15,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
   stub_controllers do |routes|
     Routes = routes
     Routes.draw do
+      default_url_options :host => "rubyonrails.org"
+
       controller :sessions do
         get  'login' => :new, :as => :login
         post 'login' => :create
@@ -24,6 +26,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       resource :session do
         get :create
+
+        resource :info
       end
 
       match 'account/logout' => redirect("/logout"), :as => :logout_redirect
@@ -104,7 +108,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
-      resources :posts, :only => [:index, :show]
+      resources :posts, :only => [:index, :show] do
+        resources :comments, :except => :destroy
+      end
 
       match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
 
@@ -162,6 +168,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     Routes
   end
 
+  include Routes.url_helpers
+
   def test_logout
     with_test_routes do
       delete '/logout'
@@ -183,6 +191,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       assert_equal '/login', url_for(:controller => 'sessions', :action => 'create', :only_path => true)
       assert_equal '/login', url_for(:controller => 'sessions', :action => 'new', :only_path => true)
+
+      assert_equal 'http://rubyonrails.org/login', Routes.url_for(:controller => 'sessions', :action => 'create')
     end
   end
 
@@ -230,6 +240,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_session_info_nested_singleton_resource
+    with_test_routes do
+      get '/session/info'
+      assert_equal 'infos#show', @response.body
+      assert_equal '/session/info', session_info_path
+    end
+  end
+
   def test_redirect_modulo
     with_test_routes do
       get '/account/modulo/name'
@@ -471,7 +489,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_posts
+  def test_resource_routes_with_only_and_except
     with_test_routes do
       get '/posts'
       assert_equal 'posts#index', @response.body
@@ -481,9 +499,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal 'posts#show', @response.body
       assert_equal '/posts/1', post_path(:id => 1)
 
+      get '/posts/1/comments'
+      assert_equal 'comments#index', @response.body
+      assert_equal '/posts/1/comments', post_comments_path(:post_id => 1)
+
       assert_raise(ActionController::RoutingError) { post '/posts' }
       assert_raise(ActionController::RoutingError) { put '/posts/1' }
       assert_raise(ActionController::RoutingError) { delete '/posts/1' }
+      assert_raise(ActionController::RoutingError) { delete '/posts/1/comments' }
     end
   end
 
@@ -721,14 +744,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
   private
     def with_test_routes
-      real_routes, temp_routes = ActionController::Routing::Routes, Routes
-
-      ActionController::Routing.module_eval { remove_const :Routes }
-      ActionController::Routing.module_eval { const_set :Routes, temp_routes }
-
       yield
-    ensure
-      ActionController::Routing.module_eval { remove_const :Routes }
-      ActionController::Routing.const_set(:Routes, real_routes)
     end
 end
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
new file mode 100644
index 0000000000..18b5b7ee00
--- /dev/null
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -0,0 +1,38 @@
+require 'abstract_unit'
+
+module TestUrlGeneration
+  class WithMountPoint < ActionDispatch::IntegrationTest
+    Router = ActionDispatch::Routing::RouteSet.new
+    Router.draw { match "/foo", :to => "my_route_generating#index", :as => :foo }
+
+    class ::MyRouteGeneratingController < ActionController::Base
+      include Router.url_helpers
+      def index
+        render :text => foo_path
+      end
+    end
+
+    include Router.url_helpers
+
+    def _router
+      Router
+    end
+
+    def app
+      Router
+    end
+
+    test "generating URLS normally" do
+      assert_equal "/foo", foo_path
+    end
+
+    test "accepting a :script_name option" do
+      assert_equal "/bar/foo", foo_path(:script_name => "/bar")
+    end
+
+    test "the request's SCRIPT_NAME takes precedence over the router's" do
+      get "/foo", {}, 'SCRIPT_NAME' => "/new"
+      assert_equal "/new/foo", response.body
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/hello.html b/actionpack/test/fixtures/hello.html
new file mode 100644
index 0000000000..6769dd60bd
--- /dev/null
+++ b/actionpack/test/fixtures/hello.html
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/layout_render_file.erb b/actionpack/test/fixtures/test/layout_render_file.erb
new file mode 100644
index 0000000000..2f8e921c5f
--- /dev/null
+++ b/actionpack/test/fixtures/test/layout_render_file.erb
@@ -0,0 +1,2 @@
+<% content_for :title do %>title<% end -%>
+<%= render :file => 'layouts/yield' -%>
\ No newline at end of file
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb
index 7346cb22bc..bf3e175f1f 100644
--- a/actionpack/test/lib/controller/fake_models.rb
+++ b/actionpack/test/lib/controller/fake_models.rb
@@ -6,10 +6,6 @@ class Customer < Struct.new(:name, :id)
 
   undef_method :to_json
 
-  def to_param
-    id.to_s
-  end
-
   def to_xml(options={})
     if options[:builder]
       options[:builder].name name
@@ -21,13 +17,14 @@ class Customer < Struct.new(:name, :id)
   def to_js(options={})
     "name: #{name.inspect}"
   end
+  alias :to_text :to_js
 
   def errors
     []
   end
 
-  def destroyed?
-    false
+  def persisted?
+    id.present?
   end
 end
 
@@ -42,8 +39,8 @@ module Quiz
     extend ActiveModel::Naming
     include ActiveModel::Conversion
 
-    def to_param
-      id.to_s
+    def persisted?
+      id.present?
     end
   end
 
@@ -58,12 +55,12 @@ class Post < Struct.new(:title, :author_name, :body, :secret, :written_on, :cost
 
   alias_method :secret?, :secret
 
-  def new_record=(boolean)
-    @new_record = boolean
+  def persisted=(boolean)
+    @persisted = boolean
   end
 
-  def new_record?
-    @new_record
+  def persisted?
+    @persisted
   end
 
   attr_accessor :author
@@ -83,8 +80,9 @@ class Comment
   attr_reader :id
   attr_reader :post_id
   def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end
+  def to_key; id ? [id] : nil end
   def save; @id = 1; @post_id = 1 end
-  def new_record?; @id.nil? end
+  def persisted?; @id.present? end
   def to_param; @id; end
   def name
     @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
@@ -102,8 +100,9 @@ class Tag
   attr_reader :id
   attr_reader :post_id
   def initialize(id = nil, post_id = nil); @id, @post_id = id, post_id end
+  def to_key; id ? [id] : nil end
   def save; @id = 1; @post_id = 1 end
-  def new_record?; @id.nil? end
+  def persisted?; @id.present? end
   def to_param; @id; end
   def value
     @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
@@ -121,8 +120,9 @@ class CommentRelevance
   attr_reader :id
   attr_reader :comment_id
   def initialize(id = nil, comment_id = nil); @id, @comment_id = id, comment_id end
+  def to_key; id ? [id] : nil end
   def save; @id = 1; @comment_id = 1 end
-  def new_record?; @id.nil? end
+  def persisted?; @id.present? end
   def to_param; @id; end
   def value
     @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
@@ -136,8 +136,9 @@ class TagRelevance
   attr_reader :id
   attr_reader :tag_id
   def initialize(id = nil, tag_id = nil); @id, @tag_id = id, tag_id end
+  def to_key; id ? [id] : nil end
   def save; @id = 1; @tag_id = 1 end
-  def new_record?; @id.nil? end
+  def persisted?; @id.present? end
   def to_param; @id; end
   def value
     @id.nil? ? "new #{self.class.name.downcase}" : "#{self.class.name.downcase} ##{@id}"
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb
index 6b9e7c5270..02248d84ad 100644
--- a/actionpack/test/lib/fixture_template.rb
+++ b/actionpack/test/lib/fixture_template.rb
@@ -1,23 +1,28 @@
 module ActionView #:nodoc:
   class FixtureResolver < PathResolver
-    def initialize(hash = {}, options = {})
-      super(options)
+    attr_reader :hash
+
+    def initialize(hash = {})
+      super()
       @hash = hash
     end
 
   private
 
-    def query(path, exts)
+    def query(partial, path, exts)
       query = Regexp.escape(path)
       exts.each do |ext|
-        query << '(?:' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << ')'
+        query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << ')'
       end
 
       templates = []
       @hash.select { |k,v| k =~ /^#{query}$/ }.each do |path, source|
-        templates << Template.new(source, path, *path_to_details(path))
+        handler, format = extract_handler_and_format(path)
+        templates << Template.new(source, path, handler,
+          :partial => partial, :virtual_path => path, :format => format)
       end
-      templates.sort_by {|t| -t.details.values.compact.size }
+
+      templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
     end
 
   end
diff --git a/actionpack/test/template/active_model_helper_test.rb b/actionpack/test/template/active_model_helper_test.rb
index 3e01ae78c3..371aa53c68 100644
--- a/actionpack/test/template/active_model_helper_test.rb
+++ b/actionpack/test/template/active_model_helper_test.rb
@@ -64,7 +64,7 @@ class ActiveModelHelperTest < ActionView::TestCase
       }.new
     end
 
-    def @post.new_record?() true end
+    def @post.persisted?() false end
     def @post.to_param() nil end
 
     def @post.column_for_attribute(attr_name)
@@ -155,7 +155,7 @@ class ActiveModelHelperTest < ActionView::TestCase
 
     silence_warnings do
       class << @post
-        def new_record?() false end
+        def persisted?() true end
         def to_param() id end
         def id() 1 end
       end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 586de66714..d9a89959da 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -1,14 +1,16 @@
 require 'abstract_unit'
+require 'active_support/ordered_options'
 
-class AssetTagHelperTest < ActionView::TestCase
-  tests ActionView::Helpers::AssetTagHelper
+class FakeController
+  attr_accessor :request
 
-  DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG.merge(
-    :assets_dir => File.dirname(__FILE__) + "/../fixtures/public",
-    :javascripts_dir => File.dirname(__FILE__) + "/../fixtures/public/javascripts",
-    :stylesheets_dir => File.dirname(__FILE__) + "/../fixtures/public/stylesheets")
+  def config
+    @config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config)
+  end
+end
 
-  include ActiveSupport::Configurable
+class AssetTagHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::AssetTagHelper
 
   def setup
     super
@@ -32,8 +34,7 @@ class AssetTagHelperTest < ActionView::TestCase
       )
     end
 
-    @controller = Class.new do
-      attr_accessor :request
+    @controller = Class.new(BasicController) do
       def url_for(*args) "http://www.example.com" end
     end.new
 
@@ -50,7 +51,6 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def teardown
     ActionController::Base.perform_caching = false
-    ActionController::Base.asset_host = nil
     ENV.delete('RAILS_ASSET_ID')
   end
 
@@ -141,13 +141,16 @@ class AssetTagHelperTest < ActionView::TestCase
 
   ImageLinkToTag = {
     %(image_tag("xml.png")) => %(<img alt="Xml" src="/images/xml.png" />),
-    %(image_tag("..jpg")) => %(<img alt="" src="/images/..jpg" />),
+    %(image_tag("..jpg")) => %(<img alt="..jpg" src="/images/..jpg" />),
     %(image_tag("rss.gif", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.gif" />),
     %(image_tag("gold.png", :size => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
     %(image_tag("gold.png", "size" => "45x70")) => %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />),
     %(image_tag("error.png", "size" => "45")) => %(<img alt="Error" src="/images/error.png" />),
     %(image_tag("error.png", "size" => "45 x 70")) => %(<img alt="Error" src="/images/error.png" />),
     %(image_tag("error.png", "size" => "x")) => %(<img alt="Error" src="/images/error.png" />),
+    %(image_tag("google.com.png")) => %(<img alt="Google.com" src="/images/google.com.png" />),
+    %(image_tag("slash..png")) => %(<img alt="Slash." src="/images/slash..png" />),
+    %(image_tag(".pdf.png")) => %(<img alt=".pdf" src="/images/.pdf.png" />),
     %(image_tag("http://www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />),
     %(image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
     %(image_tag("mouse.png", :mouseover => image_path("mouse_over.png"))) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />)
@@ -372,11 +375,9 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_timebased_asset_id_with_relative_url_root
-      ActionController::Base.relative_url_root = "/collaboration/hieraki"
-      expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
-      assert_equal %(<img alt="Rails" src="#{ActionController::Base.relative_url_root}/images/rails.png?#{expected_time}" />), image_tag("rails.png")
-    ensure
-      ActionController::Base.relative_url_root = ""
+    @controller.config.relative_url_root = "/collaboration/hieraki"
+    expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
+    assert_equal %(<img alt="Rails" src="#{@controller.config.relative_url_root}/images/rails.png?#{expected_time}" />), image_tag("rails.png")
   end
 
   def test_should_skip_asset_id_on_complete_url
@@ -402,7 +403,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_image_path_with_caching_and_proc_asset_host_using_request
     ENV['RAILS_ASSET_ID'] = ''
-    ActionController::Base.asset_host = Proc.new do |source, request|
+    @controller.config.asset_host = Proc.new do |source, request|
       if request.ssl?
         "#{request.protocol}#{request.host_with_port}"
       else
@@ -410,8 +411,6 @@ class AssetTagHelperTest < ActionView::TestCase
       end
     end
 
-    ActionController::Base.perform_caching = true
-
 
     @controller.request.stubs(:ssl?).returns(false)
     assert_equal "http://assets15.example.com/images/xml.png", image_path("xml.png")
@@ -422,7 +421,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -454,7 +453,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_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" }
+    @controller.config.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
     ActionController::Base.perform_caching = true
 
     assert_equal '/javascripts/scripts.js'.length, 23
@@ -471,7 +470,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on_with_2_argument_proc_asset_host
     ENV['RAILS_ASSET_ID'] = ''
-    ActionController::Base.asset_host = Proc.new { |source, request|
+    @controller.config.asset_host = Proc.new { |source, request|
       if request.ssl?
         "#{request.protocol}#{request.host_with_port}"
       else
@@ -508,7 +507,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on_with_2_argument_object_asset_host
     ENV['RAILS_ASSET_ID'] = ''
-    ActionController::Base.asset_host = Class.new do
+    @controller.config.asset_host = Class.new do
       def call(source, request)
         if request.ssl?
           "#{request.protocol}#{request.host_with_port}"
@@ -548,7 +547,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_when_caching_on_and_using_subdirectory
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a%d.example.com'
+    @controller.config.asset_host = 'http://a%d.example.com'
     ActionController::Base.perform_caching = true
 
     hash = '/javascripts/cache/money.js'.hash % 4
@@ -564,7 +563,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_with_all_and_recursive_puts_defaults_at_the_start_of_the_file
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -585,7 +584,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_with_all_puts_defaults_at_the_start_of_the_file
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -606,7 +605,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_javascript_include_tag_with_relative_url_root
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.relative_url_root = "/collaboration/hieraki"
+    @controller.config.relative_url_root = "/collaboration/hieraki"
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -624,7 +623,6 @@ class AssetTagHelperTest < ActionView::TestCase
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
 
   ensure
-    ActionController::Base.relative_url_root = nil
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
     FileUtils.rm_f(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
   end
@@ -694,7 +692,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_when_caching_on
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.asset_host = 'http://a0.example.com'
+    @controller.config.asset_host = 'http://a0.example.com'
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -804,7 +802,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   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" }
+    @controller.config.asset_host = Proc.new { |source| "http://a#{source.length}.example.com" }
     ActionController::Base.perform_caching = true
 
     assert_equal '/stylesheets/styles.css'.length, 23
@@ -821,7 +819,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
   def test_caching_stylesheet_link_tag_with_relative_url_root
     ENV["RAILS_ASSET_ID"] = ""
-    ActionController::Base.relative_url_root = "/collaboration/hieraki"
+    @controller.config.relative_url_root = "/collaboration/hieraki"
     ActionController::Base.perform_caching = true
 
     assert_dom_equal(
@@ -841,7 +839,6 @@ class AssetTagHelperTest < ActionView::TestCase
 
     assert File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
   ensure
-    ActionController::Base.relative_url_root = nil
     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
@@ -879,21 +876,16 @@ end
 class AssetTagHelperNonVhostTest < ActionView::TestCase
   tests ActionView::Helpers::AssetTagHelper
 
-  DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG
-  include ActiveSupport::Configurable
-
   def setup
     super
-    ActionController::Base.relative_url_root = "/collaboration/hieraki"
-
-    @controller = Class.new do
-      attr_accessor :request
-
+    @controller = Class.new(BasicController) do
       def url_for(options)
         "http://www.example.com/collaboration/hieraki"
       end
     end.new
 
+    @controller.config.relative_url_root = "/collaboration/hieraki"
+
     @request = Class.new do
       def protocol
         'gopher://'
@@ -905,10 +897,6 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
   end
 
-  def teardown
-    ActionController::Base.relative_url_root = nil
-  end
-
   def test_should_compute_proper_path
     assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
     assert_dom_equal(%(/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
@@ -923,43 +911,33 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
   end
 
   def test_should_compute_proper_path_with_asset_host
-    ActionController::Base.asset_host = "http://assets.example.com"
+    @controller.config.asset_host = "http://assets.example.com"
     assert_dom_equal(%(<link href="http://www.example.com/collaboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />), auto_discovery_link_tag)
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/javascripts/xmlhr.js), javascript_path("xmlhr"))
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
     assert_dom_equal(%(http://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
     assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='http://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='http://assets.example.com/collaboration/hieraki/images/mouse.png'" src="http://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
     assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='http://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='http://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="http://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
-  ensure
-    ActionController::Base.asset_host = ""
   end
 
   def test_should_ignore_asset_host_on_complete_url
-    ActionController::Base.asset_host = "http://assets.example.com"
+    @controller.config.asset_host = "http://assets.example.com"
     assert_dom_equal(%(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("http://bar.example.com/stylesheets/style.css"))
-  ensure
-    ActionController::Base.asset_host = ""
   end
 
   def test_should_wildcard_asset_host_between_zero_and_four
-    ActionController::Base.asset_host = 'http://a%d.example.com'
+    @controller.config.asset_host = 'http://a%d.example.com'
     assert_match %r(http://a[0123].example.com/collaboration/hieraki/images/xml.png), image_path('xml.png')
-  ensure
-    ActionController::Base.asset_host = nil
   end
 
   def test_asset_host_without_protocol_should_use_request_protocol
-    ActionController::Base.asset_host = 'a.example.com'
+    @controller.config.asset_host = 'a.example.com'
     assert_equal 'gopher://a.example.com/collaboration/hieraki/images/xml.png', image_path('xml.png')
-  ensure
-    ActionController::Base.asset_host = nil
   end
 
   def test_asset_host_without_protocol_should_use_request_protocol_even_if_path_present
-    ActionController::Base.asset_host = 'a.example.com/files/go/here'
+    @controller.config.asset_host = 'a.example.com/files/go/here'
     assert_equal 'gopher://a.example.com/files/go/here/collaboration/hieraki/images/xml.png', image_path('xml.png')
-  ensure
-    ActionController::Base.asset_host = nil
   end
 
   def test_assert_css_and_js_of_the_same_name_return_correct_extension
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb
index 347cb98303..869ea22469 100644
--- a/actionpack/test/template/atom_feed_helper_test.rb
+++ b/actionpack/test/template/atom_feed_helper_test.rb
@@ -4,8 +4,8 @@ class Scroll < Struct.new(:id, :to_param, :title, :body, :updated_at, :created_a
   extend ActiveModel::Naming
   include ActiveModel::Conversion
 
-  def new_record?
-    true
+  def persisted?
+    false
   end
 end
 
@@ -34,7 +34,7 @@ class ScrollsController < ActionController::Base
           feed.updated((@scrolls.first.created_at))
 
           for scroll in @scrolls
-            feed.entry(scroll, :url => "/otherstuff/" + scroll.to_param, :updated => Time.utc(2007, 1, scroll.id)) do |entry|
+            feed.entry(scroll, :url => "/otherstuff/" + scroll.to_param.to_s, :updated => Time.utc(2007, 1, scroll.id)) do |entry|
               entry.title(scroll.title)
               entry.content(scroll.body, :type => 'html')
 
@@ -55,7 +55,7 @@ class ScrollsController < ActionController::Base
           end
 
           for scroll in @scrolls
-            feed.entry(scroll, :url => "/otherstuff/" + scroll.to_param, :updated => Time.utc(2007, 1, scroll.id)) do |entry|
+            feed.entry(scroll, :url => "/otherstuff/" + scroll.to_param.to_s, :updated => Time.utc(2007, 1, scroll.id)) do |entry|
               entry.title(scroll.title)
               entry.content(scroll.body, :type => 'html')
             end
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index 632988bb2e..2c719757e4 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -14,9 +14,6 @@ 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
@@ -44,7 +41,7 @@ class CompiledTemplatesTest < Test::Unit::TestCase
     end
 
     def render_without_cache(*args)
-      path = ActionView::FileSystemResolverWithFallback.new(FIXTURE_LOAD_PATH)
+      path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
       view_paths = ActionView::Base.process_view_paths(path)
       ActionView::Base.new(view_paths, {}).render(*args)
     end
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index fb51b67185..da2477b6f8 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1229,11 +1229,28 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", :order => [ :month, :year ])
   end
 
+  def test_date_select_without_day_and_with_disabled_html_option
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = "<input type=\"hidden\" id=\"post_written_on_3i\" disabled=\"disabled\" name=\"post[written_on(3i)]\" value=\"1\" />\n"
+
+    expected <<  %{<select id="post_written_on_2i" disabled="disabled" name="post[written_on(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_1i" disabled="disabled" name="post[written_on(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", { :order => [ :month, :year ] }, :disabled => true)
+  end
+
   def test_date_select_within_fields_for
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.date_select(:written_on)
     end
 
@@ -1249,7 +1266,7 @@ class DateHelperTest < ActionView::TestCase
     @post.written_on = Date.new(2004, 6, 15)
     id = 27
 
-    fields_for :post, @post, :index => id do |f|
+    output_buffer = fields_for :post, @post, :index => id do |f|
       concat f.date_select(:written_on)
     end
 
@@ -1265,7 +1282,7 @@ class DateHelperTest < ActionView::TestCase
     @post.written_on = Date.new(2004, 6, 15)
     id = nil
 
-    fields_for :post, @post, :index => id do |f|
+    output_buffer = fields_for :post, @post, :index => id do |f|
       concat f.date_select(:written_on)
     end
 
@@ -1461,7 +1478,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.date_select(:written_on, {}, :class => 'selector')
     end
 
@@ -1625,7 +1642,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.time_select(:written_on, {}, :class => 'selector')
     end
 
@@ -1713,6 +1730,25 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, time_select("post", "written_on", :prompt => {:hour => 'Choose hour', :minute => 'Choose minute'})
   end
 
+  def test_time_select_with_disabled_html_option
+    @post = Post.new
+    @post.written_on = Time.local(2004, 6, 15, 15, 16, 35)
+
+    expected = %{<input type="hidden" id="post_written_on_1i" disabled="disabled" name="post[written_on(1i)]" value="2004" />\n}
+    expected << %{<input type="hidden" id="post_written_on_2i" disabled="disabled" name="post[written_on(2i)]" value="6" />\n}
+    expected << %{<input type="hidden" id="post_written_on_3i" disabled="disabled" name="post[written_on(3i)]" value="15" />\n}
+
+    expected << %(<select id="post_written_on_4i" disabled="disabled" name="post[written_on(4i)]">\n)
+    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %(<select id="post_written_on_5i" disabled="disabled" name="post[written_on(5i)]">\n)
+    0.upto(59) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 16}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, time_select("post", "written_on", {}, :disabled => true)
+  end
+
   def test_datetime_select
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
@@ -1780,7 +1816,7 @@ class DateHelperTest < ActionView::TestCase
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.datetime_select(:updated_at, {}, :class => 'selector')
     end
 
@@ -2016,7 +2052,7 @@ class DateHelperTest < ActionView::TestCase
     @post.updated_at = Time.local(2004, 6, 15, 16, 35)
     id = 456
 
-    fields_for :post, @post, :index => id do |f|
+    output_buffer = fields_for :post, @post, :index => id do |f|
       concat f.datetime_select(:updated_at)
     end
 
@@ -2173,6 +2209,66 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, datetime_select("post", "updated_at", :discard_year => true, :discard_month => true)
   end
 
+  def test_datetime_select_discard_year_and_month_with_disabled_html_option
+    @post = Post.new
+    @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
+
+    expected = %{<input type="hidden" id="post_updated_at_1i" disabled="disabled" name="post[updated_at(1i)]" value="2004" />\n}
+    expected << %{<input type="hidden" id="post_updated_at_2i" disabled="disabled" name="post[updated_at(2i)]" value="6" />\n}
+    expected << %{<input type="hidden" id="post_updated_at_3i" disabled="disabled" name="post[updated_at(3i)]" value="15" />\n}
+
+    expected << %{<select id="post_updated_at_4i" disabled="disabled" name="post[updated_at(4i)]">\n}
+    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+    expected << " : "
+    expected << %{<select id="post_updated_at_5i" disabled="disabled" name="post[updated_at(5i)]">\n}
+    0.upto(59) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 16}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, datetime_select("post", "updated_at", { :discard_year => true, :discard_month => true }, :disabled => true)
+  end
+
+  def test_datetime_select_discard_hour
+    @post = Post.new
+    @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
+
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    1999.upto(2009) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 2004}>#{i}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    1.upto(12) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 6}>#{Date::MONTHNAMES[i]}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    1.upto(31) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 15}>#{i}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, datetime_select("post", "updated_at", :discard_hour => true)
+  end
+
+  def test_datetime_select_discard_minute
+    @post = Post.new
+    @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
+
+    expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
+    1999.upto(2009) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 2004}>#{i}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_2i" name="post[updated_at(2i)]">\n}
+    1.upto(12) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 6}>#{Date::MONTHNAMES[i]}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<select id="post_updated_at_3i" name="post[updated_at(3i)]">\n}
+    1.upto(31) { |i| expected << %(<option value="#{i}"#{' selected="selected"' if i == 15}>#{i}</option>\n) }
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %{<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n}
+    0.upto(23) { |i| expected << %(<option value="#{sprintf("%02d", i)}"#{' selected="selected"' if i == 15}>#{sprintf("%02d", i)}</option>\n) }
+    expected << "</select>\n"
+    expected << %{<input type="hidden" id="post_updated_at_5i" name="post[updated_at(5i)]" value="16" />\n}
+
+    assert_dom_equal expected, datetime_select("post", "updated_at", :discard_minute => true)
+  end
+
   def test_datetime_select_invalid_order
     @post = Post.new
     @post.updated_at = Time.local(2004, 6, 15, 15, 16, 35)
diff --git a/actionpack/test/template/erb/tag_helper_test.rb b/actionpack/test/template/erb/tag_helper_test.rb
new file mode 100644
index 0000000000..cc96a43901
--- /dev/null
+++ b/actionpack/test/template/erb/tag_helper_test.rb
@@ -0,0 +1,82 @@
+require "abstract_unit"
+
+module ERBTest
+  class ViewContext
+    mock_controller = Class.new do
+      include SharedTestRoutes.url_helpers
+    end
+
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::JavaScriptHelper
+    include ActionView::Helpers::FormHelper
+
+    attr_accessor :output_buffer
+
+    def protect_against_forgery?() false end
+
+    define_method(:controller) do
+      mock_controller.new
+    end
+  end
+
+  class DeprecatedViewContext < ViewContext
+    include ActionView::Helpers::DeprecatedBlockHelpers
+  end
+
+  module SharedTagHelpers
+    extend ActiveSupport::Testing::Declarative
+
+    def render_content(start, inside)
+      template = block_helper(start, inside)
+      ActionView::Template::Handlers::Erubis.new(template).evaluate(context.new)
+    end
+
+    test "percent equals works for content_tag and does not require parenthesis on method call" do
+      assert_equal "<div>Hello world</div>", render_content("content_tag :div", "Hello world")
+    end
+
+    test "percent equals works for javascript_tag" do
+      expected_output = "<script type=\"text/javascript\">\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
+      assert_equal expected_output, render_content("javascript_tag", "alert('Hello')")
+    end
+
+    test "percent equals works for javascript_tag with options" do
+      expected_output = "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('Hello')\n//]]>\n</script>"
+      assert_equal expected_output, render_content("javascript_tag(:id => 'the_js_tag')", "alert('Hello')")
+    end
+
+    test "percent equals works with form tags" do
+      expected_output = "<form action=\"foo\" method=\"post\">hello</form>"
+      assert_equal expected_output, render_content("form_tag('foo')", "<%= 'hello' %>")
+    end
+
+    test "percent equals works with fieldset tags" do
+      expected_output = "<fieldset><legend>foo</legend>hello</fieldset>"
+      assert_equal expected_output, render_content("field_set_tag('foo')", "<%= 'hello' %>")
+    end
+  end
+
+  class TagHelperTest < ActiveSupport::TestCase
+    def context
+      ViewContext
+    end
+
+    def block_helper(str, rest)
+      "<%= #{str} do %>#{rest}<% end %>"
+    end
+
+    include SharedTagHelpers
+  end
+
+  class DeprecatedTagHelperTest < ActiveSupport::TestCase
+    def context
+      DeprecatedViewContext
+    end
+
+    def block_helper(str, rest)
+      "<% __in_erb_template=true %><% #{str} do %>#{rest}<% end %>"
+    end
+
+    include SharedTagHelpers
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 7b909fff82..7c5ccfd6ed 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -4,6 +4,10 @@ require 'controller/fake_models'
 class FormHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormHelper
 
+  def form_for(*)
+    @output_buffer = super
+  end
+
   def setup
     super
 
@@ -53,6 +57,7 @@ class FormHelperTest < ActionView::TestCase
     def @post.id_before_type_cast; 123; end
     def @post.to_param; '123'; end
 
+    @post.persisted   = true
     @post.title       = "Hello World"
     @post.author_name = ""
     @post.body        = "Back to the hill and over it again!"
@@ -529,7 +534,7 @@ class FormHelperTest < ActionView::TestCase
   def test_submit_with_object_as_new_record_and_locale_strings
     old_locale, I18n.locale = I18n.locale, :submit
 
-    def @post.new_record?() true; end
+    @post.persisted = false
     form_for(:post, @post) do |f|
       concat f.submit
     end
@@ -589,9 +594,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for
     form_for(:post, @post) do |f|
-      f.fields_for(:comment, @post) do |c|
+      concat f.fields_for(:comment, @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -604,9 +609,9 @@ class FormHelperTest < ActionView::TestCase
   def test_nested_fields_for_with_nested_collections
     form_for('post[]', @post) do |f|
       concat f.text_field(:title)
-      f.fields_for('comment[]', @comment) do |c|
+      concat f.fields_for('comment[]', @comment) { |c|
         concat c.text_field(:name)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -620,9 +625,9 @@ class FormHelperTest < ActionView::TestCase
   def test_nested_fields_for_with_index_and_parent_fields
     form_for('post', @post, :index => 1) do |c|
       concat c.text_field(:title)
-      c.fields_for('comment', @comment, :index => 1) do |r|
+      concat c.fields_for('comment', @comment, :index => 1) { |r|
         concat r.text_field(:name)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -634,10 +639,10 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_index_and_nested_fields_for
-    form_for(:post, @post, :index => 1) do |f|
-      f.fields_for(:comment, @post) do |c|
+    output_buffer = form_for(:post, @post, :index => 1) do |f|
+      concat f.fields_for(:comment, @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -649,9 +654,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_index_on_both
     form_for(:post, @post, :index => 1) do |f|
-      f.fields_for(:comment, @post, :index => 5) do |c|
+      concat f.fields_for(:comment, @post, :index => 5) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -663,9 +668,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_auto_index
     form_for("post[]", @post) do |f|
-      f.fields_for(:comment, @post) do |c|
+      concat f.fields_for(:comment, @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -677,9 +682,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_index_radio_button
     form_for(:post, @post) do |f|
-      f.fields_for(:comment, @post, :index => 5) do |c|
+      concat f.fields_for(:comment, @post, :index => 5) { |c|
         concat c.radio_button(:title, "hello")
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -691,9 +696,9 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_auto_index_on_both
     form_for("post[]", @post) do |f|
-      f.fields_for("comment[]", @post) do |c|
+      concat f.fields_for("comment[]", @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -704,16 +709,16 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_nested_fields_for_with_index_and_auto_index
-    form_for("post[]", @post) do |f|
-      f.fields_for(:comment, @post, :index => 5) do |c|
+    output_buffer = form_for("post[]", @post) do |f|
+      concat f.fields_for(:comment, @post, :index => 5) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
-    form_for(:post, @post, :index => 1) do |f|
-      f.fields_for("comment[]", @post) do |c|
+    output_buffer << form_for(:post, @post, :index => 1) do |f|
+      concat f.fields_for("comment[]", @post) { |c|
         concat c.text_field(:title)
-      end
+      }
     end
 
     expected = "<form action='http://www.example.com' method='post'>" +
@@ -731,9 +736,9 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:author) do |af|
+      concat f.fields_for(:author) { |af|
         concat af.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -758,9 +763,9 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:author) do |af|
+      concat f.fields_for(:author) { |af|
         concat af.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -777,10 +782,10 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:author) do |af|
+      concat f.fields_for(:author) { |af|
         concat af.hidden_field(:id)
         concat af.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -798,9 +803,9 @@ class FormHelperTest < ActionView::TestCase
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
       @post.comments.each do |comment|
-        f.fields_for(:comments, comment) do |cf|
+        concat f.fields_for(:comments, comment) { |cf|
           concat cf.text_field(:name)
-        end
+        }
       end
     end
 
@@ -821,10 +826,10 @@ class FormHelperTest < ActionView::TestCase
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
       @post.comments.each do |comment|
-        f.fields_for(:comments, comment) do |cf|
+        concat f.fields_for(:comments, comment) { |cf|
           concat cf.hidden_field(:id)
           concat cf.text_field(:name)
-        end
+        }
       end
     end
 
@@ -845,9 +850,9 @@ class FormHelperTest < ActionView::TestCase
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
       @post.comments.each do |comment|
-        f.fields_for(:comments, comment) do |cf|
+        concat f.fields_for(:comments, comment) { |cf|
           concat cf.text_field(:name)
-        end
+        }
       end
     end
 
@@ -866,9 +871,9 @@ class FormHelperTest < ActionView::TestCase
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
       @post.comments.each do |comment|
-        f.fields_for(:comments, comment) do |cf|
+        concat f.fields_for(:comments, comment) { |cf|
           concat cf.text_field(:name)
-        end
+        }
       end
     end
 
@@ -902,9 +907,9 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:comments, @post.comments) do |cf|
+      concat f.fields_for(:comments, @post.comments) { |cf|
         concat cf.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -924,9 +929,9 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:comments, comments) do |cf|
+      concat f.fields_for(:comments, comments) { |cf|
         concat cf.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -946,10 +951,10 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(:post, @post) do |f|
       concat f.text_field(:title)
-      f.fields_for(:comments) do |cf|
+      concat f.fields_for(:comments) { |cf|
         concat cf.text_field(:name)
         yielded_comments << cf.object
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -967,9 +972,9 @@ class FormHelperTest < ActionView::TestCase
     @post.comments = []
 
     form_for(:post, @post) do |f|
-      f.fields_for(:comments, Comment.new(321), :child_index => 'abc') do |cf|
+      concat f.fields_for(:comments, Comment.new(321), :child_index => 'abc') { |cf|
         concat cf.text_field(:name)
-      end
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -987,24 +992,24 @@ class FormHelperTest < ActionView::TestCase
     @post.tags[0].relevances = []
     @post.tags[1].relevances = []
     form_for(:post, @post) do |f|
-      f.fields_for(:comments, @post.comments[0]) do |cf|
+      concat f.fields_for(:comments, @post.comments[0]) { |cf|
         concat cf.text_field(:name)
-        cf.fields_for(:relevances, CommentRelevance.new(314)) do |crf|
+        concat cf.fields_for(:relevances, CommentRelevance.new(314)) { |crf|
           concat crf.text_field(:value)
-        end
-      end
-      f.fields_for(:tags, @post.tags[0]) do |tf|
+        }
+      }
+      concat f.fields_for(:tags, @post.tags[0]) { |tf|
         concat tf.text_field(:value)
-        tf.fields_for(:relevances, TagRelevance.new(3141)) do |trf|
+        concat tf.fields_for(:relevances, TagRelevance.new(3141)) { |trf|
           concat trf.text_field(:value)
-        end
-      end
-      f.fields_for('tags', @post.tags[1]) do |tf|
+        }
+      }
+      concat f.fields_for('tags', @post.tags[1]) { |tf|
         concat tf.text_field(:value)
-        tf.fields_for(:relevances, TagRelevance.new(31415)) do |trf|
+        concat tf.fields_for(:relevances, TagRelevance.new(31415)) { |trf|
           concat trf.text_field(:value)
-        end
-      end
+        }
+      }
     end
 
     expected = '<form action="http://www.example.com" method="post">' +
@@ -1026,7 +1031,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for
-    fields_for(:post, @post) do |f|
+    output_buffer = fields_for(:post, @post) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1042,7 +1047,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_index
-    fields_for("post[]", @post) do |f|
+    output_buffer = fields_for("post[]", @post) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1058,7 +1063,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_nil_index_option_override
-    fields_for("post[]", @post, :index => nil) do |f|
+    output_buffer = fields_for("post[]", @post, :index => nil) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1074,7 +1079,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_index_option_override
-    fields_for("post[]", @post, :index => "abc") do |f|
+    output_buffer = fields_for("post[]", @post, :index => "abc") do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1090,7 +1095,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_without_object
-    fields_for(:post) do |f|
+    output_buffer = fields_for(:post) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1106,7 +1111,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_only_object
-    fields_for(@post) do |f|
+    output_buffer = fields_for(@post) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1122,7 +1127,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_object_with_bracketed_name
-    fields_for("author[post]", @post) do |f|
+    output_buffer = fields_for("author[post]", @post) do |f|
       concat f.label(:title)
       concat f.text_field(:title)
     end
@@ -1133,7 +1138,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_object_with_bracketed_name_and_index
-    fields_for("author[post]", @post, :index => 1) do |f|
+    output_buffer = fields_for("author[post]", @post, :index => 1) do |f|
       concat f.label(:title)
       concat f.text_field(:title)
     end
@@ -1152,9 +1157,9 @@ class FormHelperTest < ActionView::TestCase
       concat post_form.text_field(:title)
       concat post_form.text_area(:body)
 
-      fields_for(:parent_post, @post) do |parent_fields|
+      concat fields_for(:parent_post, @post) { |parent_fields|
         concat parent_fields.check_box(:secret)
-      end
+      }
     end
 
     expected =
@@ -1173,9 +1178,9 @@ class FormHelperTest < ActionView::TestCase
       concat post_form.text_field(:title)
       concat post_form.text_area(:body)
 
-      post_form.fields_for(@comment) do |comment_fields|
+      concat post_form.fields_for(@comment) { |comment_fields|
         concat comment_fields.text_field(:name)
-      end
+      }
     end
 
     expected =
@@ -1272,7 +1277,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_labelled_builder
-    fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+    output_buffer = fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1363,7 +1368,7 @@ class FormHelperTest < ActionView::TestCase
 
   def test_form_for_with_new_object
     post = Post.new
-    post.new_record = true
+    post.persisted = false
     def post.id() nil end
 
     form_for(post) do |f| end
@@ -1373,9 +1378,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_existing_object_in_list
-    @post.new_record = false
     @comment.save
-
     form_for([@post, @comment]) {}
 
     expected = %(<form action="#{comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0;display:inline"><input name="_method" type="hidden" value="put" /></div></form>)
@@ -1383,8 +1386,6 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_new_object_in_list
-    @post.new_record = false
-
     form_for([@post, @comment]) {}
 
     expected = %(<form action="#{comments_path(@post)}" class="new_comment" id="new_comment" method="post"></form>)
@@ -1392,9 +1393,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_existing_object_and_namespace_in_list
-    @post.new_record = false
     @comment.save
-
     form_for([:admin, @post, @comment]) {}
 
     expected = %(<form action="#{admin_comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0;display:inline"><input name="_method" type="hidden" value="put" /></div></form>)
@@ -1402,8 +1401,6 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_new_object_and_namespace_in_list
-    @post.new_record = false
-
     form_for([:admin, @post, @comment]) {}
 
     expected = %(<form action="#{admin_comments_path(@post)}" class="new_comment" id="new_comment" method="post"></form>)
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index aa40e46aa8..5799e3db53 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -293,7 +293,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.category = "<mus>"
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.select(:category, %w( abe <mus> hest))
     end
   
@@ -307,7 +307,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.category = "<mus>"
 
-    fields_for :post, @post, :index => 108 do |f|
+    output_buffer = fields_for :post, @post, :index => 108 do |f|
       concat f.select(:category, %w( abe <mus> hest))
     end
 
@@ -322,7 +322,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post.category = "<mus>"
     def @post.to_param; 108; end
 
-    fields_for "post[]", @post do |f|
+    output_buffer = fields_for "post[]", @post do |f|
       concat f.select(:category, %w( abe <mus> hest))
     end
 
@@ -336,7 +336,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     options = "<option value=\"abe\">abe</option><option value=\"mus\">mus</option><option value=\"hest\">hest</option>"
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.select(:category, options, :prompt => 'The prompt')
     end
 
@@ -462,7 +462,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.author_name = "Babe"
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
     end
   
@@ -476,7 +476,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.author_name = "Babe"
 
-    fields_for :post, @post, :index => 815 do |f|
+    output_buffer = fields_for :post, @post, :index => 815 do |f|
       concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
     end
 
@@ -491,7 +491,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post.author_name = "Babe"
     def @post.to_param; 815; end
 
-    fields_for "post[]", @post do |f|
+    output_buffer = fields_for "post[]", @post do |f|
       concat f.collection_select(:author_name, dummy_posts, :author_name, :author_name)
     end
 
@@ -570,7 +570,7 @@ class FormOptionsHelperTest < ActionView::TestCase
   def test_time_zone_select_under_fields_for
     @firm = Firm.new("D")
 
-    fields_for :firm, @firm do |f|
+    output_buffer = fields_for :firm, @firm do |f|
       concat f.time_zone_select(:time_zone)
     end
   
@@ -589,7 +589,7 @@ class FormOptionsHelperTest < ActionView::TestCase
   def test_time_zone_select_under_fields_for_with_index
     @firm = Firm.new("D")
 
-    fields_for :firm, @firm, :index => 305 do |f|
+    output_buffer = fields_for :firm, @firm, :index => 305 do |f|
       concat f.time_zone_select(:time_zone)
     end
 
@@ -609,7 +609,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @firm = Firm.new("D")
     def @firm.to_param; 305; end
 
-    fields_for "firm[]", @firm do |f|
+    output_buffer = fields_for "firm[]", @firm do |f|
       concat f.time_zone_select(:time_zone)
     end
 
@@ -787,7 +787,7 @@ class FormOptionsHelperTest < ActionView::TestCase
     @post = Post.new
     @post.origin = 'dk'
 
-    fields_for :post, @post do |f|
+    output_buffer = fields_for :post, @post do |f|
       concat f.grouped_collection_select("origin", @continents, :countries, :continent_name, :country_id, :country_name)
     end
 
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 6ac5df1ea9..868a35c476 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -3,17 +3,16 @@ require 'abstract_unit'
 class FormTagHelperTest < ActionView::TestCase
   tests ActionView::Helpers::FormTagHelper
 
-  include ActiveSupport::Configurable
-  DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG
+  # include ActiveSupport::Configurable
+  # DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG
 
   def setup
     super
-    @controller = Class.new do
+    @controller = Class.new(BasicController) do
       def url_for(options)
         "http://www.example.com"
       end
-    end
-    @controller = @controller.new
+    end.new
   end
 
   VALID_HTML_ID = /^[A-Za-z][-_:.A-Za-z0-9]*$/ # see http://www.w3.org/TR/html4/types.html#type-name
@@ -60,16 +59,14 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_form_tag_with_block_in_erb
-    __in_erb_template = ''
-    form_tag("http://example.com") { concat "Hello world!" }
+    output_buffer = form_tag("http://example.com") { concat "Hello world!" }
 
     expected = %(<form action="http://example.com" method="post">Hello world!</form>)
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_tag_with_block_and_method_in_erb
-    __in_erb_template = ''
-    form_tag("http://example.com", :method => :put) { concat "Hello world!" }
+    output_buffer = form_tag("http://example.com", :method => :put) { concat "Hello world!" }
 
     expected = %(<form action="http://example.com" method="post"><div style='margin:0;padding:0;display:inline'><input type="hidden" name="_method" value="put" /></div>Hello world!</form>)
     assert_dom_equal expected, output_buffer
@@ -127,19 +124,19 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_select_tag
-    actual = select_tag "people", "<option>david</option>"
+    actual = select_tag "people", "<option>david</option>".html_safe
     expected = %(<select id="people" name="people"><option>david</option></select>)
     assert_dom_equal expected, actual
   end
 
   def test_select_tag_with_multiple
-    actual = select_tag "colors", "<option>Red</option><option>Blue</option><option>Green</option>", :multiple => :true
+    actual = select_tag "colors", "<option>Red</option><option>Blue</option><option>Green</option>".html_safe, :multiple => :true
     expected = %(<select id="colors" multiple="multiple" name="colors"><option>Red</option><option>Blue</option><option>Green</option></select>)
     assert_dom_equal expected, actual
   end
 
   def test_select_tag_disabled
-    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>", :disabled => :true
+    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :disabled => :true
     expected = %(<select id="places" disabled="disabled" name="places"><option>Home</option><option>Work</option><option>Pub</option></select>)
     assert_dom_equal expected, actual
   end
@@ -150,13 +147,13 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_select_tag_with_include_blank
-    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>", :include_blank => true
+    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :include_blank => true
     expected = %(<select id="places" name="places"><option value=""></option><option>Home</option><option>Work</option><option>Pub</option></select>)
     assert_dom_equal expected, actual
   end
 
   def test_select_tag_with_include_blank_with_string
-    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>", :include_blank => "string"
+    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :include_blank => "string"
     expected = %(<select id="places" name="places"><option value="">string</option><option>Home</option><option>Work</option><option>Pub</option></select>)
     assert_dom_equal expected, actual
   end
@@ -282,9 +279,9 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal %(<input checked="checked" disabled="disabled" id="admin" name="admin" readonly="readonly" type="checkbox" value="1" />), check_box_tag("admin", 1, true, 'disabled' => true, :readonly => "yes")
     assert_dom_equal %(<input checked="checked" id="admin" name="admin" type="checkbox" value="1" />), check_box_tag("admin", 1, true, :disabled => false, :readonly => nil)
     assert_dom_equal %(<input type="checkbox" />), tag(:input, :type => "checkbox", :checked => false)
-    assert_dom_equal %(<select id="people" multiple="multiple" name="people[]"><option>david</option></select>), select_tag("people", "<option>david</option>", :multiple => true)
-    assert_dom_equal %(<select id="people_" multiple="multiple" name="people[]"><option>david</option></select>), select_tag("people[]", "<option>david</option>", :multiple => true)
-    assert_dom_equal %(<select id="people" name="people"><option>david</option></select>), select_tag("people", "<option>david</option>", :multiple => nil)
+    assert_dom_equal %(<select id="people" multiple="multiple" name="people[]"><option>david</option></select>), select_tag("people", "<option>david</option>".html_safe, :multiple => true)
+    assert_dom_equal %(<select id="people_" multiple="multiple" name="people[]"><option>david</option></select>), select_tag("people[]", "<option>david</option>".html_safe, :multiple => true)
+    assert_dom_equal %(<select id="people" name="people"><option>david</option></select>), select_tag("people", "<option>david</option>".html_safe, :multiple => nil)
   end
 
   def test_stringify_symbol_keys
@@ -333,26 +330,22 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_field_set_tag_in_erb
-    __in_erb_template = ''
-    field_set_tag("Your details") { concat "Hello world!" }
+    output_buffer = field_set_tag("Your details") { concat "Hello world!" }
 
     expected = %(<fieldset><legend>Your details</legend>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    self.output_buffer = ''.html_safe
-    field_set_tag { concat "Hello world!" }
+    output_buffer = field_set_tag { concat "Hello world!" }
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    self.output_buffer = ''.html_safe
-    field_set_tag('') { concat "Hello world!" }
+    output_buffer = field_set_tag('') { concat "Hello world!" }
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    self.output_buffer = ''.html_safe
-    field_set_tag('', :class => 'format') { concat "Hello world!" }
+    output_buffer = field_set_tag('', :class => 'format') { concat "Hello world!" }
 
     expected = %(<fieldset class="format">Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index b3e7abc387..f49b763881 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -7,8 +7,9 @@ class JavaScriptHelperTest < ActionView::TestCase
 
   attr_accessor :formats, :output_buffer
 
-  def reset_formats(format)
-    @format = format
+  def update_details(details)
+    @details = details
+    yield if block_given?
   end
 
   def setup
@@ -73,18 +74,6 @@ class JavaScriptHelperTest < ActionView::TestCase
       javascript_tag("alert('hello')", :id => "the_js_tag")
   end
 
-  def test_javascript_tag_with_block_in_erb
-    __in_erb_template = ''
-    javascript_tag { concat "alert('hello')" }
-    assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", output_buffer
-  end
-
-  def test_javascript_tag_with_block_and_options_in_erb
-    __in_erb_template = ''
-    javascript_tag(:id => "the_js_tag") { concat "alert('hello')" }
-    assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", output_buffer
-  end
-
   def test_javascript_cdata_section
     assert_dom_equal "\n//<![CDATA[\nalert('hello')\n//]]>\n", javascript_cdata_section("alert('hello')")
   end
diff --git a/actionpack/test/template/subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
index 8bacab7088..5076dfa70f 100644
--- a/actionpack/test/template/subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -1,22 +1,22 @@
 require "abstract_unit"
-require "rails/subscriber/test_helper"
-require "action_view/railties/subscriber"
+require "rails/log_subscriber/test_helper"
+require "action_view/railties/log_subscriber"
 require "controller/fake_models"
 
-class AVSubscriberTest < ActiveSupport::TestCase
-  include Rails::Subscriber::TestHelper
+class AVLogSubscriberTest < ActiveSupport::TestCase
+  include Rails::LogSubscriber::TestHelper
 
   def setup
+    super
     @old_logger = ActionController::Base.logger
     @view = ActionView::Base.new(ActionController::Base.view_paths, {})
     Rails.stubs(:root).returns(File.expand_path(FIXTURE_LOAD_PATH))
-    Rails::Subscriber.add(:action_view, ActionView::Railties::Subscriber.new)
-    super
+    Rails::LogSubscriber.add(:action_view, ActionView::Railties::LogSubscriber.new)
   end
 
   def teardown
     super
-    Rails::Subscriber.subscribers.clear
+    Rails::LogSubscriber.log_subscribers.clear
     ActionController::Base.logger = @old_logger
   end
 
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
new file mode 100644
index 0000000000..697ebc694a
--- /dev/null
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -0,0 +1,165 @@
+require "abstract_unit"
+require "abstract_controller/rendering"
+
+ActionView::LookupContext::DetailsKey.class_eval do
+  def self.details_keys
+    @details_keys
+  end
+end
+
+class LookupContextTest < ActiveSupport::TestCase
+  def setup
+    @lookup_context = ActionView::LookupContext.new(FIXTURE_LOAD_PATH, {})
+  end
+
+  def teardown
+    I18n.locale = :en
+    ActionView::LookupContext::DetailsKey.details_keys.clear
+  end
+
+  test "process view paths on initialization" do
+    assert_kind_of ActionView::PathSet, @lookup_context.view_paths
+  end
+
+  test "normalizes details on initialization" do
+    formats = Mime::SET + [nil]
+    locale  = [I18n.locale, nil]
+    assert_equal Hash[:formats => formats, :locale => locale], @lookup_context.details
+  end
+
+  test "allows me to set details" do
+    @lookup_context.details = { :formats => [:html], :locale => :pt }
+    assert_equal Hash[:formats => [:html, nil], :locale => [:pt, nil]], @lookup_context.details
+  end
+
+  test "does not allow details to be modified in place" do
+    assert @lookup_context.details.frozen?
+  end
+
+  test "allows me to update an specific detail" do
+    @lookup_context.update_details(:locale => :pt)
+    assert_equal :pt, I18n.locale
+    formats = Mime::SET + [nil]
+    locale  = [I18n.locale, nil]
+    assert_equal Hash[:formats => formats, :locale => locale], @lookup_context.details
+  end
+
+  test "allows me to change some details to execute an specific block of code" do
+    formats = Mime::SET + [nil]
+    @lookup_context.update_details(:locale => :pt) do
+      assert_equal Hash[:formats => formats, :locale => [:pt, nil]], @lookup_context.details
+    end
+    assert_equal Hash[:formats => formats, :locale => [:en, nil]], @lookup_context.details
+  end
+
+  test "provides getters and setters for formats" do
+    @lookup_context.formats = :html
+    assert_equal [:html], @lookup_context.formats
+  end
+
+  test "handles */* formats" do
+    @lookup_context.formats = [:"*/*"]
+    assert_equal Mime::SET, @lookup_context.formats
+  end
+
+  test "provides getters and setters for locale" do
+    @lookup_context.locale = :pt
+    assert_equal :pt, @lookup_context.locale
+  end
+
+  test "changing lookup_context locale, changes I18n.locale" do
+    @lookup_context.locale = :pt
+    assert_equal :pt, I18n.locale
+  end
+
+  test "delegates changing the locale to the I18n configuration object if it contains a lookup_context object" do
+    begin
+      I18n.config = AbstractController::I18nProxy.new(I18n.config, @lookup_context)
+      @lookup_context.locale = :pt
+      assert_equal :pt, I18n.locale
+      assert_equal :pt, @lookup_context.locale
+    ensure
+      I18n.config = I18n.config.i18n_config
+    end
+
+    assert_equal :pt, I18n.locale
+  end
+
+  test "find templates using the given view paths and configured details" do
+    template = @lookup_context.find("hello_world", "test")
+    assert_equal "Hello world!", template.source
+
+    @lookup_context.locale = :da
+    template = @lookup_context.find("hello_world", "test")
+    assert_equal "Hey verden", template.source
+  end
+
+  test "adds fallbacks to view paths when required" do
+    assert_equal 1, @lookup_context.view_paths.size
+
+    @lookup_context.with_fallbacks do
+      assert_equal 3, @lookup_context.view_paths.size
+      assert @lookup_context.view_paths.include?(ActionView::FileSystemResolver.new(""))
+      assert @lookup_context.view_paths.include?(ActionView::FileSystemResolver.new("/"))
+    end
+  end
+
+  test "add fallbacks just once in nested fallbacks calls" do
+    @lookup_context.with_fallbacks do
+      @lookup_context.with_fallbacks do
+        assert_equal 3, @lookup_context.view_paths.size
+      end
+    end
+  end
+
+  test "generates a new details key for each details hash" do
+    keys = []
+    keys << @lookup_context.details_key
+    assert_equal 1, keys.uniq.size
+
+    @lookup_context.locale = :da
+    keys << @lookup_context.details_key
+    assert_equal 2, keys.uniq.size
+
+    @lookup_context.locale = :en
+    keys << @lookup_context.details_key
+    assert_equal 2, keys.uniq.size
+
+    @lookup_context.formats = :html
+    keys << @lookup_context.details_key
+    assert_equal 3, keys.uniq.size
+
+    @lookup_context.formats = nil
+    keys << @lookup_context.details_key
+    assert_equal 3, keys.uniq.size
+  end
+
+  test "gives the key forward to the resolver, so it can be used as cache key" do
+    @lookup_context.view_paths = ActionView::FixtureResolver.new("test/_foo.erb" => "Foo")
+    template = @lookup_context.find("foo", "test", true)
+    assert_equal "Foo", template.source
+
+    # Now we are going to change the template, but it won't change the returned template
+    # since we will hit the cache.
+    @lookup_context.view_paths.first.hash["test/_foo.erb"] = "Bar"
+    template = @lookup_context.find("foo", "test", true)
+    assert_equal "Foo", template.source
+
+    # This time we will change the locale. The updated template should be picked since
+    # lookup_context generated a new key after we changed the locale.
+    @lookup_context.locale = :da
+    template = @lookup_context.find("foo", "test", true)
+    assert_equal "Bar", template.source
+
+    # Now we will change back the locale and it will still pick the old template.
+    # This is expected because lookup_context will reuse the previous key for :en locale.
+    @lookup_context.locale = :en
+    template = @lookup_context.find("foo", "test", true)
+    assert_equal "Foo", template.source
+
+    # Finally, we can expire the cache. And the expected template will be used.
+    @lookup_context.view_paths.first.clear_cache
+    template = @lookup_context.find("foo", "test", true)
+    assert_equal "Bar", template.source
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb
index d95bdc2b90..619293dc43 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -4,6 +4,7 @@ require 'active_model'
 class Bunny < Struct.new(:Bunny, :id)
   extend ActiveModel::Naming
   include ActiveModel::Conversion
+  def to_key() id ? [id] : nil end
 end
 
 class Author
@@ -11,6 +12,7 @@ class Author
   include ActiveModel::Conversion
 
   attr_reader :id
+  def to_key() id ? [id] : nil end
   def save; @id = 1 end
   def new_record?; @id.nil? end
   def name
@@ -23,6 +25,7 @@ class Article
   include ActiveModel::Conversion
   attr_reader :id
   attr_reader :author_id
+  def to_key() id ? [id] : nil end
   def save; @id = 1; @author_id = 1 end
   def new_record?; @id.nil? end
   def name
@@ -36,8 +39,9 @@ class Author::Nested < Author; end
 class PrototypeHelperBaseTest < ActionView::TestCase
   attr_accessor :formats, :output_buffer
 
-  def reset_formats(format)
-    @format = format
+  def update_details(details)
+    @details = details
+    yield if block_given?
   end
 
   def setup
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 1cd18c0692..74d7bba4fe 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -18,6 +18,7 @@ class RecordTagHelperTest < ActionView::TestCase
   def setup
     super
     @post = Post.new
+    @post.persisted = true
   end
 
   def test_content_tag_for
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index fdf3db1cdb..cea8ab1bce 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -33,17 +33,17 @@ module RenderTestCases
   end
 
   def test_render_file_with_localization
-    old_locale, I18n.locale = I18n.locale, :da
+    old_locale, @view.locale = @view.locale, :da
     assert_equal "Hey verden", @view.render(:file => "test/hello_world")
   ensure
-    I18n.locale = old_locale
+    @view.locale = old_locale
   end
 
   def test_render_file_with_dashed_locale
-    old_locale, I18n.locale = I18n.locale, :"pt-BR"
+    old_locale, @view.locale = @view.locale, :"pt-BR"
     assert_equal "Ola mundo", @view.render(:file => "test/hello_world")
   ensure
-    I18n.locale = old_locale
+    @view.locale = old_locale
   end
 
   def test_render_file_at_top_level
@@ -108,7 +108,7 @@ module RenderTestCases
     @view.render(:partial => "test/raise")
     flunk "Render did not raise Template::Error"
   rescue ActionView::Template::Error => e
-    assert_match "undefined local variable or method `doesnt_exist'", e.message
+    assert_match %r!method.*doesnt_exist!, e.message
     assert_equal "", e.sub_template_message
     assert_equal "1", e.line_number
     assert_equal File.expand_path("#{FIXTURE_LOAD_PATH}/test/_raise.html.erb"), e.file_name
@@ -118,7 +118,7 @@ module RenderTestCases
     @view.render(:file => "test/sub_template_raise")
     flunk "Render did not raise Template::Error"
   rescue ActionView::Template::Error => e
-    assert_match "undefined local variable or method `doesnt_exist'", e.message
+    assert_match %r!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
     assert_equal File.expand_path("#{FIXTURE_LOAD_PATH}/test/_raise.html.erb"), e.file_name
@@ -233,6 +233,11 @@ module RenderTestCases
       @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield")
   end
 
+  def test_render_with_file_in_layout
+    assert_equal %(\n<title>title</title>\n\n),
+      @view.render(:file => "test/layout_render_file.erb")
+  end
+ 
   if '1.9'.respond_to?(:force_encoding)
     def test_render_utf8_template_with_magic_comment
       with_external_encoding Encoding::ASCII_8BIT do
@@ -265,7 +270,7 @@ class CachedViewRenderTest < ActiveSupport::TestCase
   # Ensure view path cache is primed
   def setup
     view_paths = ActionController::Base.view_paths
-    assert_equal ActionView::FileSystemResolverWithFallback, view_paths.first.class
+    assert_equal ActionView::FileSystemResolver, view_paths.first.class
     setup_view(view_paths)
   end
 end
@@ -276,9 +281,9 @@ class LazyViewRenderTest < ActiveSupport::TestCase
   # Test the same thing as above, but make sure the view path
   # is not eager loaded
   def setup
-    path = ActionView::FileSystemResolverWithFallback.new(FIXTURE_LOAD_PATH)
+    path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
     view_paths = ActionView::Base.process_view_paths(path)
-    assert_equal ActionView::FileSystemResolverWithFallback, view_paths.first.class
+    assert_equal ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH), view_paths.first
     setup_view(view_paths)
   end
 end
diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
index 433f6514cf..256d9bdcde 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -37,18 +37,18 @@ class TagHelperTest < ActionView::TestCase
     assert content_tag("a", "Create", "href" => "create").html_safe?
     assert_equal content_tag("a", "Create", "href" => "create"),
                  content_tag("a", "Create", :href => "create")
+    assert_equal "<p>&lt;script&gt;evil_js&lt;/script&gt;</p>",
+                 content_tag(:p, '<script>evil_js</script>')
   end
 
   def test_content_tag_with_block_in_erb
-    __in_erb_template = ''
-    content_tag(:div) { concat "Hello world!" }
-    assert_dom_equal "<div>Hello world!</div>", output_buffer
+    buffer = content_tag(:div) { concat "Hello world!" }
+    assert_dom_equal "<div>Hello world!</div>", buffer
   end
 
   def test_content_tag_with_block_and_options_in_erb
-    __in_erb_template = ''
-    content_tag(:div, :class => "green") { concat "Hello world!" }
-    assert_dom_equal %(<div class="green">Hello world!</div>), output_buffer
+    buffer = content_tag(:div, :class => "green") { concat "Hello world!" }
+    assert_dom_equal %(<div class="green">Hello world!</div>), buffer
   end
 
   def test_content_tag_with_block_and_options_out_of_erb
@@ -66,10 +66,10 @@ class TagHelperTest < ActionView::TestCase
                  output_buffer
   end
 
+  # TAG TODO: Move this into a real template
   def test_content_tag_nested_in_content_tag_in_erb
-    __in_erb_template = true
-    content_tag("p") { concat content_tag("b", "Hello") }
-    assert_equal '<p><b>Hello</b></p>', output_buffer
+    buffer = content_tag("p") { concat content_tag("b", "Hello") }
+    assert_equal '<p><b>Hello</b></p>', buffer
   end
 
   def test_content_tag_with_escaped_array_class
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index be2c6b3108..195a6ea3ae 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -89,16 +89,23 @@ module ActionView
       end
 
       test "helper class that is being tested is always included in view instance" do
-        self.class.helper_class.module_eval do
-          def render_from_helper
-            render :partial => 'customer', :collection => @customers
+        # This ensure is a hidious hack to deal with these tests bleeding
+        # methods between eachother
+        begin
+          self.class.helper_class.module_eval do
+            def render_from_helper
+              render :partial => 'customer', :collection => @customers
+            end
           end
-        end
 
-        TestController.stubs(:controller_path).returns('test')
+          TestController.stubs(:controller_path).returns('test')
 
-        @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
-        assert_match /Hello: EloyHello: Manfred/, render(:partial => 'test/from_helper')
+          @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
+          assert_match /Hello: EloyHello: Manfred/, render(:partial => 'test/from_helper')
+
+        ensure
+          self.class.helper_class.send(:remove_method, :render_from_helper)
+        end
       end
 
       test "no additional helpers should shared across test cases" do
@@ -107,7 +114,7 @@ module ActionView
       end
 
       test "is able to use routes" do
-        controller.request.assign_parameters('foo', 'index')
+        controller.request.assign_parameters(@router, 'foo', 'index')
         assert_equal '/foo', url_for
         assert_equal '/bar', url_for(:controller => 'bar')
       end
@@ -147,10 +154,16 @@ module ActionView
       end
 
       test "is able to make methods available to the view" do
-        _helpers.module_eval do
-          def render_from_helper; from_test_case end
+        # This ensure is a hidious hack to deal with these tests bleeding
+        # methods between eachother
+        begin
+          _helpers.module_eval do
+            def render_from_helper; from_test_case end
+          end
+          assert_equal 'Word!', render(:partial => 'test/from_helper')
+        ensure
+          _helpers.send(:remove_method, :render_from_helper)
         end
-        assert_equal 'Word!', render(:partial => 'test/from_helper')
       end
 
       def from_test_case; 'Word!'; end
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 4b73c44f7e..699fb2f5bc 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -18,6 +18,11 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert_equal expected, translate(:foo)
   end
 
+  def test_translation_of_an_array
+    I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", "bar"])
+    assert_equal ["foo", "bar"], translate(["foo", "bar"])
+  end
+
   def test_delegates_localize_to_i18n
     @time = Time.utc(2008, 7, 8, 12, 18, 38)
     I18n.expects(:localize).with(@time)
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index e904e88f49..165cb655da 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,22 +1,21 @@
 # encoding: utf-8
 require 'abstract_unit'
+require 'active_support/ordered_options'
 require 'controller/fake_controllers'
 
-RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)
-
 class UrlHelperTest < ActionView::TestCase
-  include ActiveSupport::Configurable
-  DEFAULT_CONFIG = ActionView::DEFAULT_CONFIG
 
   def setup
     super
-    @controller = Class.new do
-      attr_accessor :url, :request
+    @controller = Class.new(BasicController) do
+      attr_accessor :url
       def url_for(options)
         url
       end
     end
+
     @controller = @controller.new
+    @request = @controller.request = ActionDispatch::TestRequest.new
     @controller.url = "http://www.example.com"
   end
 
@@ -38,12 +37,13 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_url_for_with_back
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {'HTTP_REFERER' => 'http://www.example.com/referer'})
+    @request.env['HTTP_REFERER'] = 'http://www.example.com/referer'
     assert_equal 'http://www.example.com/referer', url_for(:back)
   end
 
   def test_url_for_with_back_and_no_referer
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     assert_equal 'javascript:history.back()', url_for(:back)
   end
 
@@ -122,7 +122,6 @@ class UrlHelperTest < ActionView::TestCase
     url = {:controller => 'weblog', :action => 'show'}
     @controller = ActionController::Base.new
     @controller.request = ActionController::TestRequest.new
-    @controller.url = ActionController::UrlRewriter.new(@controller.request, url)
     assert_dom_equal(%q{<a href="/weblog/show">Test Link</a>}, link_to('Test Link', url))
   end
 
@@ -131,7 +130,6 @@ class UrlHelperTest < ActionView::TestCase
     url = {:controller => 'weblog', :action => 'show', :host => 'www.example.com'}
     @controller = ActionController::Base.new
     @controller.request = ActionController::TestRequest.new
-    @controller.url = ActionController::UrlRewriter.new(@controller.request, url)
     assert_dom_equal(%q{<a href="http://www.example.com/weblog/show">Test Link</a>}, link_to('Test Link', url))
   end
 
@@ -144,22 +142,28 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_link_tag_with_back
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {'HTTP_REFERER' => 'http://www.example.com/referer'})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
+    @request.env['HTTP_REFERER'] = 'http://www.example.com/referer'
     assert_dom_equal "<a href=\"http://www.example.com/referer\">go back</a>", link_to('go back', :back)
   end
 
   def test_link_tag_with_back_and_no_referer
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     assert_dom_equal "<a href=\"javascript:history.back()\">go back</a>", link_to('go back', :back)
   end
 
   def test_link_tag_with_back
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {'HTTP_REFERER' => 'http://www.example.com/referer'})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
+    @request.env['HTTP_REFERER'] = 'http://www.example.com/referer'
     assert_dom_equal "<a href=\"http://www.example.com/referer\">go back</a>", link_to('go back', :back)
   end
 
   def test_link_tag_with_back_and_no_referer
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show", nil, nil, {})
+    @request.env['HOST_NAME'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     assert_dom_equal "<a href=\"javascript:history.back()\">go back</a>", link_to('go back', :back)
   end
 
@@ -263,55 +267,60 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_current_page_with_simple_url
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show")
+    @request.env['HTTP_HOST'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     @controller.url = "http://www.example.com/weblog/show"
     assert current_page?({ :action => "show", :controller => "weblog" })
     assert current_page?("http://www.example.com/weblog/show")
   end
 
   def test_current_page_ignoring_params
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @request.env['HTTP_HOST'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
+    @request.env['QUERY_STRING'] = 'order=desc&page=1'
     @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
     assert current_page?({ :action => "show", :controller => "weblog" })
     assert current_page?("http://www.example.com/weblog/show")
   end
 
   def test_current_page_with_params_that_match
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @request.env['HTTP_HOST'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
+    @request.env['QUERY_STRING'] = 'order=desc&page=1'
     @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
     assert current_page?({ :action => "show", :controller => "weblog", :order => "desc", :page => "1" })
     assert current_page?("http://www.example.com/weblog/show?order=desc&amp;page=1")
   end
 
   def test_link_unless_current
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show")
+    @request.env['HTTP_HOST'] = 'www.example.com'
+    @request.env['PATH_INFO'] = '/weblog/show'
     @controller.url = "http://www.example.com/weblog/show"
     assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show")
 
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc")
+    @request.env['QUERY_STRING'] = 'order=desc'
     @controller.url = "http://www.example.com/weblog/show"
     assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show")
 
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @request.env['QUERY_STRING'] = 'order=desc&page=1'
     @controller.url = "http://www.example.com/weblog/show?order=desc&page=1"
     assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog", :order=>'desc', :page=>'1' })
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=1")
     assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=1")
 
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc")
+    @request.env['QUERY_STRING'] = 'order=desc'
     @controller.url = "http://www.example.com/weblog/show?order=asc"
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=asc\">Showing</a>", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=asc\">Showing</a>", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=asc")
 
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show?order=desc&page=1")
+    @request.env['QUERY_STRING'] = 'order=desc&page=1'
     @controller.url = "http://www.example.com/weblog/show?order=desc&page=2"
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=desc&page=2\">Showing</a>", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
     assert_equal "<a href=\"http://www.example.com/weblog/show?order=desc&amp;page=2\">Showing</a>", link_to_unless_current("Showing", "http://www.example.com/weblog/show?order=desc&page=2")
 
-
-    @controller.request = RequestMock.new("http://www.example.com/weblog/show")
+    @request.env['QUERY_STRING'] = ''
     @controller.url = "http://www.example.com/weblog/list"
     assert_equal "<a href=\"http://www.example.com/weblog/list\">Listing</a>",
       link_to_unless_current("Listing", :action => "list", :controller => "weblog")
@@ -346,7 +355,7 @@ class UrlHelperTest < ActionView::TestCase
   end
 
   def test_mail_to_with_img
-    assert_dom_equal %(<a href="mailto:feedback@example.com"><img src="/feedback.png" /></a>), mail_to('feedback@example.com', '<img src="/feedback.png" />')
+    assert_dom_equal %(<a href="mailto:feedback@example.com"><img src="/feedback.png" /></a>), mail_to('feedback@example.com', '<img src="/feedback.png" />'.html_safe)
   end
 
   def test_mail_to_with_hex
@@ -464,8 +473,6 @@ end
 class LinkToUnlessCurrentWithControllerTest < ActionController::TestCase
   def setup
     super
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     @controller = TasksController.new
   end
 
@@ -499,14 +506,14 @@ end
 class Workshop
   extend ActiveModel::Naming
   include ActiveModel::Conversion
-  attr_accessor :id, :new_record
+  attr_accessor :id
 
-  def initialize(id, new_record)
-    @id, @new_record = id, new_record
+  def initialize(id)
+    @id = id
   end
 
-  def new_record?
-    @new_record
+  def persisted?
+    id.present?
   end
 
   def to_s
@@ -517,14 +524,14 @@ end
 class Session
   extend ActiveModel::Naming
   include ActiveModel::Conversion
-  attr_accessor :id, :workshop_id, :new_record
+  attr_accessor :id, :workshop_id
 
-  def initialize(id, new_record)
-    @id, @new_record = id, new_record
+  def initialize(id)
+    @id = id
   end
 
-  def new_record?
-    @new_record
+  def persisted?
+    id.present?
   end
 
   def to_s
@@ -534,12 +541,12 @@ end
 
 class WorkshopsController < ActionController::Base
   def index
-    @workshop = Workshop.new(1, true)
+    @workshop = Workshop.new(nil)
     render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
   end
 
   def show
-    @workshop = Workshop.new(params[:id], false)
+    @workshop = Workshop.new(params[:id])
     render :inline => "<%= url_for(@workshop) %>\n<%= link_to('Workshop', @workshop) %>"
   end
 
@@ -548,14 +555,14 @@ end
 
 class SessionsController < ActionController::Base
   def index
-    @workshop = Workshop.new(params[:workshop_id], false)
-    @session = Session.new(1, true)
+    @workshop = Workshop.new(params[:workshop_id])
+    @session = Session.new(nil)
     render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
   end
 
   def show
-    @workshop = Workshop.new(params[:workshop_id], false)
-    @session = Session.new(params[:id], false)
+    @workshop = Workshop.new(params[:workshop_id])
+    @session = Session.new(params[:id])
     render :inline => "<%= url_for([@workshop, @session]) %>\n<%= link_to('Session', [@workshop, @session]) %>"
   end
 
@@ -565,8 +572,7 @@ end
 class PolymorphicControllerTest < ActionController::TestCase
   def setup
     super
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    @response = ActionController::TestResponse.new
   end
 
   def test_new_resource