Merge commit 'mainstream/master'

6 files changed, 81 insertions, 745 deletions

diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb
index 721bcf6136..569d698a03 100644
--- a/actionpack/test/controller/dispatcher_test.rb
+++ b/actionpack/test/controller/dispatcher_test.rb
@@ -94,7 +94,7 @@ class DispatcherTest < Test::Unit::TestCase
     def dispatch(cache_classes = true)
       ActionController::Routing::RouteSet.any_instance.stubs(:call).returns([200, {}, 'response'])
       Dispatcher.define_dispatcher_callbacks(cache_classes)
-      Dispatcher.new.call({})
+      Dispatcher.new.call({'rack.input' => StringIO.new('')})
     end
 
     def assert_subclasses(howmany, klass, message = klass.subclasses.inspect)
diff --git a/actionpack/test/controller/polymorphic_routes_test.rb b/actionpack/test/controller/polymorphic_routes_test.rb
deleted file mode 100644
index 146d703619..0000000000
--- a/actionpack/test/controller/polymorphic_routes_test.rb
+++ /dev/null
@@ -1,293 +0,0 @@
-require 'abstract_unit'
-
-class Article
-  attr_reader :id
-  def save; @id = 1 end
-  def new_record?; @id.nil? end
-  def name
-    model = self.class.name.downcase
-    @id.nil? ? "new #{model}" : "#{model} ##{@id}"
-  end
-end
-
-class Response < Article
-  def post_id; 1 end
-end
-
-class Tag < Article
-  def response_id; 1 end
-end
-
-class Tax
-  attr_reader :id
-  def save; @id = 1 end
-  def new_record?; @id.nil? end
-  def name
-    model = self.class.name.downcase
-    @id.nil? ? "new #{model}" : "#{model} ##{@id}"
-  end
-end
-
-class Fax < Tax
-  def store_id; 1 end
-end
-
-# TODO: test nested models
-class Response::Nested < Response; end
-
-class PolymorphicRoutesTest < ActiveSupport::TestCase
-  include ActionController::PolymorphicRoutes
-
-  def setup
-    @article = Article.new
-    @response = Response.new
-    @tax = Tax.new
-    @fax = Fax.new
-  end
-
-  def test_with_record
-    @article.save
-    expects(:article_url).with(@article)
-    polymorphic_url(@article)
-  end
-
-  def test_with_new_record
-    expects(:articles_url).with()
-    @article.expects(:new_record?).returns(true)
-    polymorphic_url(@article)
-  end
-
-  def test_with_record_and_action
-    expects(:new_article_url).with()
-    @article.expects(:new_record?).never
-    polymorphic_url(@article, :action => 'new')
-  end
-
-  def test_url_helper_prefixed_with_new
-    expects(:new_article_url).with()
-    new_polymorphic_url(@article)
-  end
-
-  def test_url_helper_prefixed_with_edit
-    @article.save
-    expects(:edit_article_url).with(@article)
-    edit_polymorphic_url(@article)
-  end
-
-  def test_url_helper_prefixed_with_edit_with_url_options
-    @article.save
-    expects(:edit_article_url).with(@article, :param1 => '10')
-    edit_polymorphic_url(@article, :param1 => '10')
-  end
-
-  def test_url_helper_with_url_options
-    @article.save
-    expects(:article_url).with(@article, :param1 => '10')
-    polymorphic_url(@article, :param1 => '10')
-  end
-
-  def test_formatted_url_helper_is_deprecated
-    expects(:articles_url).with(:format => :pdf)
-    assert_deprecated do
-      formatted_polymorphic_url([@article, :pdf])
-    end
-  end
-
-  def test_format_option
-    @article.save
-    expects(:article_url).with(@article, :format => :pdf)
-    polymorphic_url(@article, :format => :pdf)
-  end
-
-  def test_format_option_with_url_options
-    @article.save
-    expects(:article_url).with(@article, :format => :pdf, :param1 => '10')
-    polymorphic_url(@article, :format => :pdf, :param1 => '10')
-  end
-
-  def test_id_and_format_option
-    @article.save
-    expects(:article_url).with(:id => @article, :format => :pdf)
-    polymorphic_url(:id => @article, :format => :pdf)
-  end
-
-  def test_with_nested
-    @response.save
-    expects(:article_response_url).with(@article, @response)
-    polymorphic_url([@article, @response])
-  end
-
-  def test_with_nested_unsaved
-    expects(:article_responses_url).with(@article)
-    polymorphic_url([@article, @response])
-  end
-
-  def test_new_with_array_and_namespace
-    expects(:new_admin_article_url).with()
-    polymorphic_url([:admin, @article], :action => 'new')
-  end
-
-  def test_unsaved_with_array_and_namespace
-    expects(:admin_articles_url).with()
-    polymorphic_url([:admin, @article])
-  end
-
-  def test_nested_unsaved_with_array_and_namespace
-    @article.save
-    expects(:admin_article_url).with(@article)
-    polymorphic_url([:admin, @article])
-    expects(:admin_article_responses_url).with(@article)
-    polymorphic_url([:admin, @article, @response])
-  end
-
-  def test_nested_with_array_and_namespace
-    @response.save
-    expects(:admin_article_response_url).with(@article, @response)
-    polymorphic_url([:admin, @article, @response])
-
-    # a ridiculously long named route tests correct ordering of namespaces and nesting:
-    @tag = Tag.new
-    @tag.save
-    expects(:site_admin_article_response_tag_url).with(@article, @response, @tag)
-    polymorphic_url([:site, :admin, @article, @response, @tag])
-  end
-
-  def test_nesting_with_array_ending_in_singleton_resource
-    expects(:article_response_url).with(@article)
-    polymorphic_url([@article, :response])
-  end
-
-  def test_nesting_with_array_containing_singleton_resource
-    @tag = Tag.new
-    @tag.save
-    expects(:article_response_tag_url).with(@article, @tag)
-    polymorphic_url([@article, :response, @tag])
-  end
-
-  def test_nesting_with_array_containing_namespace_and_singleton_resource
-    @tag = Tag.new
-    @tag.save
-    expects(:admin_article_response_tag_url).with(@article, @tag)
-    polymorphic_url([:admin, @article, :response, @tag])
-  end
-
-  def test_nesting_with_array_containing_singleton_resource_and_format
-    @tag = Tag.new
-    @tag.save
-    expects(:article_response_tag_url).with(@article, @tag, :format => :pdf)
-    polymorphic_url([@article, :response, @tag], :format => :pdf)
-  end
-
-  def test_nesting_with_array_containing_singleton_resource_and_format_option
-    @tag = Tag.new
-    @tag.save
-    expects(:article_response_tag_url).with(@article, @tag, :format => :pdf)
-    polymorphic_url([@article, :response, @tag], :format => :pdf)
-  end
-
-  def test_nesting_with_array_containing_nil
-    expects(:article_response_url).with(@article)
-    polymorphic_url([@article, nil, :response])
-  end
-
-  def test_with_array_containing_single_object
-    @article.save
-    expects(:article_url).with(@article)
-    polymorphic_url([nil, @article])
-  end
-
-  def test_with_array_containing_single_name
-    @article.save
-    expects(:articles_url)
-    polymorphic_url([:articles])
-  end
-
-  # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
-  def xtest_with_hash
-    expects(:article_url).with(@article)
-    @article.save
-    polymorphic_url(:id => @article)
-  end
-
-  def test_polymorphic_path_accepts_options
-    expects(:new_article_path).with()
-    polymorphic_path(@article, :action => :new)
-  end
-
-  def test_polymorphic_path_does_not_modify_arguments
-    expects(:admin_article_responses_url).with(@article)
-    path = [:admin, @article, @response]
-    assert_no_difference 'path.size' do
-      polymorphic_url(path)
-    end
-  end
-
-  # Tests for names where .plural.singular doesn't round-trip
-  def test_with_irregular_plural_record
-    @tax.save
-    expects(:taxis_url).with(@tax)
-    polymorphic_url(@tax)
-  end
-
-  def test_with_irregular_plural_new_record
-    expects(:taxes_url).with()
-    @tax.expects(:new_record?).returns(true)
-    polymorphic_url(@tax)
-  end
-
-  def test_with_irregular_plural_record_and_action
-    expects(:new_taxis_url).with()
-    @tax.expects(:new_record?).never
-    polymorphic_url(@tax, :action => 'new')
-  end
-
-  def test_irregular_plural_url_helper_prefixed_with_new
-    expects(:new_taxis_url).with()
-    new_polymorphic_url(@tax)
-  end
-
-  def test_irregular_plural_url_helper_prefixed_with_edit
-    @tax.save
-    expects(:edit_taxis_url).with(@tax)
-    edit_polymorphic_url(@tax)
-  end
-
-  def test_with_nested_irregular_plurals
-    @fax.save
-    expects(:taxis_faxis_url).with(@tax, @fax)
-    polymorphic_url([@tax, @fax])
-  end
-
-  def test_with_nested_unsaved_irregular_plurals
-    expects(:taxis_faxes_url).with(@tax)
-    polymorphic_url([@tax, @fax])
-  end
-
-  def test_new_with_irregular_plural_array_and_namespace
-    expects(:new_admin_taxis_url).with()
-    polymorphic_url([:admin, @tax], :action => 'new')
-  end
-
-  def test_unsaved_with_irregular_plural_array_and_namespace
-    expects(:admin_taxes_url).with()
-    polymorphic_url([:admin, @tax])
-  end
-
-  def test_nesting_with_irregular_plurals_and_array_ending_in_singleton_resource
-    expects(:taxis_faxis_url).with(@tax)
-    polymorphic_url([@tax, :faxis])
-  end
-
-  def test_with_array_containing_single_irregular_plural_object
-    @tax.save
-    expects(:taxis_url).with(@tax)
-    polymorphic_url([nil, @tax])
-  end
-
-  def test_with_array_containing_single_name_irregular_plural
-    @tax.save
-    expects(:taxes_url)
-    polymorphic_url([:taxes])
-  end
-
-end
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index 741b01caa8..894420a910 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -400,22 +400,6 @@ class RescueControllerTest < ActionController::TestCase
     assert_equal "RescueController::ResourceUnavailableToRescueAsString", @response.body
   end
 
-  def test_rescue_dispatcher_exceptions
-    env = @request.env
-    env["action_controller.rescue.request"] = @request
-    env["action_controller.rescue.response"] = @response
-
-    RescueController.call_with_exception(env, ActionController::RoutingError.new("Route not found"))
-    assert_equal "no way", @response.body
-  end
-
-  def test_rescue_dispatcher_exceptions_without_request_set
-    @request.env['REQUEST_URI'] = '/no_way'
-    response = RescueController.call_with_exception(@request.env, ActionController::RoutingError.new("Route not found"))
-    assert_kind_of ActionDispatch::Response, response
-    assert_equal "no way", response.body
-  end
-
   protected
     def with_all_requests_local(local = true)
       old_local, ActionController::Base.consider_all_requests_local =
@@ -537,3 +521,83 @@ class ControllerInheritanceRescueControllerTest < ActionController::TestCase
     assert_response :created
   end
 end
+
+class ApplicationController < ActionController::Base
+  rescue_from ActionController::RoutingError do
+    render :text => 'no way'
+  end
+end
+
+class RescueTest < ActionController::IntegrationTest
+  class TestController < ActionController::Base
+    class RecordInvalid < StandardError
+      def message
+        'invalid'
+      end
+    end
+    rescue_from RecordInvalid, :with => :show_errors
+
+    def foo
+      render :text => "foo"
+    end
+
+    def invalid
+      raise RecordInvalid
+    end
+
+    def b00m
+      raise 'b00m'
+    end
+
+    protected
+      def show_errors(exception)
+        render :text => exception.message
+      end
+  end
+
+  test 'normal request' do
+    with_test_routing do
+      get '/foo'
+      assert_equal 'foo', response.body
+    end
+  end
+
+  test 'rescue exceptions inside controller' do
+    with_test_routing do
+      get '/invalid'
+      assert_equal 'invalid', response.body
+    end
+  end
+
+  test 'rescue routing exceptions' do
+    assert_equal 1, ApplicationController.rescue_handlers.length
+
+    begin
+      with_test_routing do
+        get '/no_way'
+        assert_equal 'no way', response.body
+      end
+    ensure
+      ActionController::Base.rescue_handlers.clear
+    end
+  end
+
+  test 'unrescued exception' do
+    with_test_routing do
+      get '/b00m'
+      assert_match(/Action Controller: Exception caught/, response.body)
+    end
+  end
+
+  private
+    def with_test_routing
+      with_routing do |set|
+        set.draw do |map|
+          map.connect 'foo', :controller => "rescue_test/test", :action => 'foo'
+          map.connect 'invalid', :controller => "rescue_test/test", :action => 'invalid'
+          map.connect 'b00m', :controller => "rescue_test/test", :action => 'b00m'
+        end
+        yield
+      end
+    end
+end
diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb
deleted file mode 100644
index b9bf8cf411..0000000000
--- a/actionpack/test/controller/session/cookie_store_test.rb
+++ /dev/null
@@ -1,250 +0,0 @@
-require 'abstract_unit'
-require 'stringio'
-
-class CookieStoreTest < ActionController::IntegrationTest
-  SessionKey = '_myapp_session'
-  SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
-
-  DispatcherApp = ActionController::Dispatcher.new
-  CookieStoreApp = ActionDispatch::Session::CookieStore.new(DispatcherApp,
-                     :key => SessionKey, :secret => SessionSecret)
-
-  Verifier = ActiveSupport::MessageVerifier.new(SessionSecret, 'SHA1')
-
-  SignedBar = "BAh7BjoIZm9vIghiYXI%3D--fef868465920f415f2c0652d6910d3af288a0367"
-
-  class TestController < ActionController::Base
-    def no_session_access
-      head :ok
-    end
-
-    def persistent_session_id
-      render :text => session[:session_id]
-    end
-
-    def set_session_value
-      session[:foo] = "bar"
-      render :text => Rack::Utils.escape(Verifier.generate(session.to_hash))
-    end
-
-    def get_session_value
-      render :text => "foo: #{session[:foo].inspect}"
-    end
-
-    def get_session_id
-      render :text => "foo: #{session[:foo].inspect}; id: #{request.session_options[:id]}"
-    end
-
-    def call_reset_session
-      reset_session
-      head :ok
-    end
-
-    def raise_data_overflow
-      session[:foo] = 'bye!' * 1024
-      head :ok
-    end
-
-    def rescue_action(e) raise end
-  end
-
-  def setup
-    @integration_session = open_session(CookieStoreApp)
-  end
-
-  def test_raises_argument_error_if_missing_session_key
-    assert_raise(ArgumentError, nil.inspect) {
-      ActionDispatch::Session::CookieStore.new(nil,
-        :key => nil, :secret => SessionSecret)
-    }
-
-    assert_raise(ArgumentError, ''.inspect) {
-      ActionDispatch::Session::CookieStore.new(nil,
-        :key => '', :secret => SessionSecret)
-    }
-  end
-
-  def test_raises_argument_error_if_missing_secret
-    assert_raise(ArgumentError, nil.inspect) {
-      ActionDispatch::Session::CookieStore.new(nil,
-       :key => SessionKey, :secret => nil)
-    }
-
-    assert_raise(ArgumentError, ''.inspect) {
-      ActionDispatch::Session::CookieStore.new(nil,
-       :key => SessionKey, :secret => '')
-    }
-  end
-
-  def test_raises_argument_error_if_secret_is_probably_insecure
-    assert_raise(ArgumentError, "password".inspect) {
-      ActionDispatch::Session::CookieStore.new(nil,
-       :key => SessionKey, :secret => "password")
-    }
-
-    assert_raise(ArgumentError, "secret".inspect) {
-      ActionDispatch::Session::CookieStore.new(nil,
-       :key => SessionKey, :secret => "secret")
-    }
-
-    assert_raise(ArgumentError, "12345678901234567890123456789".inspect) {
-      ActionDispatch::Session::CookieStore.new(nil,
-       :key => SessionKey, :secret => "12345678901234567890123456789")
-    }
-  end
-
-  def test_setting_session_value
-    with_test_route_set do
-      get '/set_session_value'
-      assert_response :success
-      assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly",
-        headers['Set-Cookie']
-   end
-  end
-
-  def test_getting_session_value
-    with_test_route_set do
-      cookies[SessionKey] = SignedBar
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: "bar"', response.body
-   end
-  end
-
-  def test_getting_session_id
-    with_test_route_set do
-      cookies[SessionKey] = SignedBar
-      get '/persistent_session_id'
-      assert_response :success
-      assert_equal response.body.size, 32
-      session_id = response.body
-
-      get '/get_session_id'
-      assert_response :success
-      assert_equal "foo: \"bar\"; id: #{session_id}", response.body
-    end
-  end
-
-  def test_disregards_tampered_sessions
-    with_test_route_set do
-      cookies[SessionKey] = "BAh7BjoIZm9vIghiYXI%3D--123456780"
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-    end
-  end
-
-  def test_close_raises_when_data_overflows
-    with_test_route_set do
-      assert_raise(ActionDispatch::Session::CookieStore::CookieOverflow) {
-        get '/raise_data_overflow'
-      }
-    end
-  end
-
-  def test_doesnt_write_session_cookie_if_session_is_not_accessed
-    with_test_route_set do
-      get '/no_session_access'
-      assert_response :success
-      assert_equal "", headers['Set-Cookie']
-    end
-  end
-
-  def test_doesnt_write_session_cookie_if_session_is_unchanged
-    with_test_route_set do
-      cookies[SessionKey] = "BAh7BjoIZm9vIghiYXI%3D--" +
-        "fef868465920f415f2c0652d6910d3af288a0367"
-      get '/no_session_access'
-      assert_response :success
-      assert_equal "", headers['Set-Cookie']
-    end
-  end
-
-  def test_setting_session_value_after_session_reset
-    with_test_route_set do
-      get '/set_session_value'
-      assert_response :success
-      session_payload = response.body
-      assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly",
-        headers['Set-Cookie']
-
-      get '/call_reset_session'
-      assert_response :success
-      assert_not_equal [], headers['Set-Cookie']
-      assert_not_equal session_payload, cookies[SessionKey]
-
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-    end
-  end
-
-  def test_persistent_session_id
-    with_test_route_set do
-      cookies[SessionKey] = SignedBar
-      get '/persistent_session_id'
-      assert_response :success
-      assert_equal response.body.size, 32
-      session_id = response.body
-      get '/persistent_session_id'
-      assert_equal session_id, response.body
-      reset!
-      get '/persistent_session_id'
-      assert_not_equal session_id, response.body
-    end
-  end
-
-  def test_session_store_with_expire_after
-    app = ActionDispatch::Session::CookieStore.new(DispatcherApp, :key => SessionKey, :secret => SessionSecret, :expire_after => 5.hours)
-    @integration_session = open_session(app)
-
-    with_test_route_set do
-      # First request accesses the session
-      time = Time.local(2008, 4, 24)
-      Time.stubs(:now).returns(time)
-      expected_expiry = (time + 5.hours).gmtime.strftime("%a, %d-%b-%Y %H:%M:%S GMT")
-
-      cookies[SessionKey] = SignedBar
-
-      get '/set_session_value'
-      assert_response :success
-
-      cookie_body = response.body
-      assert_equal "_myapp_session=#{cookie_body}; path=/; expires=#{expected_expiry}; HttpOnly",
-        headers['Set-Cookie']
-
-      # Second request does not access the session
-      time = Time.local(2008, 4, 25)
-      Time.stubs(:now).returns(time)
-      expected_expiry = (time + 5.hours).gmtime.strftime("%a, %d-%b-%Y %H:%M:%S GMT")
-
-      get '/no_session_access'
-      assert_response :success
-
-      # Mystery bug that came up in 2.3 as well. What is this trying to test?!
-      # assert_equal "_myapp_session=#{cookie_body}; path=/; expires=#{expected_expiry}; HttpOnly",
-      #   headers['Set-Cookie']
-    end
-  end
-
-  private
-    def with_test_route_set
-      with_routing do |set|
-        set.draw do |map|
-          map.with_options :controller => "cookie_store_test/test" do |c|
-            c.connect "/:action"
-          end
-        end
-        yield
-      end
-    end
-
-    def unmarshal_session(cookie_string)
-      session = Rack::Utils.parse_query(cookie_string, ';,').inject({}) {|h,(k,v)|
-        h[k] = Array === v ? v.first : v
-        h
-      }[SessionKey]
-      verifier = ActiveSupport::MessageVerifier.new(SessionSecret, 'SHA1')
-      verifier.verify(session)
-    end
-end
diff --git a/actionpack/test/controller/session/mem_cache_store_test.rb b/actionpack/test/controller/session/mem_cache_store_test.rb
deleted file mode 100644
index 7561c93e4a..0000000000
--- a/actionpack/test/controller/session/mem_cache_store_test.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-require 'abstract_unit'
-
-# You need to start a memcached server inorder to run these tests
-class MemCacheStoreTest < ActionController::IntegrationTest
-  class TestController < ActionController::Base
-    def no_session_access
-      head :ok
-    end
-
-    def set_session_value
-      session[:foo] = "bar"
-      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
-
-    def call_reset_session
-      session[:bar]
-      reset_session
-      session[:bar] = "baz"
-      head :ok
-    end
-
-    def rescue_action(e) raise end
-  end
-
-  begin
-    DispatcherApp = ActionController::Dispatcher.new
-    MemCacheStoreApp = ActionDispatch::Session::MemCacheStore.new(
-                         DispatcherApp, :key => '_session_id')
-
-
-    def setup
-      @integration_session = open_session(MemCacheStoreApp)
-    end
-
-    def test_setting_and_getting_session_value
-      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 'foo: "bar"', response.body
-      end
-    end
-
-    def test_getting_nil_session_value
-      with_test_route_set do
-        get '/get_session_value'
-        assert_response :success
-        assert_equal 'foo: nil', response.body
-      end
-    end
-
-    def test_setting_session_value_after_session_reset
-      with_test_route_set do
-        get '/set_session_value'
-        assert_response :success
-        assert cookies['_session_id']
-        session_id = cookies['_session_id']
-
-        get '/call_reset_session'
-        assert_response :success
-        assert_not_equal [], headers['Set-Cookie']
-
-        get '/get_session_value'
-        assert_response :success
-        assert_equal 'foo: nil', response.body
-
-        get '/get_session_id'
-        assert_response :success
-        assert_not_equal session_id, response.body
-      end
-    end
-
-    def test_getting_session_id
-      with_test_route_set do
-        get '/set_session_value'
-        assert_response :success
-        assert cookies['_session_id']
-        session_id = cookies['_session_id']
-
-        get '/get_session_id'
-        assert_response :success
-        assert_equal session_id, response.body
-      end
-    end
-
-    def test_prevents_session_fixation
-      with_test_route_set do
-        get '/get_session_value'
-        assert_response :success
-        assert_equal 'foo: nil', response.body
-        session_id = cookies['_session_id']
-
-        reset!
-
-        get '/set_session_value', :_session_id => session_id
-        assert_response :success
-        assert_equal nil, cookies['_session_id']
-      end
-    end
-  rescue LoadError, RuntimeError
-    $stderr.puts "Skipping MemCacheStoreTest tests. Start memcached and try again."
-  end
-
-  private
-    def with_test_route_set
-      with_routing do |set|
-        set.draw do |map|
-          map.with_options :controller => "mem_cache_store_test/test" do |c|
-            c.connect "/:action"
-          end
-        end
-        yield
-      end
-    end
-end
diff --git a/actionpack/test/controller/session/test_session_test.rb b/actionpack/test/controller/session/test_session_test.rb
deleted file mode 100644
index de6539e1cc..0000000000
--- a/actionpack/test/controller/session/test_session_test.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'abstract_unit'
-require 'stringio'
-
-class ActionController::TestSessionTest < ActiveSupport::TestCase
-  
-  def test_calling_delete_without_parameters_raises_deprecation_warning_and_calls_to_clear_test_session
-    assert_deprecated(/use clear instead/){ ActionController::TestSession.new.delete }
-  end
-  
-  def test_calling_update_without_parameters_raises_deprecation_warning_and_calls_to_clear_test_session
-    assert_deprecated(/use replace instead/){ ActionController::TestSession.new.update }
-  end
-  
-  def test_calling_close_raises_deprecation_warning
-    assert_deprecated(/sessions should no longer be closed/){ ActionController::TestSession.new.close }
-  end
-  
-  def test_defaults
-    session = ActionController::TestSession.new
-    assert_equal({}, session.data)
-    assert_equal('', session.session_id)
-  end
-  
-  def test_ctor_allows_setting
-    session = ActionController::TestSession.new({:one => 'one', :two => 'two'})
-    assert_equal('one', session[:one])
-    assert_equal('two', session[:two])
-  end
-  
-  def test_setting_session_item_sets_item
-    session = ActionController::TestSession.new
-    session[:key] = 'value'
-    assert_equal('value', session[:key])
-  end
-  
-  def test_calling_delete_removes_item
-    session = ActionController::TestSession.new
-    session[:key] = 'value'
-    assert_equal('value', session[:key])
-    session.delete(:key)
-    assert_nil(session[:key])
-  end
-  
-  def test_calling_update_with_params_passes_to_attributes
-    session = ActionController::TestSession.new()
-    session.update('key' => 'value')
-    assert_equal('value', session[:key])
-  end
-  
-  def test_clear_emptys_session
-    params = {:one => 'one', :two => 'two'}
-    session = ActionController::TestSession.new({:one => 'one', :two => 'two'})
-    session.clear
-    assert_nil(session[:one])
-    assert_nil(session[:two])
-  end
-  
-end
\ No newline at end of file