Commit f3454b2e authored by Sean McGivern's avatar Sean McGivern

Merge branch 'bvl-subgroup-in-dropdowns' into 'master'

Include child projects a user can manage in namespace dropdowns

Closes #39987

See merge request gitlab-org/gitlab-ce!15294
parents 96764f26 889c25eb
...@@ -4,7 +4,10 @@ module NamespacesHelper ...@@ -4,7 +4,10 @@ module NamespacesHelper
end end
def namespaces_options(selected = :current_user, display_path: false, extra_group: nil) def namespaces_options(selected = :current_user, display_path: false, extra_group: nil)
groups = current_user.owned_groups + current_user.masters_groups groups = current_user.manageable_groups
.joins(:route)
.includes(:route)
.order('routes.path')
users = [current_user.namespace] users = [current_user.namespace]
unless extra_group.nil? || extra_group.is_a?(Group) unless extra_group.nil? || extra_group.is_a?(Group)
......
...@@ -921,7 +921,16 @@ class User < ActiveRecord::Base ...@@ -921,7 +921,16 @@ class User < ActiveRecord::Base
end end
def manageable_namespaces def manageable_namespaces
@manageable_namespaces ||= [namespace] + owned_groups + masters_groups @manageable_namespaces ||= [namespace] + manageable_groups
end
def manageable_groups
union = Gitlab::SQL::Union.new([owned_groups.select(:id),
masters_groups.select(:id)])
arel_union = Arel::Nodes::SqlLiteral.new(union.to_sql)
owned_and_master_groups = Group.where(Group.arel_table[:id].in(arel_union))
Gitlab::GroupHierarchy.new(owned_and_master_groups).base_and_descendants
end end
def namespaces def namespaces
......
---
title: Make sure a user can add projects to subgroups they have access to
merge_request: 15294
author:
type: fixed
...@@ -144,7 +144,10 @@ describe 'Edit Project Settings' do ...@@ -144,7 +144,10 @@ describe 'Edit Project Settings' do
specify 'the project is accessible via the new path' do specify 'the project is accessible via the new path' do
transfer_project(project, group) transfer_project(project, group)
new_path = namespace_project_path(group, project) new_path = namespace_project_path(group, project)
visit new_path visit new_path
wait_for_requests
expect(current_path).to eq(new_path) expect(current_path).to eq(new_path)
expect(find('.breadcrumbs')).to have_content(project.name) expect(find('.breadcrumbs')).to have_content(project.name)
end end
...@@ -153,7 +156,10 @@ describe 'Edit Project Settings' do ...@@ -153,7 +156,10 @@ describe 'Edit Project Settings' do
old_path = project_path(project) old_path = project_path(project)
transfer_project(project, group) transfer_project(project, group)
new_path = namespace_project_path(group, project) new_path = namespace_project_path(group, project)
visit old_path visit old_path
wait_for_requests
expect(current_path).to eq(new_path) expect(current_path).to eq(new_path)
expect(find('.breadcrumbs')).to have_content(project.name) expect(find('.breadcrumbs')).to have_content(project.name)
end end
......
...@@ -6,10 +6,11 @@ feature 'User creates a project', :js do ...@@ -6,10 +6,11 @@ feature 'User creates a project', :js do
before do before do
sign_in(user) sign_in(user)
create(:personal_key, user: user) create(:personal_key, user: user)
visit(new_project_path)
end end
it 'creates a new project' do it 'creates a new project' do
visit(new_project_path)
fill_in(:project_path, with: 'Empty') fill_in(:project_path, with: 'Empty')
page.within('#content-body') do page.within('#content-body') do
...@@ -24,4 +25,32 @@ feature 'User creates a project', :js do ...@@ -24,4 +25,32 @@ feature 'User creates a project', :js do
expect(page).to have_content('git remote') expect(page).to have_content('git remote')
expect(page).to have_content(project.url_to_repo) expect(page).to have_content(project.url_to_repo)
end end
context 'in a subgroup they do not own', :nested_groups do
let(:parent) { create(:group) }
let!(:subgroup) { create(:group, parent: parent) }
before do
parent.add_owner(user)
end
it 'creates a new project' do
visit(new_project_path)
fill_in :project_path, with: 'a-subgroup-project'
page.find('.js-select-namespace').click
page.find("div[role='option']", text: subgroup.full_path).click
page.within('#content-body') do
click_button('Create project')
end
expect(page).to have_content("Project 'a-subgroup-project' was successfully created")
project = Project.last
expect(project.namespace).to eq(subgroup)
end
end
end end
require 'spec_helper'
feature 'User transfers a project', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :repository, namespace: user.namespace) }
before do
sign_in user
end
def transfer_project(project, group)
visit edit_project_path(project)
page.within('.js-project-transfer-form') do
page.find('.select2-container').click
end
page.find("div[role='option']", text: group.full_name).click
click_button('Transfer project')
fill_in 'confirm_name_input', with: project.name
click_button 'Confirm'
wait_for_requests
end
it 'allows transferring a project to a subgroup of a namespace' do
group = create(:group)
group.add_owner(user)
transfer_project(project, group)
expect(project.reload.namespace).to eq(group)
end
context 'when nested groups are available', :nested_groups do
it 'allows transferring a project to a subgroup' do
parent = create(:group)
parent.add_owner(user)
subgroup = create(:group, parent: parent)
transfer_project(project, subgroup)
expect(project.reload.namespace).to eq(subgroup)
end
end
end
...@@ -29,5 +29,30 @@ describe NamespacesHelper do ...@@ -29,5 +29,30 @@ describe NamespacesHelper do
expect(options).not_to include(admin_group.name) expect(options).not_to include(admin_group.name)
expect(options).to include(user_group.name) expect(options).to include(user_group.name)
end end
context 'when nested groups are available', :nested_groups do
it 'includes groups nested in groups the user can administer' do
allow(helper).to receive(:current_user).and_return(user)
child_group = create(:group, :private, parent: user_group)
options = helper.namespaces_options
expect(options).to include(child_group.name)
end
it 'orders the groups correctly' do
allow(helper).to receive(:current_user).and_return(user)
child_group = create(:group, :private, parent: user_group)
other_child = create(:group, :private, parent: user_group)
sub_child = create(:group, :private, parent: child_group)
expect(helper).to receive(:options_for_group)
.with([user_group, child_group, sub_child, other_child], anything)
.and_call_original
allow(helper).to receive(:options_for_group).and_call_original
helper.namespaces_options
end
end
end end
end end
...@@ -642,16 +642,40 @@ describe User do ...@@ -642,16 +642,40 @@ describe User do
end end
describe 'groups' do describe 'groups' do
let(:user) { create(:user) }
let(:group) { create(:group) }
before do before do
@user = create :user group.add_owner(user)
@group = create :group end
@group.add_owner(@user)
it { expect(user.several_namespaces?).to be_truthy }
it { expect(user.authorized_groups).to eq([group]) }
it { expect(user.owned_groups).to eq([group]) }
it { expect(user.namespaces).to contain_exactly(user.namespace, group) }
it { expect(user.manageable_namespaces).to contain_exactly(user.namespace, group) }
context 'with child groups', :nested_groups do
let!(:subgroup) { create(:group, parent: group) }
describe '#manageable_namespaces' do
it 'includes all the namespaces the user can manage' do
expect(user.manageable_namespaces).to contain_exactly(user.namespace, group, subgroup)
end
end
describe '#manageable_groups' do
it 'includes all the namespaces the user can manage' do
expect(user.manageable_groups).to contain_exactly(group, subgroup)
end end
it { expect(@user.several_namespaces?).to be_truthy } it 'does not include duplicates if a membership was added for the subgroup' do
it { expect(@user.authorized_groups).to eq([@group]) } subgroup.add_owner(user)
it { expect(@user.owned_groups).to eq([@group]) }
it { expect(@user.namespaces).to match_array([@user.namespace, @group]) } expect(user.manageable_groups).to contain_exactly(group, subgroup)
end
end
end
end end
describe 'group multiple owners' do describe 'group multiple owners' do
......
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