From ab6b9a1c4350bbaf8b907efb28fbe456e4fe09d5 Mon Sep 17 00:00:00 2001 From: Steve Azzopardi Date: Wed, 9 Jan 2019 16:33:22 +0100 Subject: Remove get_build method for find_by_id The original intention of `get_build` was as a workaround not to violate `CodeReuse/ActiveRecord`. `find_by_id` does the exact same thing but does not violate the rubocop rule. --- app/controllers/projects/artifacts_controller.rb | 2 +- .../projects/build_artifacts_controller.rb | 2 +- app/models/project.rb | 4 ---- spec/models/project_spec.rb | 23 ---------------------- 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index 9a0997e92ee..2ef18d900f2 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -86,7 +86,7 @@ class Projects::ArtifactsController < Projects::ApplicationController end def build_from_id - project.get_build(params[:job_id]) if params[:job_id] + project.builds.find_by_id(params[:job_id]) if params[:job_id] end def build_from_ref diff --git a/app/controllers/projects/build_artifacts_controller.rb b/app/controllers/projects/build_artifacts_controller.rb index d3d5ba5c75d..4274c356227 100644 --- a/app/controllers/projects/build_artifacts_controller.rb +++ b/app/controllers/projects/build_artifacts_controller.rb @@ -45,7 +45,7 @@ class Projects::BuildArtifactsController < Projects::ApplicationController end def job_from_id - project.get_build(params[:build_id]) if params[:build_id] + project.builds.find_by_id(params[:build_id]) if params[:build_id] end def job_from_ref diff --git a/app/models/project.rb b/app/models/project.rb index a66ed6736ca..9d28ff81cda 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -658,10 +658,6 @@ class Project < ActiveRecord::Base latest_successful_build_for(job_name, ref) || raise(ActiveRecord::RecordNotFound.new("Couldn't find job #{job_name}")) end - def get_build(id) - builds.find_by(id: id) - end - def merge_base_commit(first_commit_id, second_commit_id) sha = repository.merge_base(first_commit_id, second_commit_id) commit_by(oid: sha) if sha diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 3044150bca8..eee7fef17de 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2026,29 +2026,6 @@ describe Project do end end - describe '#get_build' do - let(:project) { create(:project, :repository) } - let(:ci_pipeline) { create(:ci_pipeline, project: project) } - - context 'when build exists' do - context 'build is associated with project' do - let(:build) { create(:ci_build, :success, pipeline: ci_pipeline) } - - it { expect(project.get_build(build.id)).to eq(build) } - end - - context 'build is not associated with project' do - let(:build) { create(:ci_build, :success) } - - it { expect(project.get_build(build.id)).to be_nil } - end - end - - context 'build does not exists' do - it { expect(project.get_build(rand 100)).to be_nil } - end - end - describe '#import_status' do context 'with import_state' do it 'returns the right status' do -- cgit v1.2.1