From 8d8139862aee97d7fadc0563e7df9842f5bd46ac Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Fri, 27 Apr 2018 09:15:54 +0800
Subject: [PATCH] Rename `runner.belonging_to_group(project.id) ->
 runner.belonging_to_parent_group_of_project(project.id)`

---
 app/controllers/projects/settings/ci_cd_controller.rb | 2 +-
 app/models/ci/runner.rb                               | 4 ++--
 app/models/project.rb                                 | 2 +-
 app/services/ci/update_build_queue_service.rb         | 2 +-
 spec/models/ci/runner_spec.rb                         | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 72a9b74767f..6ddbefacae0 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -79,7 +79,7 @@ module Projects
 
         @shared_runners_count = @shared_runners.count(:all)
 
-        @group_runners = ::Ci::Runner.belonging_to_group(@project.id)
+        @group_runners = ::Ci::Runner.belonging_to_parent_group_of_project(@project.id)
       end
 
       def define_secret_variables
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index d65395380d6..6904aca5e68 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -34,7 +34,7 @@ module Ci
 
     scope :belonging_to_any_project, -> { joins(:runner_projects) }
 
-    scope :belonging_to_group, -> (project_id) {
+    scope :belonging_to_parent_group_of_project, -> (project_id) {
       project_groups = ::Group.joins(:projects).where(projects: { id: project_id })
       hierarchy_groups = Gitlab::GroupHierarchy.new(project_groups).base_and_ancestors
 
@@ -42,7 +42,7 @@ module Ci
     }
 
     scope :owned_or_shared, -> (project_id) do
-      union = Gitlab::SQL::Union.new([belonging_to_project(project_id), belonging_to_group(project_id), shared])
+      union = Gitlab::SQL::Union.new([belonging_to_project(project_id), belonging_to_parent_group_of_project(project_id), shared])
       from("(#{union.to_sql}) ci_runners")
     end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 19024b4ea85..8e2145a4aa3 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1297,7 +1297,7 @@ class Project < ActiveRecord::Base
   end
 
   def group_runners
-    @group_runners ||= group_runners_enabled? ? Ci::Runner.belonging_to_group(self.id) : Ci::Runner.none
+    @group_runners ||= group_runners_enabled? ? Ci::Runner.belonging_to_parent_group_of_project(self.id) : Ci::Runner.none
   end
 
   def any_runners?(&block)
diff --git a/app/services/ci/update_build_queue_service.rb b/app/services/ci/update_build_queue_service.rb
index 05dbebc4f8d..c991f04ab30 100644
--- a/app/services/ci/update_build_queue_service.rb
+++ b/app/services/ci/update_build_queue_service.rb
@@ -4,7 +4,7 @@ module Ci
       tick_for(build, build.project.runners)
 
       if build.project.group_runners_enabled?
-        tick_for(build, Ci::Runner.belonging_to_group(build.project_id))
+        tick_for(build, Ci::Runner.belonging_to_parent_group_of_project(build.project_id))
       end
 
       if build.project.shared_runners_enabled?
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 1df11fdedf4..fbf9539e698 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -151,7 +151,7 @@ describe Ci::Runner do
     end
   end
 
-  describe '.belonging_to_group' do
+  describe '.belonging_to_parent_group_of_project' do
     it 'returns the specific group runner' do
       # own
       specific_group = create :group
@@ -163,7 +163,7 @@ describe Ci::Runner do
       create :project, group: other_group
       create :ci_runner, :specific, groups: [other_group]
 
-      expect(described_class.belonging_to_group(specific_project.id)).to eq [specific_runner]
+      expect(described_class.belonging_to_parent_group_of_project(specific_project.id)).to eq [specific_runner]
     end
 
     it 'returns the group runner from a parent group', :nested_groups do
@@ -172,7 +172,7 @@ describe Ci::Runner do
       project = create :project, group: group
       runner = create :ci_runner, :specific, groups: [parent_group]
 
-      expect(described_class.belonging_to_group(project.id)).to eq [runner]
+      expect(described_class.belonging_to_parent_group_of_project(project.id)).to eq [runner]
     end
   end