diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-09 19:47:31 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-01-17 04:05:01 +0300 |
| commit | 4493ec08806813fec9ccc3a27a5a6f59af9780fd (patch) | |
| tree | d18dfbbe281dd9a5604d291d4b46cc7be951de28 /spec/features/oauth_login_spec.rb | |
| parent | 54636e1d4293a8465a772020a54b6193d7df9878 (diff) | |
Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'
[10.3] Prevent login with disabled OAuth providers
See merge request gitlab/gitlabhq!2296
(cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c)
a0f9d222 Prevents login with disabled OAuth providers
Diffstat (limited to 'spec/features/oauth_login_spec.rb')
| -rw-r--r-- | spec/features/oauth_login_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/features/oauth_login_spec.rb b/spec/features/oauth_login_spec.rb index 49d8e52f861..a5e325ee2e3 100644 --- a/spec/features/oauth_login_spec.rb +++ b/spec/features/oauth_login_spec.rb @@ -10,8 +10,7 @@ feature 'OAuth Login', :js, :allow_forgery_protection do def stub_omniauth_config(provider) OmniAuth.config.add_mock(provider, OmniAuth::AuthHash.new(provider: provider.to_s, uid: "12345")) - set_devise_mapping(context: Rails.application) - Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[provider] + stub_omniauth_provider(provider) end providers = [:github, :twitter, :bitbucket, :gitlab, :google_oauth2, |