Commit aa23cea5 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'vi_fix_kwarg_deprecation_warnings' into 'master'

Fix kwargs deprecation warnings

See merge request gitlab-org/gitlab!48770
parents d66db372 438b38dc
...@@ -367,8 +367,8 @@ RSpec.describe OmniauthCallbacksController, type: :controller do ...@@ -367,8 +367,8 @@ RSpec.describe OmniauthCallbacksController, type: :controller do
before do before do
stub_last_request_id(last_request_id) stub_last_request_id(last_request_id)
stub_omniauth_saml_config({ enabled: true, auto_link_saml_user: true, allow_single_sign_on: ['saml'], stub_omniauth_saml_config(enabled: true, auto_link_saml_user: true, allow_single_sign_on: ['saml'],
providers: [saml_config] }) providers: [saml_config])
mock_auth_hash_with_saml_xml('saml', +'my-uid', user.email, mock_saml_response) mock_auth_hash_with_saml_xml('saml', +'my-uid', user.email, mock_saml_response)
request.env['devise.mapping'] = Devise.mappings[:user] request.env['devise.mapping'] = Devise.mappings[:user]
request.env['omniauth.auth'] = Rails.application.env_config['omniauth.auth'] request.env['omniauth.auth'] = Rails.application.env_config['omniauth.auth']
......
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