Merge remote branch 'rails/master'

18 files changed, 537 insertions, 59 deletions

diff --git a/actionpack/test/abstract/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index 0ce1dc506b..232a1679e0 100644
--- a/actionpack/test/abstract/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -47,8 +47,12 @@ module AbstractController
       end
       
       def index
-        self.response_body = @text
-      end      
+        self.response_body = @text.to_s
+      end
+    end
+
+    class Callback2Overwrite < Callback2
+      before_filter :first, :except => :index
     end
     
     class TestCallbacks2 < ActiveSupport::TestCase
@@ -70,6 +74,12 @@ module AbstractController
         @controller.process(:index)
         assert_equal "FIRSTSECOND", @controller.instance_variable_get("@aroundz")
       end
+
+      test "before_filter with overwritten condition" do
+        @controller = Callback2Overwrite.new
+        result = @controller.process(:index)
+        assert_equal "", @controller.response_body
+      end
     end
     
     class Callback3 < ControllerWithCallbacks
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 84c5395610..2640e96453 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -202,6 +202,21 @@ class ActionController::IntegrationTest < ActiveSupport::TestCase
     self.class.app = old_app
     silence_warnings { Object.const_set(:SharedTestRoutes, old_routes) }
   end
+
+  def with_autoload_path(path)
+    path = File.join(File.dirname(__FILE__), "fixtures", path)  
+    if ActiveSupport::Dependencies.autoload_paths.include?(path)
+      yield
+    else
+      begin
+        ActiveSupport::Dependencies.autoload_paths << path
+        yield
+      ensure
+        ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path}
+        ActiveSupport::Dependencies.clear
+      end
+    end
+  end
 end
 
 # Temporary base class
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index 6d4b8e1e40..bdd1a0a15c 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -17,7 +17,6 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
     end
 
     def get_session_id
-      session[:foo]
       render :text => "#{request.session_options[:id]}"
     end
 
@@ -58,6 +57,10 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
           get '/get_session_value'
           assert_response :success
           assert_equal 'foo: "baz"', response.body
+
+          get '/call_reset_session'
+          assert_response :success
+          assert_not_equal [], headers['Set-Cookie']
         end
       end
     end
@@ -92,6 +95,34 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
     end
   end
 
+  def test_getting_session_value_after_session_reset
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+      session_cookie = cookies.send(:hash_for)['_session_id']
+
+      get '/call_reset_session'
+      assert_response :success
+      assert_not_equal [], headers['Set-Cookie']
+
+      cookies << session_cookie # replace our new session_id with our old, pre-reset session_id
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body, "data for this session should have been obliterated from the database"
+    end
+  end
+
+  def test_getting_from_nonexistent_session
+    with_test_route_set do
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+      assert_nil cookies['_session_id'], "should only create session on write, not read"
+    end
+  end
+
   def test_getting_session_id
     with_test_route_set do
       get '/set_session_value'
@@ -101,7 +132,19 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
 
       get '/get_session_id'
       assert_response :success
-      assert_equal session_id, response.body
+      assert_equal session_id, response.body, "should be able to read session id without accessing the session hash"
+    end
+  end
+
+  def test_doesnt_write_session_cookie_if_session_id_is_already_exists
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal nil, headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
     end
   end
 
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
index 331f861d8f..cfd86d704d 100644
--- a/actionpack/test/activerecord/controller_runtime_test.rb
+++ b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -1,8 +1,8 @@
 require 'active_record_unit'
 require 'active_record/railties/controller_runtime'
 require 'fixtures/project'
-require 'rails/log_subscriber/test_helper'
-require 'action_controller/railties/log_subscriber'
+require 'active_support/log_subscriber/test_helper'
+require 'action_controller/log_subscriber'
 
 ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime
 
@@ -13,18 +13,18 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase
     end
   end
 
-  include Rails::LogSubscriber::TestHelper
+  include ActiveSupport::LogSubscriber::TestHelper
   tests LogSubscriberController
 
   def setup
     super
     @old_logger = ActionController::Base.logger
-    Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
+    ActionController::LogSubscriber.attach_to :action_controller
   end
 
   def teardown
     super
-    Rails::LogSubscriber.log_subscribers.clear
+    ActiveSupport::LogSubscriber.log_subscribers.clear
     ActionController::Base.logger = @old_logger
   end
 
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index 5c636cbab8..4be09f8c83 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -236,6 +236,15 @@ class FlashIntegrationTest < ActionController::IntegrationTest
     end
   end
 
