diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-10 10:13:21 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-10 10:13:21 +0000 |
| commit | 32208c501a74515b583e77794dab8ae5028d3f1a (patch) | |
| tree | 37b015b73d59623140411fe2f9a15b670febccbb | |
| parent | af3b6f6362d34077d100385b71f9fe2a0ce8a446 (diff) | |
| parent | 253bc0ca15a9b2f459aef94a33de926984747f35 (diff) | |
| download | gitlab-ce-32208c501a74515b583e77794dab8ae5028d3f1a.tar.gz | |
Merge branch 'fix-semaphore-twitter-identity-issue' into 'master'
Update OmniAuth test to pass in Semaphore
This has caused all the build failures on GitHub master for the last few days. This change seems to pass Semaphore build on GitHub:
https://semaphoreci.com/stanhu/gitlabhq/branches/fix-semaphore-twitter-identity-issue-try2
Closes #2469
See merge request !1272
| -rw-r--r-- | features/steps/admin/users.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/features/steps/admin/users.rb b/features/steps/admin/users.rb index 2e17d5c4c2e..4bc290b6bdf 100644 --- a/features/steps/admin/users.rb +++ b/features/steps/admin/users.rb @@ -4,11 +4,13 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps include SharedAdmin before do - allow(Devise).to receive(:omniauth_providers).and_return([:twitter, :twitter_updated]) + allow(Gitlab::OAuth::Provider).to receive(:providers).and_return([:twitter, :twitter_updated]) + allow_any_instance_of(ApplicationHelper).to receive(:user_omniauth_authorize_path).and_return(root_path) end after do - allow(Devise).to receive(:omniauth_providers).and_call_original + allow(Gitlab::OAuth::Provider).to receive(:providers).and_call_original + allow_any_instance_of(ApplicationHelper).to receive(:user_omniauth_authorize_path).and_call_original end step 'I should see all users' do |