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
4ee2ae14
Commit
4ee2ae14
authored
Aug 21, 2018
by
Steve Azzopardi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add artifact information for job controller
gitlab-org/gitlab-ce#50101
parent
d79218fc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
77 additions
and
3 deletions
+77
-3
app/serializers/build_details_entity.rb
app/serializers/build_details_entity.rb
+22
-0
changelogs/unreleased/50101-add-artifact-information-to-job-api.yml
.../unreleased/50101-add-artifact-information-to-job-api.yml
+5
-0
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+50
-3
No files found.
app/serializers/build_details_entity.rb
View file @
4ee2ae14
...
@@ -9,6 +9,28 @@ class BuildDetailsEntity < JobEntity
...
@@ -9,6 +9,28 @@ class BuildDetailsEntity < JobEntity
expose
:metadata
,
using:
BuildMetadataEntity
expose
:metadata
,
using:
BuildMetadataEntity
expose
:artifact
,
if:
->
(
*
)
{
can?
(
current_user
,
:read_build
,
build
)
}
do
expose
:download_path
,
if:
->
(
*
)
{
build
.
artifacts?
}
do
|
build
|
download_project_job_artifacts_path
(
project
,
build
)
end
expose
:browse_path
,
if:
->
(
*
)
{
build
.
browsable_artifacts?
}
do
|
build
|
browse_project_job_artifacts_path
(
project
,
build
)
end
expose
:keep_path
,
if:
->
(
*
)
{
build
.
has_expiring_artifacts?
&&
can?
(
current_user
,
:update_build
,
build
)
}
do
|
build
|
keep_project_job_artifacts_path
(
project
,
build
)
end
expose
:expire_at
,
if:
->
(
*
)
{
build
.
artifacts_expire_at
.
present?
}
do
|
build
|
build
.
artifacts_expire_at
end
expose
:expired
,
if:
->
(
*
)
{
build
.
artifacts_expire_at
.
present?
}
do
|
build
|
build
.
artifacts_expired?
end
end
expose
:erased_by
,
if:
->
(
*
)
{
build
.
erased?
},
using:
UserEntity
expose
:erased_by
,
if:
->
(
*
)
{
build
.
erased?
},
using:
UserEntity
expose
:erase_path
,
if:
->
(
*
)
{
build
.
erasable?
&&
can?
(
current_user
,
:erase_build
,
build
)
}
do
|
build
|
expose
:erase_path
,
if:
->
(
*
)
{
build
.
erasable?
&&
can?
(
current_user
,
:erase_build
,
build
)
}
do
|
build
|
erase_project_job_path
(
project
,
build
)
erase_project_job_path
(
project
,
build
)
...
...
changelogs/unreleased/50101-add-artifact-information-to-job-api.yml
0 → 100644
View file @
4ee2ae14
---
title
:
Send artifact information in job API
merge_request
:
50460
author
:
type
:
other
spec/controllers/projects/jobs_controller_spec.rb
View file @
4ee2ae14
...
@@ -135,7 +135,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
...
@@ -135,7 +135,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
end
end
end
end
context
'when requesting JSON'
do
context
'when requesting JSON
with failed job
'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
before
do
...
@@ -150,9 +150,56 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
...
@@ -150,9 +150,56 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
it
'exposes needed information'
do
it
'exposes needed information'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
[
'raw_path'
]).
to
match
(
%r{jobs/
\d
+/raw
\z
}
)
expect
(
json_response
[
'raw_path'
]).
to
match
(
%r{jobs/
\d
+/raw
\z
}
)
expect
(
json_response
[
'merge_request'
][
'path'
]).
to
match
(
%r{merge_requests/
\d
+
\z
}
)
expect
(
json_response
[
'new_issue_path'
]).
to
include
(
'/issues/new'
)
end
end
context
'when request JSON for successful job'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let
(
:job
)
{
create
(
:ci_build
,
:success
,
:artifacts
,
pipeline:
pipeline
)
}
before
do
project
.
add_developer
(
user
)
sign_in
(
user
)
allow_any_instance_of
(
Ci
::
Build
).
to
receive
(
:merge_request
).
and_return
(
merge_request
)
get_show
(
id:
job
.
id
,
format: :json
)
end
it
'exposes needed information'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
[
'artifact'
][
'download_path'
]).
to
match
(
%r{artifacts/download}
)
expect
(
json_response
[
'artifact'
][
'browse_path'
]).
to
match
(
%r{artifacts/browse}
)
expect
(
json_response
[
'artifact'
]).
not_to
have_key
(
:expired
)
expect
(
json_response
[
'artifact'
]).
not_to
have_key
(
:expired_at
)
expect
(
json_response
[
'raw_path'
]).
to
match
(
%r{jobs/
\d
+/raw
\z
}
)
expect
(
json_response
.
dig
(
'merge_request'
,
'path'
)).
to
match
(
%r{merge_requests/
\d
+
\z
}
)
expect
(
json_response
.
dig
(
'merge_request'
,
'path'
)).
to
match
(
%r{merge_requests/
\d
+
\z
}
)
expect
(
json_response
[
'new_issue_path'
])
end
.
to
include
(
'/issues/new'
)
context
'when request JSON for successful job and expired artifacts'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let
(
:job
)
{
create
(
:ci_build
,
:success
,
:artifacts
,
:expired
,
pipeline:
pipeline
)
}
before
do
project
.
add_developer
(
user
)
sign_in
(
user
)
allow_any_instance_of
(
Ci
::
Build
).
to
receive
(
:merge_request
).
and_return
(
merge_request
)
get_show
(
id:
job
.
id
,
format: :json
)
end
it
'exposes needed information'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
[
'artifact'
]).
not_to
have_key
(
:download_path
)
expect
(
json_response
[
'artifact'
]).
not_to
have_key
(
:browse_path
)
expect
(
json_response
[
'artifact'
][
'expired'
]).
to
eq
(
true
)
expect
(
json_response
[
'artifact'
][
'expire_at'
]).
not_to
be_empty
expect
(
json_response
[
'raw_path'
]).
to
match
(
%r{jobs/
\d
+/raw
\z
}
)
expect
(
json_response
.
dig
(
'merge_request'
,
'path'
)).
to
match
(
%r{merge_requests/
\d
+
\z
}
)
end
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