Commit 42496ece authored by Grzegorz Bizon's avatar Grzegorz Bizon

Render coverage badge for latest successful pipeline

parent ac73de50
...@@ -13,8 +13,7 @@ module Gitlab ...@@ -13,8 +13,7 @@ module Gitlab
@job = job @job = job
@pipeline = @project.pipelines @pipeline = @project.pipelines
.where(ref: @ref) .latest_successful_for(@ref)
.where(sha: @project.commit(@ref).try(:sha))
.first .first
end end
......
...@@ -44,20 +44,19 @@ describe Gitlab::Badge::Coverage::Report do ...@@ -44,20 +44,19 @@ describe Gitlab::Badge::Coverage::Report do
end end
end end
context 'pipeline exists' do context 'when latest successful pipeline exists' do
let!(:pipeline) do before do
create(:ci_pipeline, project: project, create_pipeline do |pipeline|
sha: project.commit.id, create(:ci_build, :success, pipeline: pipeline, name: 'first', coverage: 40)
ref: 'master') create(:ci_build, :success, pipeline: pipeline, coverage: 60)
end end
context 'builds exist' do create_pipeline do |pipeline|
before do create(:ci_build, :failed, pipeline: pipeline, coverage: 10)
create(:ci_build, name: 'first', pipeline: pipeline, coverage: 40) end
create(:ci_build, pipeline: pipeline, coverage: 60)
end end
context 'particular job specified' do context 'when particular job specified' do
let(:job_name) { 'first' } let(:job_name) { 'first' }
it 'returns coverage for the particular job' do it 'returns coverage for the particular job' do
...@@ -65,7 +64,7 @@ describe Gitlab::Badge::Coverage::Report do ...@@ -65,7 +64,7 @@ describe Gitlab::Badge::Coverage::Report do
end end
end end
context 'particular job not specified' do context 'when particular job not specified' do
let(:job_name) { '' } let(:job_name) { '' }
it 'returns arithemetic mean for the pipeline' do it 'returns arithemetic mean for the pipeline' do
...@@ -74,7 +73,13 @@ describe Gitlab::Badge::Coverage::Report do ...@@ -74,7 +73,13 @@ describe Gitlab::Badge::Coverage::Report do
end end
end end
context 'builds do not exist' do context 'when only failed pipeline exists' do
before do
create_pipeline do |pipeline|
create(:ci_build, :failed, pipeline: pipeline, coverage: 10)
end
end
it_behaves_like 'unknown coverage report' it_behaves_like 'unknown coverage report'
context 'particular job specified' do context 'particular job specified' do
...@@ -85,9 +90,17 @@ describe Gitlab::Badge::Coverage::Report do ...@@ -85,9 +90,17 @@ describe Gitlab::Badge::Coverage::Report do
end end
end end
end end
end
context 'pipeline does not exist' do context 'pipeline does not exist' do
it_behaves_like 'unknown coverage report' it_behaves_like 'unknown coverage report'
end end
def create_pipeline
opts = { project: project, sha: project.commit.id, ref: 'master' }
create(:ci_pipeline, opts).tap do |pipeline|
yield pipeline
pipeline.build_updated
end
end
end end
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