diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-28 15:26:00 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-28 15:26:00 +0100 |
| commit | dc04fdc1a3165134fc9245e9a591daceee857ef4 (patch) | |
| tree | e3b01475f2e224cd1595167c9a5dd0d0dc013a89 /spec/javascripts/fixtures | |
| parent | ec302c6c0cf7d4b3a19bea43ce380dbaa60b363d (diff) | |
| parent | 48c51e207e4cba8a69e4ca65cba1e169d384cefa (diff) | |
| download | gitlab-ce-dc04fdc1a3165134fc9245e9a591daceee857ef4.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'spec/javascripts/fixtures')
| -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| |