Commit 1a09a805 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Fix 500 admin user page

See merge request !1147
parents 71fce0b2 92967889
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
.pull-right .pull-right
%span.light= user_group.human_access %span.light= user_group.human_access
- unless user_group.owner? - unless user_group.owner?
= link_to group_users_group_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do = link_to group_group_member_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
%i.icon-remove.icon-white %i.icon-remove.icon-white
- else - else
.nothing-here-block This user has no groups. .nothing-here-block This user has no groups.
......
...@@ -16,6 +16,12 @@ Feature: Admin Users ...@@ -16,6 +16,12 @@ Feature: Admin Users
Then See username error message Then See username error message
And Not changed form action url 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 Scenario: Edit my user attributes
Given I visit admin users page Given I visit admin users page
And click edit on my user And click edit on my user
......
...@@ -63,4 +63,23 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps ...@@ -63,4 +63,23 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps
step 'I should not see secondary email anymore' do step 'I should not see secondary email anymore' do
page.should_not have_content "Secondary email:" page.should_not have_content "Secondary email:"
end 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 end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment