Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5328f7d1
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,发现更多精彩内容 >>
未验证
提交
5328f7d1
编写于
9月 05, 2018
作者:
S
Steve Azzopardi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add runner JSON schema
closes
https://gitlab.com/gitlab-org/gitlab-ce/issues/51093
上级
cdc4cd09
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
83 addition
and
3 deletion
+83
-3
app/serializers/runner_entity.rb
app/serializers/runner_entity.rb
+5
-2
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+59
-0
spec/fixtures/api/schemas/job/job_details.json
spec/fixtures/api/schemas/job/job_details.json
+2
-1
spec/fixtures/api/schemas/job/runner.json
spec/fixtures/api/schemas/job/runner.json
+17
-0
未找到文件。
app/serializers/runner_entity.rb
浏览文件 @
5328f7d1
...
...
@@ -5,8 +5,7 @@ class RunnerEntity < Grape::Entity
expose
:id
,
:description
expose
:edit_path
,
if:
->
(
*
)
{
can?
(
request
.
current_user
,
:admin_build
,
project
)
&&
runner
.
project_type?
}
do
|
runner
|
expose
:edit_path
,
if:
->
(
*
)
{
can_edit_runner?
}
do
|
runner
|
edit_project_runner_path
(
project
,
runner
)
end
...
...
@@ -17,4 +16,8 @@ class RunnerEntity < Grape::Entity
def
project
request
.
project
end
def
can_edit_runner?
can?
(
request
.
current_user
,
:update_runner
,
runner
)
&&
runner
.
project_type?
end
end
spec/controllers/projects/jobs_controller_spec.rb
浏览文件 @
5328f7d1
...
...
@@ -229,6 +229,65 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
expect
(
json_response
[
'deployment_status'
][
"environment"
]).
not_to
be_nil
end
end
context
'when user can edit runner'
do
context
'that belongs to the project'
do
let
(
:runner
)
{
create
(
:ci_runner
,
:project
,
projects:
[
project
])
}
let
(
:job
)
{
create
(
:ci_build
,
:success
,
pipeline:
pipeline
,
runner:
runner
)
}
before
do
project
.
add_maintainer
(
user
)
sign_in
(
user
)
get_show
(
id:
job
.
id
,
format: :json
)
end
it
'user can edit runner'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
json_response
[
'runner'
]).
to
have_key
(
'edit_path'
)
end
end
context
'that belongs to group'
do
let
(
:group
)
{
create
(
:group
)
}
let
(
:runner
)
{
create
(
:ci_runner
,
:group
,
groups:
[
group
])
}
let
(
:job
)
{
create
(
:ci_build
,
:success
,
pipeline:
pipeline
,
runner:
runner
)
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
before
do
project
.
add_maintainer
(
user
)
sign_in
(
user
)
get_show
(
id:
job
.
id
,
format: :json
)
end
it
'user can not edit runner'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
json_response
[
'runner'
]).
not_to
have_key
(
'edit_path'
)
end
end
context
'that belongs to instance'
do
let
(
:runner
)
{
create
(
:ci_runner
,
:instance
)
}
let
(
:job
)
{
create
(
:ci_build
,
:success
,
pipeline:
pipeline
,
runner:
runner
)
}
let
(
:user
)
{
create
(
:user
,
:admin
)
}
before
do
project
.
add_maintainer
(
user
)
sign_in
(
user
)
get_show
(
id:
job
.
id
,
format: :json
)
end
it
'user can not edit runner'
do
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
match_response_schema
(
'job/job_details'
)
expect
(
json_response
[
'runner'
]).
not_to
have_key
(
'edit_path'
)
end
end
end
end
context
'when requesting JSON job is triggered'
do
...
...
spec/fixtures/api/schemas/job/job_details.json
浏览文件 @
5328f7d1
...
...
@@ -7,6 +7,7 @@
"artifact"
:
{
"$ref"
:
"artifact.json"
},
"terminal_path"
:
{
"type"
:
"string"
},
"trigger"
:
{
"$ref"
:
"trigger.json"
},
"deployment_status"
:
{
"$ref"
:
"deployment_status.json"
}
"deployment_status"
:
{
"$ref"
:
"deployment_status.json"
},
"runner"
:
{
"$ref"
:
"runner.json"
}
}
}
spec/fixtures/api/schemas/job/runner.json
0 → 100644
浏览文件 @
5328f7d1
{
"oneOf"
:
[
{
"type"
:
"null"
},
{
"type"
:
"object"
,
"required"
:
[
"id"
,
"description"
],
"properties"
:
{
"id"
:
{
"type"
:
"integer"
},
"description"
:
{
"type"
:
"string"
},
"edit_path"
:
{
"type"
:
"string"
}
}
}
]
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录