summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-15 09:10:52 +0000
committerRobert Speicher <rspeicher@gmail.com>2018-01-15 13:30:51 -0600
commit8ac23312b5d57b5530f0f8747b9bdd5e84ca8d5b (patch)
tree51ecb76a12c6c121772364c80ff77b858de09f23 /spec
parentc2d5d3f8fb57f8de352c30038b09f77071febe3e (diff)
downloadgitlab-ce-8ac23312b5d57b5530f0f8747b9bdd5e84ca8d5b.tar.gz
Merge branch 'fj-41598-fixing-request-mime-type' into 'master'
Fixing request json mime type Closes #41598 See merge request gitlab-org/gitlab-ce!16427
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/auth/user_auth_finders_spec.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/lib/gitlab/auth/user_auth_finders_spec.rb b/spec/lib/gitlab/auth/user_auth_finders_spec.rb
index 4637816570c..2733eef6611 100644
--- a/spec/lib/gitlab/auth/user_auth_finders_spec.rb
+++ b/spec/lib/gitlab/auth/user_auth_finders_spec.rb
@@ -76,6 +76,16 @@ describe Gitlab::Auth::UserAuthFinders do
expect(find_user_from_rss_token).to be_nil
end
end
+
+ context 'when the request format is empty' do
+ it 'the method call does not modify the original value' do
+ env['action_dispatch.request.formats'] = nil
+
+ find_user_from_rss_token
+
+ expect(env['action_dispatch.request.formats']).to be_nil
+ end
+ end
end
describe '#find_user_from_access_token' do