Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6077c569
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,发现更多精彩内容 >>
未验证
提交
6077c569
编写于
10月 05, 2017
作者:
A
Alexis Reigel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
denote group runners on admin runners page
上级
a5f5a27d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
47 addition
and
1 deletion
+47
-1
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+3
-1
app/views/admin/runners/index.html.haml
app/views/admin/runners/index.html.haml
+3
-0
spec/features/admin/admin_runners_spec.rb
spec/features/admin/admin_runners_spec.rb
+41
-0
未找到文件。
app/views/admin/runners/_runner.html.haml
浏览文件 @
6077c569
...
...
@@ -2,6 +2,8 @@
%td
-
if
runner
.
shared?
%span
.label.label-success
shared
-
elsif
runner
.
group?
%span
.label.label-success
group
-
else
%span
.label.label-info
specific
-
if
runner
.
locked?
...
...
@@ -19,7 +21,7 @@
%td
=
runner
.
ip_address
%td
-
if
runner
.
shared?
-
if
runner
.
shared?
||
runner
.
group?
n/a
-
else
=
runner
.
projects
.
count
(
:all
)
...
...
app/views/admin/runners/index.html.haml
浏览文件 @
6077c569
...
...
@@ -16,6 +16,9 @@
%li
%span
.label.label-success
shared
\- Runner runs jobs from all unassigned projects
%li
%span
.label.label-success
group
\- Runner runs jobs from all unassigned projects in its group
%li
%span
.label.label-info
specific
\- Runner runs jobs from assigned projects
...
...
spec/features/admin/admin_runners_spec.rb
浏览文件 @
6077c569
...
...
@@ -59,6 +59,47 @@ describe "Admin Runners" do
expect
(
page
).
to
have_text
'No runners found'
end
end
context
'group runner'
do
it
'shows the label and does not show the project count'
do
group
=
create
:group
runner
=
create
:ci_runner
,
groups:
[
group
]
visit
admin_runners_path
within
"#runner_
#{
runner
.
id
}
"
do
expect
(
page
).
to
have_selector
'.label'
,
text:
'group'
expect
(
page
).
to
have_text
'n/a'
end
end
end
context
'shared runner'
do
it
'shows the label and does not show the project count'
do
runner
=
create
:ci_runner
,
:shared
visit
admin_runners_path
within
"#runner_
#{
runner
.
id
}
"
do
expect
(
page
).
to
have_selector
'.label'
,
text:
'shared'
expect
(
page
).
to
have_text
'n/a'
end
end
end
context
'specific runner'
do
it
'shows the label and the project count'
do
project
=
create
:project
runner
=
create
:ci_runner
,
projects:
[
project
]
visit
admin_runners_path
within
"#runner_
#{
runner
.
id
}
"
do
expect
(
page
).
to
have_selector
'.label'
,
text:
'specific'
expect
(
page
).
to
have_text
'1'
end
end
end
end
describe
"Runner show page"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录