diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-20 13:43:57 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-20 13:45:11 -0700 |
| commit | 51211a94bd7a34d80f2412a7f94fefe7366647a5 (patch) | |
| tree | b4b3df2f609e9a1390e45130968bd6c10df589d0 /actionpack | |
| parent | 86e0136f4815ebf5b3a3eadbf980b36735ec6748 (diff) | |
| download | rails-51211a94bd7a34d80f2412a7f94fefe7366647a5.tar.gz rails-51211a94bd7a34d80f2412a7f94fefe7366647a5.tar.bz2 rails-51211a94bd7a34d80f2412a7f94fefe7366647a5.zip | |
point at rack master
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/request/session.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/dispatch/request/session_test.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 1bba9df969..28d8bc3091 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency 'activesupport', version - s.add_dependency 'rack', '~> 1.6' + s.add_dependency 'rack', '~> 2.x' s.add_dependency 'rack-test', '~> 0.6.3' s.add_dependency 'rails-html-sanitizer', '~> 1.0', '>= 1.0.2' s.add_dependency 'rails-dom-testing', '~> 1.0', '>= 1.0.5' diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb index a8a3cd20b9..bae3d909fa 100644 --- a/actionpack/lib/action_dispatch/request/session.rb +++ b/actionpack/lib/action_dispatch/request/session.rb @@ -4,8 +4,8 @@ module ActionDispatch class Request < Rack::Request # Session is responsible for lazily loading the session from store. class Session # :nodoc: - ENV_SESSION_KEY = Rack::Session::Abstract::ENV_SESSION_KEY # :nodoc: - ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY # :nodoc: + ENV_SESSION_KEY = Rack::RACK_SESSION # :nodoc: + ENV_SESSION_OPTIONS_KEY = Rack::RACK_SESSION_OPTIONS # :nodoc: # Singleton object used to determine if an optional param wasn't specified Unspecified = Object.new diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb index 10fb04e230..8bcc07dd04 100644 --- a/actionpack/test/dispatch/request/session_test.rb +++ b/actionpack/test/dispatch/request/session_test.rb @@ -7,7 +7,7 @@ module ActionDispatch def test_create_adds_itself_to_env env = {} s = Session.create(store, env, {}) - assert_equal s, env[Rack::Session::Abstract::ENV_SESSION_KEY] + assert_equal s, env[Rack::RACK_SESSION] end def test_to_hash |