diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-21 15:41:12 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-21 15:41:12 +0000 |
commit | 60b28e7ce11935610700bdc5a3d3b8c4cde77802 (patch) | |
tree | 1633452287111c456282f6bc55ddad85edd60b22 /spec/controllers | |
parent | 9ed544035fcda156e1b6c782eb4c8c77128d1337 (diff) | |
parent | 0b5133bac2cbcf6f75aaa90acec269a1a7d02c7c (diff) | |
download | gitlab-ce-60b28e7ce11935610700bdc5a3d3b8c4cde77802.tar.gz |
Merge branch '34549-extract-devise-mappings-into-helper' into 'master'
Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper
Closes #34549
See merge request !12742
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/sessions_controller_spec.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 2b4e8723b48..a22fd8eaf9b 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -1,9 +1,11 @@ require 'spec_helper' describe SessionsController do + include DeviseHelpers + describe '#new' do before do - @request.env['devise.mapping'] = Devise.mappings[:user] + set_devise_mapping(context: @request) end context 'when auto sign-in is enabled' do @@ -34,7 +36,7 @@ describe SessionsController do describe '#create' do before do - @request.env['devise.mapping'] = Devise.mappings[:user] + set_devise_mapping(context: @request) end context 'when using standard authentications' do @@ -257,7 +259,7 @@ describe SessionsController do describe '#new' do before do - @request.env['devise.mapping'] = Devise.mappings[:user] + set_devise_mapping(context: @request) end it 'redirects correctly for referer on same host with params' do |