Commit 6077c569 authored by Alexis Reigel's avatar Alexis Reigel

denote group runners on admin runners page

parent a5f5a27d
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
%td %td
- if runner.shared? - if runner.shared?
%span.label.label-success shared %span.label.label-success shared
- elsif runner.group?
%span.label.label-success group
- else - else
%span.label.label-info specific %span.label.label-info specific
- if runner.locked? - if runner.locked?
...@@ -19,7 +21,7 @@ ...@@ -19,7 +21,7 @@
%td %td
= runner.ip_address = runner.ip_address
%td %td
- if runner.shared? - if runner.shared? || runner.group?
n/a n/a
- else - else
= runner.projects.count(:all) = runner.projects.count(:all)
......
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
%li %li
%span.label.label-success shared %span.label.label-success shared
\- Runner runs jobs from all unassigned projects \- Runner runs jobs from all unassigned projects
%li
%span.label.label-success group
\- Runner runs jobs from all unassigned projects in its group
%li %li
%span.label.label-info specific %span.label.label-info specific
\- Runner runs jobs from assigned projects \- Runner runs jobs from assigned projects
......
...@@ -59,6 +59,47 @@ describe "Admin Runners" do ...@@ -59,6 +59,47 @@ describe "Admin Runners" do
expect(page).to have_text 'No runners found' expect(page).to have_text 'No runners found'
end end
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 end
describe "Runner show page" do describe "Runner show page" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment