Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b2465182
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,发现更多精彩内容 >>
提交
b2465182
编写于
6月 01, 2017
作者:
Z
Z.J. van de Weg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add user to BuildDetailsEntity
Also add minor changed needed to pass review
上级
6c872396
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
9 deletion
+18
-9
app/serializers/build_details_entity.rb
app/serializers/build_details_entity.rb
+7
-3
app/serializers/build_entity.rb
app/serializers/build_entity.rb
+4
-2
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+2
-1
spec/serializers/build_details_entity_spec.rb
spec/serializers/build_details_entity_spec.rb
+2
-1
spec/serializers/build_entity_spec.rb
spec/serializers/build_entity_spec.rb
+3
-2
未找到文件。
app/serializers/build_details_entity.rb
浏览文件 @
b2465182
...
...
@@ -2,6 +2,8 @@ class BuildDetailsEntity < BuildEntity
expose
:coverage
,
:erased_at
,
:duration
expose
:tag_list
,
as: :tags
expose
:user
,
using:
UserEntity
expose
:erased_by
,
if:
->
(
*
)
{
build
.
erased?
},
using:
UserEntity
expose
:erase_path
,
if:
->
(
*
)
{
build
.
erasable?
&&
can?
(
current_user
,
:update_build
,
project
)
}
do
|
build
|
erase_namespace_project_job_path
(
project
.
namespace
,
project
,
build
)
...
...
@@ -11,7 +13,7 @@ class BuildDetailsEntity < BuildEntity
expose
:runner
,
using:
RunnerEntity
expose
:pipeline
,
using:
PipelineEntity
expose
:merge_request
,
if:
->
(
*
)
{
can?
(
current_user
,
:read_merge_request
,
projec
t
)
}
do
expose
:merge_request
,
if:
->
(
*
)
{
can?
(
current_user
,
:read_merge_request
,
build
.
merge_reques
t
)
}
do
expose
:iid
do
|
build
|
build
.
merge_request
.
iid
end
...
...
@@ -21,8 +23,10 @@ class BuildDetailsEntity < BuildEntity
end
end
expose
:new_issue_path
,
if:
->
(
*
)
{
can?
(
request
.
current_user
,
:create_issue
,
project
)
}
do
|
build
|
new_namespace_project_issue_path
(
project
.
namespace
,
project
)
expose
:build_failed_options
do
expose
:new_issue_path
,
if:
->
(
*
)
{
can?
(
request
.
current_user
,
:create_issue
,
project
)
}
do
|
build
|
new_namespace_project_issue_path
(
project
.
namespace
,
project
)
end
end
expose
:raw_path
do
|
build
|
...
...
app/serializers/build_entity.rb
浏览文件 @
b2465182
...
...
@@ -8,8 +8,10 @@ class BuildEntity < Grape::Entity
path_to
(
:namespace_project_job
,
build
)
end
expose
:retry_path
do
|
build
|
path_to
(
:retry_namespace_project_job
,
build
)
expose
:build_failed_options
,
if:
->
(
*
)
{
build
.
retryable?
}
do
expose
:retry_path
do
|
build
|
path_to
(
:retry_namespace_project_job
,
build
)
end
end
expose
:play_path
,
if:
->
(
*
)
{
playable?
}
do
|
build
|
...
...
spec/controllers/projects/jobs_controller_spec.rb
浏览文件 @
b2465182
...
...
@@ -140,9 +140,10 @@ describe Projects::JobsController do
it
'exposes needed information'
do
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
json_response
[
'new_issue_path'
]).
to
end_with
(
'/issues/new'
)
expect
(
json_response
[
'raw_path'
]).
to
match
(
/builds\/\d+\/raw\z/
)
expect
(
json_response
.
dig
(
'merge_request'
,
'path'
)).
to
match
(
/merge_requests\/\d+\z/
)
expect
(
json_response
[
'build_failed_options'
][
'new_issue_path'
])
.
to
end_with
(
'/issues/new'
)
end
end
...
...
spec/serializers/build_details_entity_spec.rb
浏览文件 @
b2465182
...
...
@@ -30,7 +30,8 @@ describe BuildDetailsEntity do
it
'contains the needed key value pairs'
do
expect
(
subject
).
to
include
(
:coverage
,
:erased_at
,
:duration
)
expect
(
subject
).
to
include
(
:artifacts
,
:runner
,
:pipeline
)
expect
(
subject
).
to
include
(
:raw_path
,
:merge_request
,
:new_issue_path
)
expect
(
subject
).
to
include
(
:raw_path
,
:merge_request
)
expect
(
subject
[
:build_failed_options
]).
to
include
(
:new_issue_path
)
end
it
'exposes details of the merge request'
do
...
...
spec/serializers/build_entity_spec.rb
浏览文件 @
b2465182
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
BuildEntity
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
let
(
:build
)
{
create
(
:ci_build
,
:failed
)
}
let
(
:project
)
{
build
.
project
}
let
(
:request
)
{
double
(
'request'
)
}
...
...
@@ -17,7 +17,8 @@ describe BuildEntity do
subject
{
entity
.
as_json
}
it
'contains paths to build page and retry action'
do
expect
(
subject
).
to
include
(
:build_path
,
:retry_path
)
expect
(
subject
).
to
include
(
:build_path
,
:build_failed_options
)
expect
(
subject
.
dig
(
:build_failed_options
,
:retry_path
)).
not_to
be_nil
end
it
'does not contain sensitive information'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录