Commit 4adc476b authored by Jan Provaznik's avatar Jan Provaznik

Merge branch 'pl-ruby-kwargs-spec-session-controller' into 'master'

Fix kwargs deprecation warnings in session controller specs

See merge request gitlab-org/gitlab!47911
parents bd4f333b d9ebe0d2
...@@ -7,7 +7,7 @@ RSpec.describe Admin::SessionsController, :do_not_mock_admin_mode do ...@@ -7,7 +7,7 @@ RSpec.describe Admin::SessionsController, :do_not_mock_admin_mode do
describe '#create' do describe '#create' do
context 'when using two-factor authentication' do context 'when using two-factor authentication' do
def authenticate_2fa(user_params, otp_user_id: user.id) def authenticate_2fa(otp_user_id: user.id, **user_params)
post(:create, params: { user: user_params }, session: { otp_user_id: otp_user_id }) post(:create, params: { user: user_params }, session: { otp_user_id: otp_user_id })
end end
......
...@@ -90,7 +90,7 @@ RSpec.describe SessionsController, :geo do ...@@ -90,7 +90,7 @@ RSpec.describe SessionsController, :geo do
end end
context 'when using two-factor authentication' do context 'when using two-factor authentication' do
def authenticate_2fa(user_params, otp_user_id: user.id) def authenticate_2fa(otp_user_id: user.id, **user_params)
post(:create, params: { user: user_params }, session: { otp_user_id: otp_user_id }) post(:create, params: { user: user_params }, session: { otp_user_id: otp_user_id })
end end
......
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