diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-01 20:47:01 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-01 20:47:01 +0300 |
| commit | 11d275e24a49a5ae2c844b099cfddc7054178830 (patch) | |
| tree | c378fb9dc9d6d5793870506c34915b9aa789a589 /spec/features | |
| parent | 008120f8db90dcf65fdd00343a4d8a22695abed1 (diff) | |
| parent | 1ad5df49b1925f1865e99c3fd8576a762aea9cae (diff) | |
Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'
Moved o_auth/saml/ldap modules under gitlab/auth
See merge request gitlab-org/gitlab-ce!17359
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index 2307ba5985e..8f0a3611052 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -382,7 +382,7 @@ describe "Admin::Users" do describe 'update user identities' do before do - allow(Gitlab::OAuth::Provider).to receive(:providers).and_return([:twitter, :twitter_updated]) + allow(Gitlab::Auth::OAuth::Provider).to receive(:providers).and_return([:twitter, :twitter_updated]) end it 'modifies twitter identity' do |