Revert Rails.application.env_config after using mock_auth_hash
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
be15592a1c
commit
a16d7e414d
|
@ -9,10 +9,14 @@ describe OmniauthCallbacksController, type: :controller do
|
|||
let(:user) { create(:omniauth_user, extern_uid: extern_uid, provider: provider) }
|
||||
|
||||
before do
|
||||
mock_auth_hash(provider.to_s, +extern_uid, user.email)
|
||||
@original_env_config_omniauth_auth = mock_auth_hash(provider.to_s, +extern_uid, user.email)
|
||||
stub_omniauth_provider(provider, context: request)
|
||||
end
|
||||
|
||||
after do
|
||||
Rails.application.env_config['omniauth.auth'] = @original_env_config_omniauth_auth
|
||||
end
|
||||
|
||||
context 'when the user is on the last sign in attempt' do
|
||||
let(:extern_uid) { 'my-uid' }
|
||||
|
||||
|
|
|
@ -25,9 +25,13 @@ shared_context 'Ldap::OmniauthCallbacksController' do
|
|||
described_class.define_providers!
|
||||
Rails.application.reload_routes!
|
||||
|
||||
mock_auth_hash(provider.to_s, uid, user.email)
|
||||
@original_env_config_omniauth_auth = mock_auth_hash(provider.to_s, uid, user.email)
|
||||
stub_omniauth_provider(provider, context: request)
|
||||
|
||||
allow(Gitlab::Auth::LDAP::Access).to receive(:allowed?).and_return(valid_login?)
|
||||
end
|
||||
|
||||
after do
|
||||
Rails.application.env_config['omniauth.auth'] = @original_env_config_omniauth_auth
|
||||
end
|
||||
end
|
||||
|
|
|
@ -118,7 +118,10 @@ module LoginHelpers
|
|||
response_object: response_object
|
||||
}
|
||||
})
|
||||
original_env_config_omniauth_auth = Rails.application.env_config['omniauth.auth']
|
||||
Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[provider.to_sym]
|
||||
|
||||
original_env_config_omniauth_auth
|
||||
end
|
||||
|
||||
def saml_xml(raw_saml_response)
|
||||
|
|
Loading…
Reference in New Issue