Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
34243489
Commit
34243489
authored
Apr 04, 2019
by
drew cimino
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't render artifact download links on the project tags page for builds with expired artifacts
parent
de44f3e1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
54 additions
and
12 deletions
+54
-12
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-1
changelogs/unreleased/downloading-expired-artifacts.yml
changelogs/unreleased/downloading-expired-artifacts.yml
+5
-0
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+8
-7
spec/views/projects/tags/index.html.haml_spec.rb
spec/views/projects/tags/index.html.haml_spec.rb
+40
-4
No files found.
app/models/ci/pipeline.rb
View file @
34243489
...
@@ -686,7 +686,7 @@ module Ci
...
@@ -686,7 +686,7 @@ module Ci
# We purposely cast the builds to an Array here. Because we always use the
# We purposely cast the builds to an Array here. Because we always use the
# rows if there are more than 0 this prevents us from having to run two
# rows if there are more than 0 this prevents us from having to run two
# queries: one to get the count and one to get the rows.
# queries: one to get the count and one to get the rows.
@latest_builds_with_artifacts
||=
builds
.
latest
.
with_artifacts_
archive
.
to_a
@latest_builds_with_artifacts
||=
builds
.
latest
.
with_artifacts_
not_expired
.
to_a
end
end
def
has_test_reports?
def
has_test_reports?
...
...
changelogs/unreleased/downloading-expired-artifacts.yml
0 → 100644
View file @
34243489
---
title
:
stop rendering download links for expired artifacts on the project tags page
merge_request
:
26753
author
:
Drew Cimino
type
:
fixed
spec/models/ci/pipeline_spec.rb
View file @
34243489
...
@@ -2705,18 +2705,19 @@ describe Ci::Pipeline, :mailer do
...
@@ -2705,18 +2705,19 @@ describe Ci::Pipeline, :mailer do
end
end
describe
'#latest_builds_with_artifacts'
do
describe
'#latest_builds_with_artifacts'
do
let!
(
:pipeline
)
{
create
(
:ci_pipeline
,
:success
)
}
let!
(
:fresh_build
)
{
create
(
:ci_build
,
:success
,
:artifacts
,
pipeline:
pipeline
)
}
let!
(
:stale_build
)
{
create
(
:ci_build
,
:success
,
:expired
,
:artifacts
,
pipeline:
pipeline
)
}
let!
(
:build
)
do
create
(
:ci_build
,
:success
,
:artifacts
,
pipeline:
pipeline
)
end
it
'returns an Array'
do
it
'returns an Array'
do
expect
(
pipeline
.
latest_builds_with_artifacts
).
to
be_an_instance_of
(
Array
)
expect
(
pipeline
.
latest_builds_with_artifacts
).
to
be_an_instance_of
(
Array
)
end
end
it
'returns the latest builds'
do
it
'returns the latest builds with non-expired artifacts'
do
expect
(
pipeline
.
latest_builds_with_artifacts
).
to
eq
([
build
])
expect
(
pipeline
.
latest_builds_with_artifacts
).
to
contain_exactly
(
fresh_build
)
end
it
'does not return builds with expired artifacts'
do
expect
(
pipeline
.
latest_builds_with_artifacts
).
not_to
include
(
stale_build
)
end
end
it
'memoizes the returned relation'
do
it
'memoizes the returned relation'
do
...
...
spec/views/projects/tags/index.html.haml_spec.rb
View file @
34243489
require
'spec_helper'
require
'spec_helper'
describe
'projects/tags/index'
do
describe
'projects/tags/index'
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:tags
)
{
TagsFinder
.
new
(
project
.
repository
,
{}).
execute
}
let
(
:git_tag
)
{
project
.
repository
.
tags
.
last
}
let
(
:release
)
{
create
(
:release
,
project:
project
,
sha:
git_tag
.
target_commit
.
sha
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
:success
,
project:
project
,
ref:
git_tag
.
name
,
sha:
release
.
sha
)
}
let
(
:artifacts_download_header_regex
)
{
%r(<li class="dropdown-bold-header">Download artifacts<
\/
li>)
}
let
(
:artifacts_download_link_selector
)
{
'a[href="'
+
latest_succeeded_project_artifacts_path
(
project
,
"
#{
pipeline
.
ref
}
/download"
,
job:
'test'
)
+
'"]'
}
before
do
before
do
assign
(
:project
,
project
)
assign
(
:project
,
project
)
assign
(
:repository
,
project
.
repository
)
assign
(
:repository
,
project
.
repository
)
assign
(
:tags
,
[])
assign
(
:releases
,
project
.
releases
)
assign
(
:tags
,
Kaminari
.
paginate_array
(
tags
).
page
(
0
))
assign
(
:tags_pipelines
,
{
git_tag
.
name
=>
pipeline
})
allow
(
view
).
to
receive
(
:current_ref
).
and_return
(
'master'
)
allow
(
view
).
to
receive
(
:current_ref
).
and_return
(
'master'
)
allow
(
view
).
to
receive
(
:c
an?
).
and_return
(
false
)
allow
(
view
).
to
receive
(
:c
urrent_user
).
and_return
(
project
.
namespace
.
owner
)
end
end
it
'defaults sort dropdown toggle to last updated'
do
it
'defaults sort dropdown toggle to last updated'
do
render
render
expect
(
rendered
).
to
have_button
(
'Last updated'
)
expect
(
rendered
).
to
have_button
(
'Last updated'
)
end
end
context
'when the most recent build for a tag has artifacts'
do
let!
(
:build
)
{
create
(
:ci_build
,
:success
,
:artifacts
,
pipeline:
pipeline
)
}
it
'renders the Artifacts section in the download list'
do
render
expect
(
rendered
).
to
match
(
artifacts_download_header_regex
)
end
it
'renders artifact download links'
do
render
expect
(
rendered
).
to
have_selector
(
artifacts_download_link_selector
)
end
end
context
'when the most recent build for a tag has expired artifacts'
do
let!
(
:build
)
{
create
(
:ci_build
,
:success
,
:expired
,
:artifacts
,
pipeline:
pipeline
)
}
it
'does not render the Artifacts section in the download list'
do
render
expect
(
rendered
).
not_to
match
(
artifacts_download_header_regex
)
end
it
'renders artifact download links'
do
render
expect
(
rendered
).
not_to
have_selector
(
artifacts_download_link_selector
)
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment