From 82402e6583dfd749ac128f7db65f567c03beaf50 Mon Sep 17 00:00:00 2001
From: Brian John <brian@brianjohn.com>
Date: Thu, 12 Mar 2015 09:52:38 -0500
Subject: [PATCH] Use request.session.id instead of
 request.session_options[:id]

As of the upgrade to Rack 1.5, request.session_options[:id] is no
longer populated. Reflect this change in the tests by using
request.session.id instead.

Related change in Rack:
https://github.com/rack/rack/commit/83a270d6
---
 actionpack/lib/action_controller/test_case.rb            | 2 +-
 actionpack/test/controller/request/test_request_test.rb  | 8 --------
 actionpack/test/dispatch/session/cache_store_test.rb     | 2 +-
 actionpack/test/dispatch/session/cookie_store_test.rb    | 4 ++--
 actionpack/test/dispatch/session/mem_cache_store_test.rb | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 4782991463..33c24999f9 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -201,7 +201,7 @@ def initialize(env = {})
       super
 
       self.session = TestSession.new
-      self.session_options = TestSession::DEFAULT_OPTIONS.merge(:id => SecureRandom.hex(16))
+      self.session_options = TestSession::DEFAULT_OPTIONS
     end
 
     def assign_parameters(routes, controller_path, action, parameters = {})
diff --git a/actionpack/test/controller/request/test_request_test.rb b/actionpack/test/controller/request/test_request_test.rb
index e624f11773..77a2f68b1c 100644
--- a/actionpack/test/controller/request/test_request_test.rb
+++ b/actionpack/test/controller/request/test_request_test.rb
@@ -24,12 +24,4 @@ def test_test_request_has_session_options_initialized
     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
-    assert_not_equal(@request.session_options[:id], ActionController::TestRequest.new.session_options[:id])
-  end
-
 end
diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb
index 9f810cad01..22a46b0930 100644
--- a/actionpack/test/dispatch/session/cache_store_test.rb
+++ b/actionpack/test/dispatch/session/cache_store_test.rb
@@ -22,7 +22,7 @@ def get_session_value
     end
 
     def get_session_id
-      render :text => "#{request.session_options[:id]}"
+      render :text => "#{request.session.id}"
     end
 
     def call_reset_session
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 2194efa503..e7f4235de8 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -29,7 +29,7 @@ def get_session_value
     end
 
     def get_session_id
-      render :text => "id: #{request.session_options[:id]}"
+      render :text => "id: #{request.session.id}"
     end
 
     def get_class_after_reset_session
@@ -53,7 +53,7 @@ def raise_data_overflow
     end
 
     def change_session_id
-      request.session_options[:id] = nil
+      request.session.options[:id] = nil
       get_session_id
     end
 
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index fbd82945cc..9a5d5131c0 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -23,7 +23,7 @@ def get_session_value
     end
 
     def get_session_id
-      render :text => "#{request.session_options[:id]}"
+      render :text => "#{request.session.id}"
     end
 
     def call_reset_session
-- 
GitLab