Commit 20adfb53 authored by Jan Provaznik's avatar Jan Provaznik

Fix nil formats test

One of the spec files sets `nil` value for env varialbe
`action_dispatch.request.formats`. Rather than setting `nil` value,
we can delete the `action_dispatch.request.formats` key from `env`
(which should be closer to real use case anyway). The reason is that
in Rails 5, `formats` method does not set default array of formats
if the env key is already set (even if set to `nil`).
parent 7b1eb2a6
...@@ -99,7 +99,7 @@ describe Gitlab::Auth::UserAuthFinders do ...@@ -99,7 +99,7 @@ describe Gitlab::Auth::UserAuthFinders do
context 'when the request format is empty' do context 'when the request format is empty' do
it 'the method call does not modify the original value' do it 'the method call does not modify the original value' do
env['action_dispatch.request.formats'] = nil env.delete('action_dispatch.request.formats')
find_user_from_feed_token find_user_from_feed_token
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment