diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2015-03-12 11:30:12 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2015-03-12 11:30:12 -0500 |
| commit | ccf8678cec9228a08d01b5a7dc9552821bdc2686 (patch) | |
| tree | aa223a9c365280d55070ec8b83c3bea89b1deef9 /actionpack/lib | |
| parent | be496706ca0af72df34e1fbb3e0abb6c0cfe9ca7 (diff) | |
| parent | 82402e6583dfd749ac128f7db65f567c03beaf50 (diff) | |
| download | rails-ccf8678cec9228a08d01b5a7dc9552821bdc2686.tar.gz rails-ccf8678cec9228a08d01b5a7dc9552821bdc2686.tar.bz2 rails-ccf8678cec9228a08d01b5a7dc9552821bdc2686.zip | |
Merge pull request #19309 from f1sherman/dont-set-session-options-id
Use request.session.id instead of request.session_options[:id]
Diffstat (limited to 'actionpack/lib')
| -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 = {}) |