diff options
| -rw-r--r-- | app/models/ci/runner.rb | 6 | ||||
| -rw-r--r-- | app/services/ci/register_job_service.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/runners/_runner.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/runners/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/runners/_runner.html.haml | 2 | ||||
| -rw-r--r-- | lib/api/runners.rb | 2 | ||||
| -rw-r--r-- | spec/models/ci/runner_spec.rb | 16 |
7 files changed, 17 insertions, 17 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 40d828b8414..da1107951bf 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -137,11 +137,11 @@ module Ci !shared? end - def group? + def assigned_to_group? runner_groups.any? end - def project? + def assigned_to_project? runner_projects.any? end @@ -244,7 +244,7 @@ module Ci errors.add(:runner, 'can only be assigned to one group') end - if group? && project? + if assigned_to_group? && assigned_to_project? errors.add(:runner, 'can only be assigned either to projects or to a group') end end diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index 55d0273847c..647bceb3b36 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -17,7 +17,7 @@ module Ci builds = if runner.shared? builds_for_shared_runner - elsif runner.group? + elsif runner.assigned_to_group? builds_for_group_runner else builds_for_project_runner diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index f1e0e3b5ad6..6670ba6aa89 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -2,7 +2,7 @@ %td - if runner.shared? %span.label.label-success shared - - elsif runner.group? + - elsif runner.assigned_to_group? %span.label.label-success group - else %span.label.label-info specific @@ -21,7 +21,7 @@ %td = runner.ip_address %td - - if runner.shared? || runner.group? + - if runner.shared? || runner.assigned_to_group? n/a - else = runner.projects.count(:all) diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml index ae5f860d0d1..ab2c9ad1e57 100644 --- a/app/views/admin/runners/show.html.haml +++ b/app/views/admin/runners/show.html.haml @@ -19,7 +19,7 @@ %p If you want Runners to build only specific projects, enable them in the table below. Keep in mind that this is a one way transition. -- elsif @runner.group? +- elsif @runner.assigned_to_group? .bs-callout.bs-callout-success %h4 This runner will process jobs from all projects in its group and subgroups - else diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml index 6d61da40f5b..d2598f3be07 100644 --- a/app/views/projects/runners/_runner.html.haml +++ b/app/views/projects/runners/_runner.html.haml @@ -26,7 +26,7 @@ - else - runner_project = @project.runner_projects.find_by(runner_id: runner) = link_to 'Disable for this project', project_runner_project_path(@project, runner_project), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm' - - elsif runner.project? + - elsif runner.assigned_to_project? = form_for [@project.namespace.becomes(Namespace), @project, @project.runner_projects.new] do |f| = f.hidden_field :runner_id, value: runner.id = f.submit 'Enable for this project', class: 'btn btn-sm' diff --git a/lib/api/runners.rb b/lib/api/runners.rb index 1a05bed3465..11c31917fc5 100644 --- a/lib/api/runners.rb +++ b/lib/api/runners.rb @@ -205,7 +205,7 @@ module API def authenticate_enable_runner!(runner) forbidden!("Runner is shared") if runner.is_shared? forbidden!("Runner is locked") if runner.locked? - forbidden!("Runner is a group runner") if runner.group? + forbidden!("Runner is a group runner") if runner.assigned_to_group? return if current_user.admin? forbidden!("No access granted") unless user_can_access_runner?(runner) diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb index d6ce97a9b28..fb9dcce9a7c 100644 --- a/spec/models/ci/runner_spec.rb +++ b/spec/models/ci/runner_spec.rb @@ -748,47 +748,47 @@ describe Ci::Runner do end end - describe 'group?' do + describe 'assigned_to_group?' do it 'returns false when the runner is a project runner' do project = create :project runner = create :ci_runner, description: 'Project runner', projects: [project] - expect(runner.group?).to be false + expect(runner.assigned_to_group?).to be false end it 'returns false when the runner is a shared runner' do runner = create :ci_runner, :shared, description: 'Shared runner' - expect(runner.group?).to be false + expect(runner.assigned_to_group?).to be false end it 'returns true when the runner is assigned to a group' do group = create :group runner = create :ci_runner, description: 'Group runner', groups: [group] - expect(runner.group?).to be true + expect(runner.assigned_to_group?).to be true end end - describe 'project?' do + describe 'assigned_to_project?' do it 'returns false when the runner is a group prunner' do group = create :group runner = create :ci_runner, description: 'Group runner', groups: [group] - expect(runner.project?).to be false + expect(runner.assigned_to_project?).to be false end it 'returns false when the runner is a shared runner' do runner = create :ci_runner, :shared, description: 'Shared runner' - expect(runner.project?).to be false + expect(runner.assigned_to_project?).to be false end it 'returns true when the runner is assigned to a project' do project = create :project runner = create :ci_runner, description: 'Group runner', projects: [project] - expect(runner.project?).to be true + expect(runner.assigned_to_project?).to be true end end |