+  def test_just_using_flash_does_not_stream_a_cookie_back
+    with_test_route_set do
+      get '/use_flash'
+      assert_response :success
+      assert_nil @response.headers["Set-Cookie"]
+      assert_equal "flash: ", @response.body
+    end
+  end
+
   private
 
     # Overwrite get to send SessionSecret in env hash
@@ -247,10 +256,15 @@ class FlashIntegrationTest < ActionController::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          match ':action', :to => ActionDispatch::Session::CookieStore.new(
-            FlashIntegrationTest::TestController, :key => FlashIntegrationTest::SessionKey, :secret => FlashIntegrationTest::SessionSecret
-          )
+          match ':action', :to => FlashIntegrationTest::TestController
+        end
+
+        @app = self.class.build_app(set) do |middleware|
+          middleware.use ActionDispatch::Session::CookieStore, :key => SessionKey
+          middleware.use ActionDispatch::Flash
+          middleware.delete "ActionDispatch::ShowExceptions"
         end
+
         yield
       end
     end
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index b11eba2f89..0a18741f0c 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -1,6 +1,6 @@
 require "abstract_unit"
-require "rails/log_subscriber/test_helper"
-require "action_controller/railties/log_subscriber"
+require "active_support/log_subscriber/test_helper"
+require "action_controller/log_subscriber"
 
 module Another
   class LogSubscribersController < ActionController::Base
@@ -37,7 +37,7 @@ end
 
 class ACLogSubscriberTest < ActionController::TestCase
   tests Another::LogSubscribersController
-  include Rails::LogSubscriber::TestHelper
+  include ActiveSupport::LogSubscriber::TestHelper
 
   def setup
     super
@@ -47,12 +47,12 @@ class ACLogSubscriberTest < ActionController::TestCase
     @cache_path = File.expand_path('../temp/test_cache', File.dirname(__FILE__))
     ActionController::Base.page_cache_directory = @cache_path
     @controller.cache_store = :file_store, @cache_path
-    Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
+    ActionController::LogSubscriber.attach_to :action_controller
   end
 
   def teardown
     super
-    Rails::LogSubscriber.log_subscribers.clear
+    ActiveSupport::LogSubscriber.log_subscribers.clear
     FileUtils.rm_rf(@cache_path)
     ActionController::Base.logger = @old_logger
   end
diff --git a/actionpack/test/controller/new_base/base_test.rb b/actionpack/test/controller/new_base/base_test.rb
index 0b40f8ce95..8fa5d20372 100644
--- a/actionpack/test/controller/new_base/base_test.rb
+++ b/actionpack/test/controller/new_base/base_test.rb
@@ -31,9 +31,17 @@ module Dispatching
   end
 
   class EmptyController < ActionController::Base ; end
+  class SubEmptyController < EmptyController ; end
+  class NonDefaultPathController < ActionController::Base
+    def self.controller_path; "i_am_not_default"; end
+  end
 
   module Submodule
     class ContainedEmptyController < ActionController::Base ; end
+    class ContainedSubEmptyController < ContainedEmptyController ; end
+    class ContainedNonDefaultPathController < ActionController::Base
+      def self.controller_path; "i_am_extremly_not_default"; end
+    end
   end
 
   class BaseTest < Rack::TestCase
@@ -65,16 +73,46 @@ module Dispatching
       assert_equal EmptyController.controller_path, EmptyController.new.controller_path
     end
 
+    test "non-default controller path" do
+      assert_equal 'i_am_not_default', NonDefaultPathController.controller_path
+      assert_equal NonDefaultPathController.controller_path, NonDefaultPathController.new.controller_path
+    end
+
+    test "sub controller path" do
+      assert_equal 'dispatching/sub_empty', SubEmptyController.controller_path
+      assert_equal SubEmptyController.controller_path, SubEmptyController.new.controller_path
+    end
+
     test "namespaced controller path" do
       assert_equal 'dispatching/submodule/contained_empty', Submodule::ContainedEmptyController.controller_path
       assert_equal Submodule::ContainedEmptyController.controller_path, Submodule::ContainedEmptyController.new.controller_path
     end
 
+    test "namespaced non-default controller path" do
+      assert_equal 'i_am_extremly_not_default', Submodule::ContainedNonDefaultPathController.controller_path
+      assert_equal Submodule::ContainedNonDefaultPathController.controller_path, Submodule::ContainedNonDefaultPathController.new.controller_path
+    end
+
+    test "namespaced sub controller path" do
+      assert_equal 'dispatching/submodule/contained_sub_empty', Submodule::ContainedSubEmptyController.controller_path
+      assert_equal Submodule::ContainedSubEmptyController.controller_path, Submodule::ContainedSubEmptyController.new.controller_path
+    end
+
     test "controller name" do
       assert_equal 'empty', EmptyController.controller_name
       assert_equal 'contained_empty', Submodule::ContainedEmptyController.controller_name
     end
 
+    test "non-default path controller name" do
+      assert_equal 'non_default_path', NonDefaultPathController.controller_name
+      assert_equal 'contained_non_default_path', Submodule::ContainedNonDefaultPathController.controller_name
+    end
+
+    test "sub controller name" do
+      assert_equal 'sub_empty', SubEmptyController.controller_name
+      assert_equal 'contained_sub_empty', Submodule::ContainedSubEmptyController.controller_name
+    end
+
     test "action methods" do
       assert_equal Set.new(%w(
         index
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 907acf9573..4b30b0af36 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -34,9 +34,15 @@ module AbstractController
         )
       end
 
-      def test_anchor_should_be_cgi_escaped
-        assert_equal('/c/a#anc%2Fhor',
-          W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => Struct.new(:to_param).new('anc/hor'))
+      def test_anchor_should_escape_unsafe_pchar
+        assert_equal('/c/a#%23anchor',
+          W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => Struct.new(:to_param).new('#anchor'))
+        )
+      end
+
+      def test_anchor_should_not_escape_safe_pchar
+        assert_equal('/c/a#name=user&email=user@domain.com',
+          W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => Struct.new(:to_param).new('name=user&email=user@domain.com'))
         )
       end
 
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 495255c22b..cf92b039e3 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -16,6 +16,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     Routes = routes
     Routes.draw do
       default_url_options :host => "rubyonrails.org"
+      resources_path_names :correlation_indexes => "info_about_correlation_indexes"
 
       controller :sessions do
         get  'login' => :new
@@ -70,12 +71,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get 'admin/passwords' => "queenbee#passwords", :constraints => ::TestRoutingMapper::IpRestrictor
 
-      scope 'pt', :name_prefix => 'pt' do
+      scope 'pt', :as => 'pt' do
         resources :projects, :path_names => { :edit => 'editar', :new => 'novo' }, :path => 'projetos' do
           post :preview, :on => :new
+          put :close, :on => :member, :path => 'fechar'
+          get :open, :on => :new, :path => 'abrir'
         end
-        resource  :admin,    :path_names => { :new => 'novo' },    :path => 'administrador' do
+        resource  :admin, :path_names => { :new => 'novo', :activate => 'ativar' }, :path => 'administrador' do
           post :preview, :on => :new
+          put :activate, :on => :member
         end
         resources :products, :path_names => { :new => 'novo' } do
           new do
@@ -86,6 +90,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       resources :projects, :controller => :project do
         resources :involvements, :attachments
+        get :correlation_indexes, :on => :collection
 
         resources :participants do
           put :update_all, :on => :collection
@@ -112,6 +117,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
           end
 
           member do
+            get  :some_path_with_name
             put  :accessible_projects
             post :resend, :generate_new_password
           end
@@ -207,6 +213,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
           get "profile" => "customers#profile", :as => :profile, :on => :member
           post "preview" => "customers#preview", :as => :preview, :on => :new
         end
+        scope(':version', :version => /.+/) do
+          resources :users, :id => /.+?/, :format => /json|xml/
+        end
       end
 
       match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
@@ -242,10 +251,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
+      namespace :users, :path => 'usuarios' do
+        root :to => 'home#index'
+      end
+
       controller :articles do
-        scope '/articles', :name_prefix => 'article' do
+        scope '/articles', :as => 'article' do
           scope :path => '/:title', :title => /[a-z]+/, :as => :with_title do
-            match '/:id', :to => :with_id
+            match '/:id', :to => :with_id, :as => ""
           end
         end
       end
@@ -290,6 +303,21 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         match '/' => 'mes#index'
       end
 
+      namespace :private do
+        root :to => redirect('/private/index')
+        match "index", :to => 'private#index'
+      end
+
+      get "(/:username)/followers" => "followers#index"
+      get "/groups(/user/:username)" => "groups#index"
+      get "(/user/:username)/photos" => "photos#index"
+
+      scope '(groups)' do
+        scope '(discussions)' do
+          resources :messages
+        end
+      end
+
       match "whatever/:controller(/:action(/:id))"
 
       resource :profile do
@@ -299,6 +327,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
           post :preview
         end
       end
