Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
6077c569
Commit
6077c569
authored
7 years ago
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
denote group runners on admin runners page
parent
a5f5a27d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
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
No files found.
app/views/admin/runners/_runner.html.haml
View file @
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
)
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/runners/index.html.haml
View file @
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
...
...
This diff is collapsed.
Click to expand it.
spec/features/admin/admin_runners_spec.rb
View file @
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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment