Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0599a25f
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
0599a25f
编写于
9月 27, 2018
作者:
S
Steve Azzopardi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add has_trace to Projects::JobController#show.json
closes
https://gitlab.com/gitlab-org/gitlab-ce/issues/51925
上级
c052f5a9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
1 deletion
+27
-1
app/serializers/build_details_entity.rb
app/serializers/build_details_entity.rb
+1
-0
changelogs/unreleased/51925-expose-has_trace-in-job-api.yml
changelogs/unreleased/51925-expose-has_trace-in-job-api.yml
+5
-0
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+16
-0
spec/fixtures/api/schemas/job/job_details.json
spec/fixtures/api/schemas/job/job_details.json
+5
-1
未找到文件。
app/serializers/build_details_entity.rb
浏览文件 @
0599a25f
...
...
@@ -7,6 +7,7 @@ class BuildDetailsEntity < JobEntity
expose
:coverage
,
:erased_at
,
:duration
expose
:tag_list
,
as: :tags
expose
:has_trace?
,
as: :has_trace
expose
:user
,
using:
UserEntity
expose
:runner
,
using:
RunnerEntity
expose
:pipeline
,
using:
PipelineEntity
...
...
changelogs/unreleased/51925-expose-has_trace-in-job-api.yml
0 → 100644
浏览文件 @
0599a25f
---
title
:
Expose has_trace in job API
merge_request
:
21950
author
:
type
:
other
spec/controllers/projects/jobs_controller_spec.rb
浏览文件 @
0599a25f
...
...
@@ -337,6 +337,22 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
end
end
end
context
'when no trace is available'
do
it
'has_trace is false'
do
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
json_response
[
'has_trace'
]).
to
be
false
end
end
context
'when job has trace'
do
let
(
:job
)
{
create
(
:ci_build
,
:running
,
:trace_live
,
pipeline:
pipeline
)
}
it
"has_trace is true"
do
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
json_response
[
'has_trace'
]).
to
be
true
end
end
end
context
'when requesting JSON job is triggered'
do
...
...
spec/fixtures/api/schemas/job/job_details.json
浏览文件 @
0599a25f
...
...
@@ -3,12 +3,16 @@
{
"$ref"
:
"job.json"
}
],
"description"
:
"An extension of job.json with more detailed information"
,
"required"
:
[
"has_trace"
],
"properties"
:
{
"artifact"
:
{
"$ref"
:
"artifact.json"
},
"terminal_path"
:
{
"type"
:
"string"
},
"trigger"
:
{
"$ref"
:
"trigger.json"
},
"deployment_status"
:
{
"$ref"
:
"deployment_status.json"
},
"runner"
:
{
"$ref"
:
"runner.json"
},
"runners"
:
{
"type"
:
"runners.json"
}
"runners"
:
{
"type"
:
"runners.json"
},
"has_trace"
:
{
"type"
:
"boolean"
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录