Commit ab6b9a1c authored by Steve Azzopardi's avatar Steve Azzopardi

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.
parent b07ac850
...@@ -86,7 +86,7 @@ class Projects::ArtifactsController < Projects::ApplicationController ...@@ -86,7 +86,7 @@ class Projects::ArtifactsController < Projects::ApplicationController
end end
def build_from_id 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 end
def build_from_ref def build_from_ref
......
...@@ -45,7 +45,7 @@ class Projects::BuildArtifactsController < Projects::ApplicationController ...@@ -45,7 +45,7 @@ class Projects::BuildArtifactsController < Projects::ApplicationController
end end
def job_from_id 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 end
def job_from_ref def job_from_ref
......
...@@ -658,10 +658,6 @@ class Project < ActiveRecord::Base ...@@ -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}")) latest_successful_build_for(job_name, ref) || raise(ActiveRecord::RecordNotFound.new("Couldn't find job #{job_name}"))
end end
def get_build(id)
builds.find_by(id: id)
end
def merge_base_commit(first_commit_id, second_commit_id) def merge_base_commit(first_commit_id, second_commit_id)
sha = repository.merge_base(first_commit_id, second_commit_id) sha = repository.merge_base(first_commit_id, second_commit_id)
commit_by(oid: sha) if sha commit_by(oid: sha) if sha
......
...@@ -2026,29 +2026,6 @@ describe Project do ...@@ -2026,29 +2026,6 @@ describe Project do
end end
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 describe '#import_status' do
context 'with import_state' do context 'with import_state' do
it 'returns the right status' do it 'returns the right status' 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