summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Gregory <james.gregory@epigenesys.org.uk>2016-11-28 17:14:05 +0000
committerJames Gregory <james.gregory@epigenesys.org.uk>2016-12-02 15:18:47 +0000
commit454e963196fdbded9ef8c530b0457a8c489e810d (patch)
tree872f7b7d408e4230e562ec3e3db4ecbd2951cb7e
parenta1556200421f8e55fe1999a004694831553321dc (diff)
downloadgitlab-ce-454e963196fdbded9ef8c530b0457a8c489e810d.tar.gz
The admin user projects view now has a clickable group link
-rw-r--r--app/views/admin/users/projects.html.haml2
-rw-r--r--changelogs/unreleased/feature-admin-user-groups-link.yml4
-rw-r--r--spec/features/admin/admin_users_spec.rb28
3 files changed, 33 insertions, 1 deletions
diff --git a/app/views/admin/users/projects.html.haml b/app/views/admin/users/projects.html.haml
index 84b9ceb23b3..dd6b7303493 100644
--- a/app/views/admin/users/projects.html.haml
+++ b/app/views/admin/users/projects.html.haml
@@ -7,7 +7,7 @@
%ul.well-list
- @user.groups.each do |group|
%li
- %strong= group.name
+ %strong= link_to group.name, admin_group_path(group)
&ndash; access to
#{pluralize(group.projects.count, 'project')}
diff --git a/changelogs/unreleased/feature-admin-user-groups-link.yml b/changelogs/unreleased/feature-admin-user-groups-link.yml
new file mode 100644
index 00000000000..b89c08f82d7
--- /dev/null
+++ b/changelogs/unreleased/feature-admin-user-groups-link.yml
@@ -0,0 +1,4 @@
+---
+title: The admin user projects view now has a clickable group link
+merge_request: 7620
+author: James Gregory
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index cb3191dfdde..e31325ce47b 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -225,4 +225,32 @@ describe "Admin::Users", feature: true do
end
end
end
+
+ describe "GET /admin/users/:id/projects" do
+ before do
+ @group = create(:group)
+ @project = create(:project, group: @group)
+ @simple_user = create(:user)
+ @group.add_developer(@simple_user)
+
+ visit projects_admin_user_path(@simple_user)
+ end
+
+ it "lists group projects" do
+ within(:css, '.append-bottom-default + .panel') do
+ expect(page).to have_content 'Group projects'
+ expect(page).to have_link @group.name, admin_group_path(@group)
+ end
+ end
+
+ it 'allows navigation to the group details' do
+ within(:css, '.append-bottom-default + .panel') do
+ click_link @group.name
+ end
+ within(:css, 'h3.page-title') do
+ expect(page).to have_content "Group: #{@group.name}"
+ end
+ expect(page).to have_content @project.name
+ end
+ end
end