From c27d890188d2ae7f65b2ce9d128cf5dd8a08521f Mon Sep 17 00:00:00 2001
From: Alexis Reigel <alexis.reigel.ext@siemens.com>
Date: Wed, 4 Oct 2017 14:27:13 +0200
Subject: fixup! split up Ci::Runner.owned_or_shared scope

---
 app/models/ci/runner.rb       |  6 +++---
 spec/models/ci/runner_spec.rb | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index bad601c9121..a7fe18fb0a3 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -26,10 +26,10 @@ module Ci
     scope :paused, -> { where(active: false) }
     scope :online, -> { where('contacted_at > ?', contact_time_deadline) }
     scope :ordered, -> { order(id: :desc) }
-    scope :project, -> (project_id) {
+    scope :belonging_to_project, -> (project_id) {
       joins(:runner_projects).where(ci_runner_projects: { project_id: project_id })
     }
-    scope :project_group, -> (project_id) {
+    scope :belonging_to_group, -> (project_id) {
       joins(
         %{
           INNER JOIN ci_runner_groups ON ci_runner_groups.runner_id = ci_runners.id
@@ -48,7 +48,7 @@ module Ci
     }
 
     scope :owned_or_shared, -> (project_id) do
-      union = Gitlab::SQL::Union.new([project(project_id), project_group(project_id), shared])
+      union = Gitlab::SQL::Union.new([belonging_to_project(project_id), belonging_to_group(project_id), shared])
       from("(#{union.to_sql}) ci_runners")
     end
 
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 78b5db026be..308db9e8e68 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -65,7 +65,7 @@ describe Ci::Runner do
     end
   end
 
-  describe '.project' do
+  describe '.belonging_to_project' do
     it 'returns the specific project runner' do
       # own
       specific_project = create :project
@@ -75,11 +75,11 @@ describe Ci::Runner do
       other_project = create :project
       create :ci_runner, :specific, projects: [other_project]
 
-      expect(described_class.project(specific_project.id)).to eq [specific_runner]
+      expect(described_class.belonging_to_project(specific_project.id)).to eq [specific_runner]
     end
   end
 
-  describe '.project_group' do
+  describe '.belonging_to_group' do
     it 'returns the specific group runner' do
       # own
       specific_group = create :group
@@ -91,7 +91,7 @@ describe Ci::Runner do
       create :project, group: other_group
       create :ci_runner, :specific, groups: [other_group]
 
-      expect(described_class.project_group(specific_project.id)).to eq [specific_runner]
+      expect(described_class.belonging_to_group(specific_project.id)).to eq [specific_runner]
     end
 
     it 'does not return the group runner if the project has group runners disabled' do
@@ -99,7 +99,7 @@ describe Ci::Runner do
       specific_project = create :project, group: specific_group, group_runners_enabled: false
       create :ci_runner, :specific, groups: [specific_group]
 
-      expect(described_class.project_group(specific_project.id)).to be_empty
+      expect(described_class.belonging_to_group(specific_project.id)).to be_empty
     end
   end
 
-- 
cgit v1.2.1