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/javascripts | |
| 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/javascripts')
| -rw-r--r-- | spec/javascripts/fixtures/u2f.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/javascripts/fixtures/u2f.rb b/spec/javascripts/fixtures/u2f.rb index c9c0b891237..e3d7986f2cf 100644 --- a/spec/javascripts/fixtures/u2f.rb +++ b/spec/javascripts/fixtures/u2f.rb @@ -10,10 +10,12 @@ context 'U2F' do end describe SessionsController, '(JavaScript fixtures)', type: :controller do + include DeviseHelpers + render_views before do - @request.env['devise.mapping'] = Devise.mappings[:user] + set_devise_mapping(context: @request) end it 'u2f/authenticate.html.raw' do |example| |