diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-07 23:25:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 23:25:15 +0200 |
| commit | 00df69bc89f1b5ffdf290bde8359b3854e2b1395 (patch) | |
| tree | 3d5fff003bc5fb0c6e8922451532eb158d262f05 /spec/rails_helper.rb | |
| parent | 7a549f830e0d77af3020243617c5ab8bd811fd8d (diff) | |
Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)
* Fix #4058 - Use a long-lived cookie to keep track of user-level sessions
* Fix tests, smooth migrate from previous session-based identifier
Diffstat (limited to 'spec/rails_helper.rb')
| -rw-r--r-- | spec/rails_helper.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 9a4c8fd3c9f..4f7399505c4 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -20,11 +20,16 @@ Sidekiq::Logging.logger = nil Devise::Test::ControllerHelpers.module_eval do alias_method :original_sign_in, :sign_in - def sign_in(resource, deprecated = nil, scope: nil) + def sign_in(resource, _deprecated = nil, scope: nil) original_sign_in(resource, scope: scope) - SessionActivation.deactivate warden.raw_session["auth_id"] - warden.raw_session["auth_id"] = resource.activate_session(warden.request) + SessionActivation.deactivate warden.cookies.signed['_session_id'] + + warden.cookies.signed['_session_id'] = { + value: resource.activate_session(warden.request), + expires: 1.year.from_now, + httponly: true, + } end end |