+
+      resources :content
+
+      match '/:locale/*file.:format', :to => 'files#show', :file => /path\/to\/existing\/file/
     end
   end
 
@@ -411,6 +443,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_namespace_redirect
+    with_test_routes do
+      get '/private'
+      assert_equal 301, @response.status
+      assert_equal 'http://www.example.com/private/index', @response.headers['Location']
+      assert_equal 'Moved Permanently', @response.body
+    end
+  end
+
   def test_session_singleton_resource
     with_test_routes do
       get '/session'
@@ -706,6 +747,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_projects_with_resources_path_names
+    with_test_routes do
+      get '/projects/info_about_correlation_indexes'
+      assert_equal 'project#correlation_indexes', @response.body
+      assert_equal '/projects/info_about_correlation_indexes', correlation_indexes_projects_path
+    end
+  end
+
   def test_projects_posts
     with_test_routes do
       get '/projects/1/posts'
@@ -839,6 +888,22 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       get '/pt/administrador/novo'
       assert_equal 'admins#new', @response.body
       assert_equal '/pt/administrador/novo', new_pt_admin_path
+
+      put '/pt/administrador/ativar'
+      assert_equal 'admins#activate', @response.body
+      assert_equal '/pt/administrador/ativar', activate_pt_admin_path
+    end
+  end
+
+  def test_path_option_override
+    with_test_routes do
+      get '/pt/projetos/novo/abrir'
+      assert_equal 'projects#open', @response.body
+      assert_equal '/pt/projetos/novo/abrir', open_new_pt_project_path
+
+      put '/pt/projetos/1/fechar'
+      assert_equal 'projects#close', @response.body
+      assert_equal '/pt/projetos/1/fechar', close_pt_project_path(1)
     end
   end
 
@@ -932,6 +997,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_namespace_with_options
+    with_test_routes do
+      get '/usuarios'
+      assert_equal '/usuarios', users_root_path
+      assert_equal 'users/home#index', @response.body
+    end
+  end
+
   def test_articles_with_id
     with_test_routes do
       get '/articles/rails/1'
@@ -1365,6 +1438,114 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_non_greedy_regexp
+    with_test_routes do
+      get '/api/1.0/users'
+      assert_equal 'api/users#index', @response.body
+      assert_equal '/api/1.0/users', api_users_path(:version => '1.0')
+
+      get '/api/1.0/users.json'
+      assert_equal 'api/users#index', @response.body
+      assert_equal true, @request.format.json?
+      assert_equal '/api/1.0/users.json', api_users_path(:version => '1.0', :format => :json)
+
+      get '/api/1.0/users/first.last'
+      assert_equal 'api/users#show', @response.body
+      assert_equal 'first.last', @request.params[:id]
+      assert_equal '/api/1.0/users/first.last', api_user_path(:version => '1.0', :id => 'first.last')
+
+      get '/api/1.0/users/first.last.xml'
+      assert_equal 'api/users#show', @response.body
+      assert_equal 'first.last', @request.params[:id]
+      assert_equal true, @request.format.xml?
+      assert_equal '/api/1.0/users/first.last.xml', api_user_path(:version => '1.0', :id => 'first.last', :format => :xml)
+    end
+  end
+
+  def test_glob_parameter_accepts_regexp
+    with_test_routes do
+      get '/en/path/to/existing/file.html'
+      assert_equal 200, @response.status
+    end
+  end
+
+  def test_resources_controller_name_is_not_pluralized
+    with_test_routes do
+      get '/content'
+      assert_equal 'content#index', @response.body
+    end
+  end
+
+  def test_url_generator_for_optional_prefix_dynamic_segment
+    with_test_routes do
+      get '/bob/followers'
+      assert_equal 'followers#index', @response.body
+      assert_equal 'http://www.example.com/bob/followers',
+        url_for(:controller => "followers", :action => "index", :username => "bob")
+
+      get '/followers'
+      assert_equal 'followers#index', @response.body
+      assert_equal 'http://www.example.com/followers',
+        url_for(:controller => "followers", :action => "index", :username => nil)
+    end
+  end
+
+  def test_url_generator_for_optional_suffix_static_and_dynamic_segment
+    with_test_routes do
+      get '/groups/user/bob'
+      assert_equal 'groups#index', @response.body
+      assert_equal 'http://www.example.com/groups/user/bob',
+        url_for(:controller => "groups", :action => "index", :username => "bob")
+
+      get '/groups'
+      assert_equal 'groups#index', @response.body
+      assert_equal 'http://www.example.com/groups',
+        url_for(:controller => "groups", :action => "index", :username => nil)
+    end
+  end
+
+  def test_url_generator_for_optional_prefix_static_and_dynamic_segment
+    with_test_routes do
+      get 'user/bob/photos'
+      assert_equal 'photos#index', @response.body
+      assert_equal 'http://www.example.com/user/bob/photos',
+        url_for(:controller => "photos", :action => "index", :username => "bob")
+
+      get 'photos'
+      assert_equal 'photos#index', @response.body
+      assert_equal 'http://www.example.com/photos',
+        url_for(:controller => "photos", :action => "index", :username => nil)
+    end
+  end
+
+  def test_url_recognition_for_optional_static_segments
+    with_test_routes do
+      get '/groups/discussions/messages'
+      assert_equal 'messages#index', @response.body
+
+      get '/groups/discussions/messages/1'
+      assert_equal 'messages#show', @response.body
+
+      get '/groups/messages'
+      assert_equal 'messages#index', @response.body
+
+      get '/groups/messages/1'
+      assert_equal 'messages#show', @response.body
+
+      get '/discussions/messages'
+      assert_equal 'messages#index', @response.body
+
+      get '/discussions/messages/1'
+      assert_equal 'messages#show', @response.body
+
+      get '/messages'
+      assert_equal 'messages#index', @response.body
+
+      get '/messages/1'
+      assert_equal 'messages#show', @response.body
+    end
+  end
+
   private
     def with_test_routes
       yield
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index b4380f7818..fd63f5ad5e 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -83,7 +83,7 @@ class CookieStoreTest < ActionController::IntegrationTest
 
       get '/get_session_id'
       assert_response :success
