diff options
author | brainopia <brainopia@evilmartians.com> | 2012-04-30 04:14:51 +0400 |
---|---|---|
committer | brainopia <brainopia@evilmartians.com> | 2012-04-30 04:14:51 +0400 |
commit | 41219386268f670399a905c11e28b1ef76939ee1 (patch) | |
tree | 243e55e8cd66c773be3ad840fb833966bb5d80f3 /actionpack | |
parent | 0b019cc3b821eb362ef3f75f4bc16727c1f23fa6 (diff) | |
download | rails-41219386268f670399a905c11e28b1ef76939ee1.tar.gz rails-41219386268f670399a905c11e28b1ef76939ee1.tar.bz2 rails-41219386268f670399a905c11e28b1ef76939ee1.zip |
Support cookie jar options for all cookie stores
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 7 | ||||
-rw-r--r-- | actionpack/test/activerecord/active_record_store_test.rb | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb index 6a8e690d18..45a00b5056 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -74,6 +74,13 @@ module ActionDispatch class AbstractStore < Rack::Session::Abstract::ID include Compatibility include StaleSessionCheck + + private + + def set_cookie(env, session_id, cookie) + request = ActionDispatch::Request.new(env) + request.cookie_jar[key] = cookie + end end end end diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb index fceebe1858..275f25f597 100644 --- a/actionpack/test/activerecord/active_record_store_test.rb +++ b/actionpack/test/activerecord/active_record_store_test.rb @@ -254,6 +254,13 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest end end + def test_session_store_with_all_domains + with_test_route_set(:domain => :all) do + get '/set_session_value' + assert_response :success + end + end + private def with_test_route_set(options = {}) |