kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Address feedback.

Browse source
This commit is contained in:
Connor Shea 2016-07-14 08:58:05 -06:00
parent b306a52114
commit b2a79554c3
No known key found for this signature in database
GPG key ID: E52237E5B35A83E6
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects/merge_requests_controller.rb
View file

@ -286,7 +286,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
status = pipeline.status
coverage = pipeline.try(:coverage)
status = "success_with_warnings" if pipeline.success? && pipeline.with_warnings?
status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings?
status ||= "preparing"
else

6
app/models/ci/pipeline.rb
View file

@ -146,10 +146,8 @@ module Ci
end
end
def with_warnings?
builds.latest.any? do |build|
build.failed? && build.allow_failure
end
def has_warnings?
builds.latest.ignored.any?
end
def config_processor

24
spec/models/ci/pipeline_spec.rb
View file

@ -503,13 +503,13 @@ describe Ci::Pipeline, models: true do
end
end
describe '#with_warnings?' do
subject { pipeline.with_warnings? }
describe '#has_warnings?' do
subject { pipeline.has_warnings? }
context 'build which is allowed to fail fails' do
before do
FactoryGirl.create :ci_build, :success, pipeline: pipeline, name: 'rspec'
FactoryGirl.create :ci_build, :allowed_to_fail, :failed, pipeline: pipeline, name: 'rubocop'
create :ci_build, :success, pipeline: pipeline, name: 'rspec'
create :ci_build, :allowed_to_fail, :failed, pipeline: pipeline, name: 'rubocop'
end
it 'returns true' do
@ -519,13 +519,25 @@ describe Ci::Pipeline, models: true do
context 'build which is allowed to fail succeeds' do
before do
FactoryGirl.create :ci_build, :success, pipeline: pipeline, name: 'rspec'
FactoryGirl.create :ci_build, :allowed_to_fail, :success, pipeline: pipeline, name: 'rubocop'
create :ci_build, :success, pipeline: pipeline, name: 'rspec'
create :ci_build, :allowed_to_fail, :success, pipeline: pipeline, name: 'rubocop'
end
it 'returns false' do
is_expected.to be_falsey
end
end
context 'build is retried and succeeds' do
before do
create :ci_build, :success, pipeline: pipeline, name: 'rubocop'
create :ci_build, :failed, pipeline: pipeline, name: 'rspec'
create :ci_build, :success, pipeline: pipeline, name: 'rspec'
end
it 'returns false' do
is_expected.to be_falsey
end
end
end
end