diff options
| author | Brian John <brian@brianjohn.com> | 2015-03-12 09:52:38 -0500 |
|---|---|---|
| committer | Brian John <brian@brianjohn.com> | 2015-03-12 09:52:38 -0500 |
| commit | 82402e6583dfd749ac128f7db65f567c03beaf50 (patch) | |
| tree | b95f5740c019f061834a5c4fa5ef9d9ba5fe6bd9 /actionpack/lib/action_controller/test_case.rb | |
| parent | 1b7ae86f262df7d15b57be3b4a4f38680ce37c64 (diff) | |
| download | rails-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/lib/action_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
1 files changed, 1 insertions, 1 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 @@ module ActionController 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 = {}) |