Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b7ed102e
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,发现更多精彩内容 >>
未验证
提交
b7ed102e
编写于
11月 21, 2017
作者:
T
Tomasz Maczukin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow filtering by 'status'
上级
8d3e8069
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
54 addition
and
5 deletion
+54
-5
lib/api/runners.rb
lib/api/runners.rb
+8
-1
spec/requests/api/runners_spec.rb
spec/requests/api/runners_spec.rb
+46
-4
未找到文件。
lib/api/runners.rb
浏览文件 @
b7ed102e
...
...
@@ -90,13 +90,20 @@ module API
end
params
do
requires
:id
,
type:
Integer
,
desc:
'The ID of the runner'
optional
:status
,
type:
String
,
desc:
'Status of job'
use
:pagination
end
get
':id/jobs'
do
runner
=
get_runner
(
params
[
:id
])
authenticate_list_runners_jobs!
(
runner
)
present
paginate
(
runner
.
builds
.
running
),
with:
Entities
::
JobWithProject
jobs
=
runner
.
builds
if
params
[
:status
]
not_found!
(
'Status'
)
unless
Ci
::
Build
::
AVAILABLE_STATUSES
.
include?
(
params
[
:status
])
jobs
=
jobs
.
where
(
status:
params
[
:status
].
to_sym
)
end
present
paginate
(
jobs
),
with:
Entities
::
JobWithProject
end
end
...
...
spec/requests/api/runners_spec.rb
浏览文件 @
b7ed102e
...
...
@@ -370,8 +370,8 @@ describe API::Runners do
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
.
length
).
to
eq
(
1
)
expect
(
json_response
[
0
]).
to
include
(
'id'
=>
job_2
.
id
)
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
length
).
to
eq
(
2
)
end
end
...
...
@@ -382,8 +382,29 @@ describe API::Runners do
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
length
).
to
eq
(
2
)
end
end
context
'when valid status is provided'
do
it
'return filtered jobs'
do
get
api
(
"/runners/
#{
specific_runner
.
id
}
/jobs?status=failed"
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
length
).
to
eq
(
1
)
expect
(
json_response
[
0
]).
to
include
(
'id'
=>
job_4
.
id
)
expect
(
json_response
.
first
).
to
include
(
'id'
=>
job_5
.
id
)
end
end
context
'when invalid status is provided'
do
it
'return 404'
do
get
api
(
"/runners/
#{
specific_runner
.
id
}
/jobs?status=non-existing"
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
end
end
...
...
@@ -414,8 +435,29 @@ describe API::Runners do
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
length
).
to
eq
(
2
)
end
end
context
'when valid status is provided'
do
it
'return filtered jobs'
do
get
api
(
"/runners/
#{
specific_runner
.
id
}
/jobs?status=failed"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
length
).
to
eq
(
1
)
expect
(
json_response
[
0
]).
to
include
(
'id'
=>
job_4
.
id
)
expect
(
json_response
.
first
).
to
include
(
'id'
=>
job_5
.
id
)
end
end
context
'when invalid status is provided'
do
it
'return 404'
do
get
api
(
"/runners/
#{
specific_runner
.
id
}
/jobs?status=non-existing"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录