Commit fa8052a4 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Do not show artifacts keep button if not allowed

parent 8ab94120
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
- if @build.artifacts? - if @build.artifacts?
.btn-group.btn-group-justified{ role: :group } .btn-group.btn-group-justified{ role: :group }
- if @build.artifacts_expire_at - if @build.artifacts_expire_at && can?(current_user, :update_build, @build)
= link_to keep_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post do = link_to keep_namespace_project_build_artifacts_path(@project.namespace, @project, @build), class: 'btn btn-sm btn-default', method: :post do
Keep Keep
......
...@@ -3,6 +3,7 @@ require 'tempfile' ...@@ -3,6 +3,7 @@ require 'tempfile'
feature 'Builds', :feature do feature 'Builds', :feature do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:user_access_level) { :developer }
let(:project) { create(:project) } let(:project) { create(:project) }
let(:pipeline) { create(:ci_pipeline, project: project) } let(:pipeline) { create(:ci_pipeline, project: project) }
...@@ -14,7 +15,7 @@ feature 'Builds', :feature do ...@@ -14,7 +15,7 @@ feature 'Builds', :feature do
end end
before do before do
project.team << [user, :developer] project.team << [user, user_access_level]
login_as(user) login_as(user)
end end
...@@ -131,7 +132,9 @@ feature 'Builds', :feature do ...@@ -131,7 +132,9 @@ feature 'Builds', :feature do
context 'Artifacts expire date' do context 'Artifacts expire date' do
before do before do
build.update_attributes(artifacts_file: artifacts_file, artifacts_expire_at: expire_at) build.update_attributes(artifacts_file: artifacts_file,
artifacts_expire_at: expire_at)
visit namespace_project_build_path(project.namespace, project, build) visit namespace_project_build_path(project.namespace, project, build)
end end
...@@ -146,12 +149,23 @@ feature 'Builds', :feature do ...@@ -146,12 +149,23 @@ feature 'Builds', :feature do
context 'when expire date is defined' do context 'when expire date is defined' do
let(:expire_at) { Time.now + 7.days } let(:expire_at) { Time.now + 7.days }
it 'keeps artifacts when Keep button is clicked' do context 'when user has ability to update build' do
expect(page).to have_content 'The artifacts will be removed' it 'keeps artifacts when keep button is clicked' do
click_link 'Keep' expect(page).to have_content 'The artifacts will be removed'
expect(page).not_to have_link 'Keep' click_link 'Keep'
expect(page).not_to have_content 'The artifacts will be removed'
expect(page).not_to have_link 'Keep'
expect(page).not_to have_content 'The artifacts will be removed'
end
end
context 'when user does not have ability to update build' do
let(:user_access_level) { :guest }
it 'does not have keep button' do
expect(page).to have_no_link 'Keep'
end
end end
end end
......
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