summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
authorJacopo <beschi.jacopo@gmail.com>2017-07-09 10:51:59 +0200
committerJacopo <beschi.jacopo@gmail.com>2017-07-20 18:36:53 +0200
commit0b5133bac2cbcf6f75aaa90acec269a1a7d02c7c (patch)
tree886aedd6f640aeb3875a1d03cc7605e196ac2bb1 /spec/javascripts
parent64701b51aeacf4f4f932f205a2d831880b757a43 (diff)
downloadgitlab-ce-0b5133bac2cbcf6f75aaa90acec269a1a7d02c7c.tar.gz
Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper
Extracted `@request.env['devise.mapping'] = Devise.mappings[:user]` and `Rails.application.env_config['devise.mapping'] = Devise.mappings[:user]` in our tests into the helper method `set_devise_mapping`
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/fixtures/u2f.rb4
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|