aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/session/mem_cache_store_test.rb
diff options
context:
space:
mode:
authorBrian John <brian@brianjohn.com>2015-03-12 09:52:38 -0500
committerBrian John <brian@brianjohn.com>2015-03-12 09:52:38 -0500
commit82402e6583dfd749ac128f7db65f567c03beaf50 (patch)
treeb95f5740c019f061834a5c4fa5ef9d9ba5fe6bd9 /actionpack/test/dispatch/session/mem_cache_store_test.rb
parent1b7ae86f262df7d15b57be3b4a4f38680ce37c64 (diff)
downloadrails-82402e6583dfd749ac128f7db65f567c03beaf50.tar.gz
rails-82402e6583dfd749ac128f7db65f567c03beaf50.tar.bz2
rails-82402e6583dfd749ac128f7db65f567c03beaf50.zip
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
Diffstat (limited to 'actionpack/test/dispatch/session/mem_cache_store_test.rb')
-rw-r--r--actionpack/test/dispatch/session/mem_cache_store_test.rb2
1 files changed, 1 insertions, 1 deletions
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 @@ class MemCacheStoreTest < ActionDispatch::IntegrationTest
end
def get_session_id
- render :text => "#{request.session_options[:id]}"
+ render :text => "#{request.session.id}"
end
def call_reset_session