Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4ee2ae14
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
4ee2ae14
编写于
8月 21, 2018
作者:
S
Steve Azzopardi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add artifact information for job controller
gitlab-org/gitlab-ce#50101
上级
d79218fc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
77 addition
and
3 deletion
+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
未找到文件。
app/serializers/build_details_entity.rb
浏览文件 @
4ee2ae14
...
...
@@ -9,6 +9,28 @@ class BuildDetailsEntity < JobEntity
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
:erase_path
,
if:
->
(
*
)
{
build
.
erasable?
&&
can?
(
current_user
,
:erase_build
,
build
)
}
do
|
build
|
erase_project_job_path
(
project
,
build
)
...
...
changelogs/unreleased/50101-add-artifact-information-to-job-api.yml
0 → 100644
浏览文件 @
4ee2ae14
---
title
:
Send artifact information in job API
merge_request
:
50460
author
:
type
:
other
spec/controllers/projects/jobs_controller_spec.rb
浏览文件 @
4ee2ae14
...
...
@@ -135,7 +135,7 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
end
end
context
'when requesting JSON'
do
context
'when requesting JSON
with failed job
'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
...
...
@@ -150,9 +150,56 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
it
'exposes needed information'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
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
[
'new_issue_path'
])
.
to
include
(
'/issues/new'
)
end
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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录