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
Léo-Paul Géneau
gitlab-ce
Commits
26f577df
Commit
26f577df
authored
Sep 05, 2018
by
Steve Azzopardi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add terminal path to job API response
closes #51117
parent
c6d315b4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
48 deletions
+52
-48
app/serializers/build_details_entity.rb
app/serializers/build_details_entity.rb
+8
-0
changelogs/unreleased/51117-send-terminal-path-in-job-api.yml
...gelogs/unreleased/51117-send-terminal-path-in-job-api.yml
+5
-0
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+37
-47
spec/fixtures/api/schemas/job/job_details.json
spec/fixtures/api/schemas/job/job_details.json
+2
-1
No files found.
app/serializers/build_details_entity.rb
View file @
26f577df
...
@@ -36,6 +36,10 @@ class BuildDetailsEntity < JobEntity
...
@@ -36,6 +36,10 @@ class BuildDetailsEntity < JobEntity
erase_project_job_path
(
project
,
build
)
erase_project_job_path
(
project
,
build
)
end
end
expose
:terminal_path
,
if:
->
(
*
)
{
can_create_build_terminal?
}
do
|
build
|
terminal_project_job_path
(
project
,
build
)
end
expose
:merge_request
,
if:
->
(
*
)
{
can?
(
current_user
,
:read_merge_request
,
build
.
merge_request
)
}
do
expose
:merge_request
,
if:
->
(
*
)
{
can?
(
current_user
,
:read_merge_request
,
build
.
merge_request
)
}
do
expose
:iid
do
|
build
|
expose
:iid
do
|
build
|
build
.
merge_request
.
iid
build
.
merge_request
.
iid
...
@@ -69,4 +73,8 @@ class BuildDetailsEntity < JobEntity
...
@@ -69,4 +73,8 @@ class BuildDetailsEntity < JobEntity
def
project
def
project
build
.
project
build
.
project
end
end
def
can_create_build_terminal?
can?
(
current_user
,
:create_build_terminal
,
build
)
&&
build
.
has_terminal?
end
end
end
changelogs/unreleased/51117-send-terminal-path-in-job-api.yml
0 → 100644
View file @
26f577df
---
title
:
Add terminal_path to job API response
merge_request
:
21537
author
:
type
:
other
spec/controllers/projects/jobs_controller_spec.rb
View file @
26f577df
...
@@ -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
with failed job
'
do
context
'when requesting JSON'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
before
do
...
@@ -147,28 +147,20 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
...
@@ -147,28 +147,20 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
get_show
(
id:
job
.
id
,
format: :json
)
get_show
(
id:
job
.
id
,
format: :json
)
end
end
context
'when job failed'
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
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
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
.
dig
(
'merge_request'
,
'path'
)
).
to
match
(
%r{merge_requests/
\d
+
\z
}
)
expect
(
json_response
[
'new_issue_path'
]).
to
include
(
'/issues/new'
)
expect
(
json_response
[
'new_issue_path'
]).
to
include
(
'/issues/new'
)
end
end
end
end
context
'when request JSON for successful job
'
do
context
'when job has artifacts
'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
context
'with not expiry date'
do
let
(
:job
)
{
create
(
:ci_build
,
:success
,
:artifacts
,
pipeline:
pipeline
)
}
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
it
'exposes needed information'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
...
@@ -176,23 +168,12 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
...
@@ -176,23 +168,12 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
expect
(
json_response
[
'artifact'
][
'browse_path'
]).
to
match
(
%r{artifacts/browse}
)
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
)
expect
(
json_response
[
'artifact'
]).
not_to
have_key
(
:expired_at
)
expect
(
json_response
[
'artifact'
]).
not_to
have_key
(
:expired_at
)
expect
(
json_response
[
'raw_path'
]).
to
match
(
%r{jobs/
\d
+/raw
\z
}
)
end
expect
(
json_response
.
dig
(
'merge_request'
,
'path'
)).
to
match
(
%r{merge_requests/
\d
+
\z
}
)
end
end
context
'when request JSON for successful job with expired artifacts'
do
context
'with expiry date'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let
(
:job
)
{
create
(
:ci_build
,
:success
,
:artifacts
,
:expired
,
pipeline:
pipeline
)
}
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
it
'exposes needed information'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
...
@@ -200,8 +181,17 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
...
@@ -200,8 +181,17 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
expect
(
json_response
[
'artifact'
]).
not_to
have_key
(
:browse_path
)
expect
(
json_response
[
'artifact'
]).
not_to
have_key
(
:browse_path
)
expect
(
json_response
[
'artifact'
][
'expired'
]).
to
eq
(
true
)
expect
(
json_response
[
'artifact'
][
'expired'
]).
to
eq
(
true
)
expect
(
json_response
[
'artifact'
][
'expire_at'
]).
not_to
be_empty
expect
(
json_response
[
'artifact'
][
'expire_at'
]).
not_to
be_empty
expect
(
json_response
[
'raw_path'
]).
to
match
(
%r{jobs/
\d
+/raw
\z
}
)
end
expect
(
json_response
.
dig
(
'merge_request'
,
'path'
)).
to
match
(
%r{merge_requests/
\d
+
\z
}
)
end
end
context
'when job has terminal'
do
let
(
:job
)
{
create
(
:ci_build
,
:running
,
:with_runner_session
,
pipeline:
pipeline
)
}
it
'exposes the terminal path'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
json_response
[
'terminal_path'
]).
to
match
(
%r{/terminal}
)
end
end
end
end
end
end
...
...
spec/fixtures/api/schemas/job/job_details.json
View file @
26f577df
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
"allOf"
:
[{
"$ref"
:
"job.json"
}],
"allOf"
:
[{
"$ref"
:
"job.json"
}],
"description"
:
"An extension of job.json with more detailed information"
,
"description"
:
"An extension of job.json with more detailed information"
,
"properties"
:
{
"properties"
:
{
"artifact"
:
{
"$ref"
:
"artifact.json"
}
"artifact"
:
{
"$ref"
:
"artifact.json"
},
"terminal_path"
:
{
"type"
:
"string"
}
}
}
}
}
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