Merge branch 'master' of git@github.com:rails/rails

4 files changed, 20 insertions, 19 deletions

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 96f7a42c9b..f091f9b87c 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -378,10 +378,12 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_redirect_url_match
     process :redirect_external
     assert @response.redirect?
-    assert @response.redirect_url_match?("rubyonrails")
-    assert @response.redirect_url_match?(/rubyonrails/)
-    assert !@response.redirect_url_match?("phpoffrails")
-    assert !@response.redirect_url_match?(/perloffrails/)
+    assert_deprecated do
+      assert @response.redirect_url_match?("rubyonrails")
+      assert @response.redirect_url_match?(/rubyonrails/)
+      assert !@response.redirect_url_match?("phpoffrails")
+      assert !@response.redirect_url_match?(/perloffrails/)
+    end
   end
 
   # check for a redirection
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index 00789eea38..7bebc8cd2a 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -111,8 +111,6 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
   test "authentication request with valid credential and nil session" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
 
-    # session_id = "" in functional test, but is +nil+ in real life
-    @request.session.session_id = nil
     get :display
 
     assert_response :success
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index e39a934c24..70fa41aded 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -297,7 +297,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       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)
+      assert_equal({"cookie_1"=>nil, "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies)
       assert_equal "Gone", response.body
     end
   end
@@ -337,7 +337,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       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 "", request.env["QUERY_STRING"]
+      assert_equal "foo=bar", request.env["QUERY_STRING"]
       assert_equal 'foo=bar', request.query_string
       assert_equal 'bar', request.parameters['foo']
 
diff --git a/actionpack/test/controller/request/test_request_test.rb b/actionpack/test/controller/request/test_request_test.rb
index 81551b4ba7..0a39feb7fe 100644
--- a/actionpack/test/controller/request/test_request_test.rb
+++ b/actionpack/test/controller/request/test_request_test.rb
@@ -10,26 +10,27 @@ class ActionController::TestRequestTest < ActiveSupport::TestCase
   def test_test_request_has_session_options_initialized
     assert @request.session_options
   end
-  
-  Rack::Session::Abstract::ID::DEFAULT_OPTIONS.each_key do |option|
-    test "test_rack_default_session_options_#{option}_exists_in_session_options_and_is_default" do
-      assert_equal(Rack::Session::Abstract::ID::DEFAULT_OPTIONS[option], 
-                   @request.session_options[option], 
+
+  ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS.each_key do |option|
+    test "rack default session options #{option} exists in session options and is default" do
+      assert_equal(ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS[option],
+                   @request.session_options[option],
                    "Missing rack session default option #{option} in request.session_options")
     end
-    test "test_rack_default_session_options_#{option}_exists_in_session_options" do
-      assert(@request.session_options.has_key?(option), 
+
+    test "rack default session options #{option} exists in session options" do
+      assert(@request.session_options.has_key?(option),
                    "Missing rack session option #{option} in request.session_options")
     end
   end
-  
+
   def test_session_id_exists_by_default
     assert_not_nil(@request.session_options[:id])
   end
-  
+
   def test_session_id_different_on_each_call
-    prev_id = 
+    prev_id =
     assert_not_equal(@request.session_options[:id], ActionController::TestRequest.new.session_options[:id])
   end
-  
+
 end
\ No newline at end of file