Merge branch 'fix-500-admin-user-page' into 'master'

Fix 500 admin user page

See merge request !1147

2 files changed, 25 insertions, 0 deletions

diff --git a/features/admin/users.feature b/features/admin/users.feature
index d8c1288e5f0..278f6a43e94 100644
--- a/features/admin/users.feature
+++ b/features/admin/users.feature
@@ -16,6 +16,12 @@ Feature: Admin Users
     Then See username error message
     And Not changed form action url
 
+  Scenario: Show user attributes
+    Given user "Mike" with groups and projects
+    Given I visit admin users page
+    And click on "Mike" link
+    Then I should see user "Mike" details
+
   Scenario: Edit my user attributes
     Given I visit admin users page
     And click edit on my user
diff --git a/features/steps/admin/users.rb b/features/steps/admin/users.rb
index 3422dc2b5af..546c1bf2a12 100644
--- a/features/steps/admin/users.rb
+++ b/features/steps/admin/users.rb
@@ -63,4 +63,23 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps
   step 'I should not see secondary email anymore' do
     page.should_not have_content "Secondary email:"
   end
+
+  step 'user "Mike" with groups and projects' do
+    user = create(:user, name: 'Mike')
+
+    project = create(:empty_project)
+    project.team << [user, :developer]
+
+    group = create(:group)
+    group.add_user(user, Gitlab::Access::DEVELOPER)
+  end
+
+  step 'click on "Mike" link' do
+    click_link "Mike"
+  end
+
+  step 'I should see user "Mike" details' do
+    page.should have_content 'Account'
+    page.should have_content 'Personal projects limit'
+  end
 end