diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-23 23:42:09 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-23 23:42:09 +0300 |
| commit | c4716d429d9f91c51e8d733a051872d8b6a26ea3 (patch) | |
| tree | 761303c255010e3c39d9f7f053e609abdb5effd9 /spec/support/controllers/ldap_omniauth_callbacks_controller_shared_context.rb | |
| parent | 6a0e9a91cf2261bc76419be3b450f7be79cca75b (diff) | |
| parent | a16d7e414d04ccf3268be9cab2fdff15b2ecb45e (diff) | |
Merge branch 'ce-11278-fix-flaky-order-dependent-specs' into 'master'
Revert Rails.application.env_config after using mock_auth_hash
See merge request gitlab-org/gitlab-ce!27596
Diffstat (limited to 'spec/support/controllers/ldap_omniauth_callbacks_controller_shared_context.rb')
| -rw-r--r-- | spec/support/controllers/ldap_omniauth_callbacks_controller_shared_context.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/support/controllers/ldap_omniauth_callbacks_controller_shared_context.rb b/spec/support/controllers/ldap_omniauth_callbacks_controller_shared_context.rb index 72912ffb89d..a0c77eecb61 100644 --- a/spec/support/controllers/ldap_omniauth_callbacks_controller_shared_context.rb +++ b/spec/support/controllers/ldap_omniauth_callbacks_controller_shared_context.rb @@ -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 |