-      assert_equal "id: #{session_id}", response.body
+      assert_equal "id: #{session_id}", response.body, "should be able to read session id without accessing the session hash"
     end
   end
 
@@ -96,6 +96,31 @@ class CookieStoreTest < ActionController::IntegrationTest
     end
   end
 
+  # {:foo=>#<SessionAutoloadTest::Foo bar:"baz">, :session_id=>"ce8b0752a6ab7c7af3cdb8a80e6b9e46"}
+  SignedSerializedCookie = "BAh7BzoIZm9vbzodU2Vzc2lvbkF1dG9sb2FkVGVzdDo6Rm9vBjoJQGJhciIIYmF6Og9zZXNzaW9uX2lkIiVjZThiMDc1MmE2YWI3YzdhZjNjZGI4YTgwZTZiOWU0Ng==--2bf3af1ae8bd4e52b9ac2099258ace0c380e601c"
+
+  def test_deserializes_unloaded_classes_on_get_id
+    with_test_route_set do
+      with_autoload_path "session_autoload_test" do
+        cookies[SessionKey] = SignedSerializedCookie
+        get '/get_session_id'
+        assert_response :success
+        assert_equal 'id: ce8b0752a6ab7c7af3cdb8a80e6b9e46', response.body, "should auto-load unloaded class"
+      end
+    end
+  end  
+  
+  def test_deserializes_unloaded_classes_on_get_value
+    with_test_route_set do
+      with_autoload_path "session_autoload_test" do 
+        cookies[SessionKey] = SignedSerializedCookie
+        get '/get_session_value'
+        assert_response :success
+        assert_equal 'foo: #<SessionAutoloadTest::Foo bar:"baz">', response.body, "should auto-load unloaded class"
+      end
+    end
+  end
+
   def test_close_raises_when_data_overflows
     with_test_route_set do
       assert_raise(ActionDispatch::Cookies::CookieOverflow) {
@@ -141,6 +166,15 @@ class CookieStoreTest < ActionController::IntegrationTest
     end
   end
 
+  def test_getting_from_nonexistent_session
+    with_test_route_set do
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+      assert_nil headers['Set-Cookie'], "should only create session on write, not read"
+    end
+  end
+
   def test_persistent_session_id
     with_test_route_set do
       cookies[SessionKey] = SignedBar
@@ -196,21 +230,21 @@ class CookieStoreTest < ActionController::IntegrationTest
   def test_session_store_without_domain 
     with_test_route_set do
       get '/set_session_value'
-      assert_no_match /domain\=/, headers['Set-Cookie']
+      assert_no_match(/domain\=/, headers['Set-Cookie'])
     end
   end
 
   def test_session_store_with_nil_domain
     with_test_route_set(:domain => nil) do
       get '/set_session_value'
-      assert_no_match /domain\=/, headers['Set-Cookie']
+      assert_no_match(/domain\=/, headers['Set-Cookie'])
     end
   end
 
   def test_session_store_with_all_domains
     with_test_route_set(:domain => :all) do
       get '/set_session_value'
-      assert_match /domain=\.example\.com/, headers['Set-Cookie']
+      assert_match(/domain=\.example\.com/, headers['Set-Cookie'])
     end
   end
 
@@ -238,4 +272,5 @@ class CookieStoreTest < ActionController::IntegrationTest
         yield
       end
     end
+
 end
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 8858a398e0..9bd6f9b8c4 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -11,13 +11,17 @@ class MemCacheStoreTest < ActionController::IntegrationTest
       session[:foo] = "bar"
       head :ok
     end
+    
+    def set_serialized_session_value
+      session[:foo] = SessionAutoloadTest::Foo.new
+      head :ok
+    end
 
     def get_session_value
       render :text => "foo: #{session[:foo].inspect}"
     end
 
     def get_session_id
-      session[:foo]
       render :text => "#{request.session_options[:id]}"
     end
 
@@ -56,6 +60,34 @@ class MemCacheStoreTest < ActionController::IntegrationTest
       end
     end
 
+    def test_getting_session_value_after_session_reset
+      with_test_route_set do
+        get '/set_session_value'
+        assert_response :success
+        assert cookies['_session_id']
+        session_cookie = cookies.send(:hash_for)['_session_id']
+
+        get '/call_reset_session'
+        assert_response :success
+        assert_not_equal [], headers['Set-Cookie']
+
+        cookies << session_cookie # replace our new session_id with our old, pre-reset session_id
+
+        get '/get_session_value'
+        assert_response :success
+        assert_equal 'foo: nil', response.body, "data for this session should have been obliterated from memcached"
+      end
+    end
+
+    def test_getting_from_nonexistent_session
+      with_test_route_set do
+        get '/get_session_value'
+        assert_response :success
+        assert_equal 'foo: nil', response.body
+        assert_nil cookies['_session_id'], "should only create session on write, not read"
+      end
+    end
+
     def test_setting_session_value_after_session_reset
       with_test_route_set do
         get '/set_session_value'
@@ -86,7 +118,38 @@ class MemCacheStoreTest < ActionController::IntegrationTest
 
         get '/get_session_id'
         assert_response :success
-        assert_equal session_id, response.body
+        assert_equal session_id, response.body, "should be able to read session id without accessing the session hash"
+      end
+    end
+
+    def test_deserializes_unloaded_class
+      with_test_route_set do
+        with_autoload_path "session_autoload_test" do
+          get '/set_serialized_session_value'
+          assert_response :success
+          assert cookies['_session_id']
+        end
+        with_autoload_path "session_autoload_test" do
+          get '/get_session_id'
+          assert_response :success
+        end
+        with_autoload_path "session_autoload_test" do
+          get '/get_session_value'
+          assert_response :success
+          assert_equal 'foo: #<SessionAutoloadTest::Foo bar:"baz">', response.body, "should auto-load unloaded class"
+        end
+      end
+    end
+
+    def test_doesnt_write_session_cookie_if_session_id_is_already_exists
+      with_test_route_set do
+        get '/set_session_value'
+        assert_response :success
+        assert cookies['_session_id']
+
+        get '/get_session_value'
+        assert_response :success
+        assert_equal nil, headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
       end
     end
 
diff --git a/actionpack/test/fixtures/session_autoload_test/session_autoload_test/foo.rb b/actionpack/test/fixtures/session_autoload_test/session_autoload_test/foo.rb
new file mode 100644
index 0000000000..4ee7a24561
--- /dev/null
+++ b/actionpack/test/fixtures/session_autoload_test/session_autoload_test/foo.rb
@@ -0,0 +1,10 @@
+module SessionAutoloadTest
+  class Foo
+    def initialize(bar='baz')
+      @bar = bar
+    end
+    def inspect
+      "#<#{self.class} bar:#{@bar.inspect}>"
+    end
+  end
+end
diff --git a/actionpack/test/template/active_model_helper_test.rb b/actionpack/test/template/active_model_helper_test.rb
index b1705072c2..6ab244d178 100644
--- a/actionpack/test/template/active_model_helper_test.rb
+++ b/actionpack/test/template/active_model_helper_test.rb
@@ -39,6 +39,13 @@ class ActiveModelHelperTest < ActionView::TestCase
     )
   end
 
