diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-08 14:16:24 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-08 14:16:24 +0000 |
commit | 1bc80c2587323b9107ec3fb2fe6024d7e7817e35 (patch) | |
tree | 613b86c72c3896e7178ced893ac9c3074156b54a /spec | |
parent | ba564a09d73dce3a6696dfeb55e78648ae23e627 (diff) | |
parent | 737d194c0826beb7783c34e982cea673e3f6a61a (diff) | |
download | gitlab-ce-1bc80c2587323b9107ec3fb2fe6024d7e7817e35.tar.gz |
Merge branch 'allow-reporters-to-promote-group-labels' into 'master'
Allow group reporters to promote labels
See merge request !12006
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/labels_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb index 130b0b744b5..bf1776eb320 100644 --- a/spec/controllers/projects/labels_controller_spec.rb +++ b/spec/controllers/projects/labels_controller_spec.rb @@ -117,7 +117,7 @@ describe Projects::LabelsController do let!(:promoted_label_name) { "Promoted Label" } let!(:label_1) { create(:label, title: promoted_label_name, project: project) } - context 'not group owner' do + context 'not group reporters' do it 'denies access' do post :promote, namespace_id: project.namespace.to_param, project_id: project, id: label_1.to_param @@ -125,9 +125,9 @@ describe Projects::LabelsController do end end - context 'group owner' do + context 'group reporter' do before do - GroupMember.add_users(group, [user], :owner) + group.add_reporter(user) end it 'gives access' do |