diff options
| author | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
|---|---|---|
| committer | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
| commit | ddafde942ca53816c19b0ea0cb40bb1b46cf5668 (patch) | |
| tree | c0ac2138fe994c4c2a15c23b47d4155f75148945 /spec/rails_helper.rb | |
| parent | e6300de1421d28d173658e61601b9e016c3d0a6d (diff) | |
| parent | da42bfadb58888e3a18afd66395f0f3edc2fa622 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'spec/rails_helper.rb')
| -rw-r--r-- | spec/rails_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 31c94b1e4..cfc9eec9e 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -23,7 +23,7 @@ Devise::Test::ControllerHelpers.module_eval do original_sign_in(resource, scope: scope) SessionActivation.deactivate warden.raw_session["auth_id"] - warden.raw_session["auth_id"] = resource.activate_session + warden.raw_session["auth_id"] = resource.activate_session(warden.request) end end |