diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-28 14:29:00 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-28 14:29:00 +0000 |
commit | 54f6357ba3d7f31bdb0009a041e48c3a6be8e2ff (patch) | |
tree | 39ce2d233a1266118325a3220f88db33aceeec88 /spec | |
parent | 8a52257d2e08f255608b783254fc8fd708f89e9e (diff) | |
parent | 68faad16bd4bf81ccd1e279bc487fd02818b05d6 (diff) | |
download | gitlab-ce-54f6357ba3d7f31bdb0009a041e48c3a6be8e2ff.tar.gz |
Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master'
Don't allow a project to be shared with an ancestor of the group it is in
Closes #28788
See merge request !9566
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/project_group_link_spec.rb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/spec/models/project_group_link_spec.rb b/spec/models/project_group_link_spec.rb index 59a4ae1b799..9b711bfc007 100644 --- a/spec/models/project_group_link_spec.rb +++ b/spec/models/project_group_link_spec.rb @@ -7,12 +7,27 @@ describe ProjectGroupLink do end describe "Validation" do - let!(:project_group_link) { create(:project_group_link) } + let(:parent_group) { create(:group) } + let(:group) { create(:group, parent: parent_group) } + let(:project) { create(:project, group: group) } + let!(:project_group_link) { create(:project_group_link, project: project) } it { should validate_presence_of(:project_id) } it { should validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) } it { should validate_presence_of(:group) } it { should validate_presence_of(:group_access) } + + it "doesn't allow a project to be shared with the group it is in" do + project_group_link.group = group + + expect(project_group_link).not_to be_valid + end + + it "doesn't allow a project to be shared with an ancestor of the group it is in" do + project_group_link.group = parent_group + + expect(project_group_link).not_to be_valid + end end describe "destroying a record", truncate: true do |