diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 12:49:39 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 12:49:42 +0000 |
commit | 82f3c4a359b35411a1062ac4de2b2d615b51462a (patch) | |
tree | 8475f51cbab6299e0051b0f0cf6008bea077aa3f /spec/views | |
parent | caefca87e40245c414f984c85f49109358b78118 (diff) | |
download | gitlab-ce-82f3c4a359b35411a1062ac4de2b2d615b51462a.tar.gz |
Merge branch 'security-11-7-test-permissions' into 'security-11-7'
[11.7] Pipelines section is available to unauthorized users
See merge request gitlab/gitlabhq!2804
(cherry picked from commit 2bf899ed3a5306bb934507dc0584fd3d26f490bc)
627c00da Backport security fix
4c369519 Add CHANGELOG entry
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/projects/commit/_commit_box.html.haml_spec.rb | 6 | ||||
-rw-r--r-- | spec/views/projects/issues/_related_branches.html.haml_spec.rb | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/spec/views/projects/commit/_commit_box.html.haml_spec.rb b/spec/views/projects/commit/_commit_box.html.haml_spec.rb index 2fdd28a3be4..1086546c10d 100644 --- a/spec/views/projects/commit/_commit_box.html.haml_spec.rb +++ b/spec/views/projects/commit/_commit_box.html.haml_spec.rb @@ -9,6 +9,7 @@ describe 'projects/commit/_commit_box.html.haml' do assign(:commit, project.commit) allow(view).to receive(:current_user).and_return(user) allow(view).to receive(:can_collaborate_with_project?).and_return(false) + project.add_developer(user) end it 'shows the commit SHA' do @@ -48,7 +49,6 @@ describe 'projects/commit/_commit_box.html.haml' do context 'viewing a commit' do context 'as a developer' do before do - project.add_developer(user) allow(view).to receive(:can_collaborate_with_project?).and_return(true) end @@ -60,6 +60,10 @@ describe 'projects/commit/_commit_box.html.haml' do end context 'as a non-developer' do + before do + project.add_guest(user) + end + it 'does not have a link to create a new tag' do render diff --git a/spec/views/projects/issues/_related_branches.html.haml_spec.rb b/spec/views/projects/issues/_related_branches.html.haml_spec.rb index 8c845251765..5cff7694029 100644 --- a/spec/views/projects/issues/_related_branches.html.haml_spec.rb +++ b/spec/views/projects/issues/_related_branches.html.haml_spec.rb @@ -3,6 +3,7 @@ require 'spec_helper' describe 'projects/issues/_related_branches' do include Devise::Test::ControllerHelpers + let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:branch) { project.repository.find_branch('feature') } let!(:pipeline) { create(:ci_pipeline, project: project, sha: branch.dereferenced_target.id, ref: 'feature') } @@ -11,6 +12,9 @@ describe 'projects/issues/_related_branches' do assign(:project, project) assign(:related_branches, ['feature']) + project.add_developer(user) + allow(view).to receive(:current_user).and_return(user) + render end |