summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-07-02 16:33:38 +0200
committerDouwe Maan <douwe@gitlab.com>2015-07-23 15:20:12 +0200
commit70a3c165a9f3882a82cf8946a783ace091635797 (patch)
tree2d09f34639859b2eadf5b648ac42f55b2419ceb2 /features
parent5dd4dea93baa6386ed860a50125dce3ca3890f16 (diff)
downloadgitlab-ce-70a3c165a9f3882a82cf8946a783ace091635797.tar.gz
Allow custom label to be set for authentication providers.auth-icons-labels
Diffstat (limited to 'features')
-rw-r--r--features/steps/admin/users.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/features/steps/admin/users.rb b/features/steps/admin/users.rb
index 6c4b91586d6..49e64eeff71 100644
--- a/features/steps/admin/users.rb
+++ b/features/steps/admin/users.rb
@@ -3,6 +3,14 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps
include SharedPaths
include SharedAdmin
+ before do
+ allow(Devise).to receive(:omniauth_providers).and_return([:twitter, :twitter_updated])
+ end
+
+ after do
+ allow(Devise).to receive(:omniauth_providers).and_call_original
+ end
+
step 'I should see all users' do
User.all.each do |user|
expect(page).to have_content user.name
@@ -121,7 +129,6 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps
end
step 'I visit "Pete" identities page in admin' do
- allow(Gitlab::OAuth::Provider).to receive(:names).and_return(%w(twitter twitter_updated))
visit admin_user_identities_path(@user)
end