summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-04-09 10:21:01 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2018-04-09 10:21:01 +0000
commitf22df3e9c1c590874cea8d50ab10f28467baaf18 (patch)
tree3c1342b3339099dd71c4ef3323ff52d15c784f7f /spec
parent52440755dfe483b3c047856c91cece12fef114f0 (diff)
parentf45b8888fc1a2694b8e2da64512137ab54a09a66 (diff)
downloadgitlab-ce-f22df3e9c1c590874cea8d50ab10f28467baaf18.tar.gz
Merge branch '41981-allow-group-owner-to-enable-runners-from-subgroups' into 'master'
Resolve "Group owner cannot enable/disable specific-runners which was registered in a project under a subgroup" Closes #41981 See merge request gitlab-org/gitlab-ce!18009
Diffstat (limited to 'spec')
-rw-r--r--spec/models/user_spec.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 73266c0085f..35db7616efb 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1850,6 +1850,21 @@ describe User do
it_behaves_like :member
end
+
+ context 'with subgroup with different owner for project runner', :nested_groups do
+ let(:group) { create(:group) }
+ let(:another_user) { create(:user) }
+ let(:subgroup) { create(:group, parent: group) }
+ let(:project) { create(:project, group: subgroup) }
+
+ def add_user(access)
+ group.add_user(user, access)
+ group.add_user(another_user, :owner)
+ subgroup.add_user(another_user, :owner)
+ end
+
+ it_behaves_like :member
+ end
end
describe '#projects_with_reporter_access_limited_to' do