Commit fbc1a06c authored by Sean McGivern's avatar Sean McGivern

Merge branch 'fix/keep-artifacts-button-visibility' into 'master'

Do not show artifacts keep button if not allowed

Closes #26357

See merge request !8501
parents e324ccc2 4657c287
...@@ -507,6 +507,10 @@ module Ci ...@@ -507,6 +507,10 @@ module Ci
end end
end end
def has_expiring_artifacts?
artifacts_expire_at.present?
end
def keep_artifacts! def keep_artifacts!
self.update(artifacts_expire_at: nil) self.update(artifacts_expire_at: nil)
end end
......
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
%p.build-detail-row %p.build-detail-row
The artifacts were removed The artifacts were removed
#{time_ago_with_tooltip(@build.artifacts_expire_at)} #{time_ago_with_tooltip(@build.artifacts_expire_at)}
- elsif @build.artifacts_expire_at - elsif @build.has_expiring_artifacts?
%p.build-detail-row %p.build-detail-row
The artifacts will be removed in The artifacts will be removed in
%span.js-artifacts-remove= @build.artifacts_expire_at %span.js-artifacts-remove= @build.artifacts_expire_at
- 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.has_expiring_artifacts? && 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
......
---
title: Hide build artifacts keep button if operation is not allowed
merge_request: 8501
author:
...@@ -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).to have_no_link 'Keep'
expect(page).to have_no_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
......
...@@ -1013,6 +1013,24 @@ describe Ci::Build, :models do ...@@ -1013,6 +1013,24 @@ describe Ci::Build, :models do
end end
end end
describe '#has_expiring_artifacts?' do
context 'when artifacts have expiration date set' do
before { build.update(artifacts_expire_at: 1.day.from_now) }
it 'has expiring artifacts' do
expect(build).to have_expiring_artifacts
end
end
context 'when artifacts do not have expiration date set' do
before { build.update(artifacts_expire_at: nil) }
it 'does not have expiring artifacts' do
expect(build).not_to have_expiring_artifacts
end
end
end
describe '#has_trace_file?' do describe '#has_trace_file?' do
context 'when there is no trace' do context 'when there is no trace' do
it { expect(build.has_trace_file?).to be_falsey } it { expect(build.has_trace_file?).to be_falsey }
......
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