+  def test_hidden_field_does_not_render_errors
+    assert_dom_equal(
+      %(<input id="post_author_name" name="post[author_name]" type="hidden" value="" />),
+      hidden_field("post", "author_name")
+    )
+  end
+
   def test_field_error_proc
     old_proc = ActionView::Base.field_error_proc
     ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 633641514e..6d5e4893c4 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -44,7 +44,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     @controller.request = @request
 
-    ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
+    ActionView::Helpers::AssetTagHelper::register_javascript_expansion :defaults => ['prototype', 'effects', 'dragdrop', 'controls', 'rails']
   end
 
   def url_for(*args)
@@ -256,19 +256,6 @@ class AssetTagHelperTest < ActionView::TestCase
     assert javascript_include_tag("prototype").html_safe?
   end
 
-  def test_register_javascript_include_default
-    ENV["RAILS_ASSET_ID"] = ""
-    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'bank'
-    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
-  end
-
-  def test_register_javascript_include_default_mixed_defaults
-    ENV["RAILS_ASSET_ID"] = ""
-    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'bank'
-    ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'robber', '/elsewhere/cools.js'
-    assert_dom_equal  %(<script src="/javascripts/prototype.js" type="text/javascript"></script>\n<script src="/javascripts/effects.js" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js" type="text/javascript"></script>\n<script src="/javascripts/controls.js" type="text/javascript"></script>\n<script src="/javascripts/rails.js" type="text/javascript"></script>\n<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>\n<script src="/elsewhere/cools.js" type="text/javascript"></script>\n<script src="/javascripts/application.js" type="text/javascript"></script>), javascript_include_tag(:defaults)
-  end
-
   def test_custom_javascript_expansions
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :robbery => ["bank", "robber"]
@@ -286,6 +273,11 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_raise(ArgumentError) { javascript_include_tag('first', :monkey, 'last') }
   end
 
+  def test_reset_javascript_expansions
+    ActionView::Helpers::AssetTagHelper.javascript_expansions.clear
+    assert_raise(ArgumentError) { javascript_include_tag(:defaults) }
+  end
+
   def test_stylesheet_path
     ENV["RAILS_ASSET_ID"] = ""
     StylePathToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
@@ -923,7 +915,7 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     @request = Struct.new(:protocol).new("gopher://")
     @controller.request = @request
 
-    ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
+    ActionView::Helpers::AssetTagHelper.javascript_expansions.clear
   end
 
   def url_for(options)
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 8de1e782c0..6ba407e230 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -188,6 +188,11 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, text_field("post", "title", :maxlength => 35, :size => nil)
   end
 
+  def test_text_field_with_nil_value
+    expected = '<input id="post_title" name="post[title]" size="30" type="text" />'
+    assert_dom_equal expected, text_field("post", "title", :value => nil)
+  end
+
   def test_text_field_doesnt_change_param_values
     object_name = 'post[]'
     expected = '<input id="post_123_title" name="post[123][title]" size="30" type="text" value="Hello World" />'
@@ -208,6 +213,11 @@ class FormHelperTest < ActionView::TestCase
       hidden_field("post", "title")
   end
 
+  def test_hidden_field_with_nil_value
+    expected = '<input id="post_title" name="post[title]" type="hidden" />'
+    assert_dom_equal expected, hidden_field("post", "title", :value => nil)
+  end
+
   def test_text_field_with_options
     assert_dom_equal '<input id="post_title" name="post[title]" type="hidden" value="Something Else" />',
       hidden_field("post", "title", :value => "Something Else")
@@ -300,6 +310,11 @@ class FormHelperTest < ActionView::TestCase
    )
   end
 
+  def test_radio_button_with_negative_integer_value
+    assert_dom_equal('<input id="post_secret_-1" name="post[secret]" type="radio" value="-1" />',
+      radio_button("post", "secret", "-1"))
+  end
+
   def test_radio_button_respects_passed_in_id
      assert_dom_equal('<input checked="checked" id="foo" name="post[secret]" type="radio" value="1" />',
        radio_button("post", "secret", "1", :id=>"foo")
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
index 5076dfa70f..eb1e548672 100644
--- a/actionpack/test/template/log_subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -1,22 +1,22 @@
 require "abstract_unit"
-require "rails/log_subscriber/test_helper"
-require "action_view/railties/log_subscriber"
+require "active_support/log_subscriber/test_helper"
+require "action_view/log_subscriber"
 require "controller/fake_models"
 
 class AVLogSubscriberTest < ActiveSupport::TestCase
-  include Rails::LogSubscriber::TestHelper
+  include ActiveSupport::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::LogSubscriber.add(:action_view, ActionView::Railties::LogSubscriber.new)
+    ActionView::LogSubscriber.attach_to :action_view
   end
 
   def teardown
     super
-    Rails::LogSubscriber.log_subscribers.clear
+    ActiveSupport::LogSubscriber.log_subscribers.clear
     ActionController::Base.logger = @old_logger
   end
 
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index c365aec841..a0c46f8a59 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -37,8 +37,12 @@ module ActionView
     include SharedTests
     test_case = self
 
-    test "memoizes the _view" do
-      assert_same _view, _view
+    test "memoizes the view" do
+      assert_same view, view
+    end
+
+    test "exposes view as _view for backwards compatibility" do
+      assert_same _view, view
     end
 
     test "works without testing a helper module" do
@@ -61,13 +65,13 @@ module ActionView
     end
 
     test "delegates notice to request.flash" do
-      _view.request.flash.expects(:notice).with("this message")
-      _view.notice("this message")
+      view.request.flash.expects(:notice).with("this message")
+      view.notice("this message")
     end
 
     test "delegates alert to request.flash" do
-      _view.request.flash.expects(:alert).with("this message")
-      _view.alert("this message")
+      view.request.flash.expects(:alert).with("this message")
+      view.alert("this message")
     end
   end
 
@@ -136,7 +140,7 @@ module ActionView
     helper HelperThatInvokesProtectAgainstForgery
 
     test "protect_from_forgery? in any helpers returns false" do
-      assert !_view.help_me
+      assert !view.help_me
     end
 
   end
@@ -200,6 +204,15 @@ module ActionView
       assert_match /Hello: EloyHello: Manfred/, render(:file => 'test/list')
     end
 
+    test "is able to render partials from templates and also use instance variables after view has been referenced" do
+      @controller.controller_path = "test"
+
+      view
+
+      @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
+      assert_match /Hello: EloyHello: Manfred/, render(:file => 'test/list')
+    end
+
   end
 
   class AssertionsTest < ActionView::TestCase
@@ -220,10 +233,24 @@ module ActionView
   end
 
   class RenderTemplateTest < ActionView::TestCase
-    test "render template" do
+    test "supports specifying partials" do
       controller.controller_path = "test"
       render(:template => "test/calling_partial_with_layout")
-      assert_template "partial_for_use_in_layout"
+      assert_template :partial => "_partial_for_use_in_layout"
+    end
+
+    test "supports specifying locals (passing)" do
+      controller.controller_path = "test"
+      render(:template => "test/calling_partial_with_layout")
+      assert_template :partial => "_partial_for_use_in_layout", :locals => { :name => "David" }
+    end
+
+    test "supports specifying locals (failing)" do
+      controller.controller_path = "test"
+      render(:template => "test/calling_partial_with_layout")
+      assert_raise ActiveSupport::TestCase::Assertion, /Somebody else.*David/m do
+        assert_template :partial => "_partial_for_use_in_layout", :locals => { :name => "Somebody Else" }
+      end
     end
   end
 end
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 299d6dd5bd..72d4897630 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -429,6 +429,10 @@ class UrlHelperControllerTest < ActionController::TestCase
 
       map.connect ":controller/:action/:id"
       # match "/:controller(/:action(/:id))"
+
+      match 'url_helper_controller_test/url_helper/normalize_recall_params',
+        :to => UrlHelperController.action(:normalize_recall),
+        :as => :normalize_recall_params
     end
 
     def show_url_for
@@ -447,6 +451,14 @@ class UrlHelperControllerTest < ActionController::TestCase
       render :inline => '<%= url_for(nil) %>'
     end
 
+    def normalize_recall_params
+      render :inline => '<%= normalize_recall_params_path %>'
+    end
+
+    def recall_params_not_changed
+      render :inline => '<%= url_for(:action => :show_url_for) %>'
+    end
+
     def rescue_action(e) raise e end
   end
 
@@ -488,6 +500,16 @@ class UrlHelperControllerTest < ActionController::TestCase
     get :show_named_route, :kind => 'url'
     assert_equal 'http://testtwo.host/url_helper_controller_test/url_helper/show_named_route', @response.body
   end
+
+  def test_recall_params_should_be_normalized_when_using_block_route
+    get :normalize_recall_params
+    assert_equal '/url_helper_controller_test/url_helper/normalize_recall_params', @response.body
+  end
+
+  def test_recall_params_should_not_be_changed_when_using_normal_route
+    get :recall_params_not_changed
+    assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
+  end
 end
 
 class TasksController < ActionController::Base