Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
b2a79554
Commit
b2a79554
authored
Jul 14, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address feedback.
parent
b306a521
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
11 deletions
+21
-11
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-1
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+2
-4
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+18
-6
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
b2a79554
...
@@ -286,7 +286,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -286,7 +286,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
status
=
pipeline
.
status
status
=
pipeline
.
status
coverage
=
pipeline
.
try
(
:coverage
)
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"
status
||=
"preparing"
else
else
...
...
app/models/ci/pipeline.rb
View file @
b2a79554
...
@@ -146,10 +146,8 @@ module Ci
...
@@ -146,10 +146,8 @@ module Ci
end
end
end
end
def
with_warnings?
def
has_warnings?
builds
.
latest
.
any?
do
|
build
|
builds
.
latest
.
ignored
.
any?
build
.
failed?
&&
build
.
allow_failure
end
end
end
def
config_processor
def
config_processor
...
...
spec/models/ci/pipeline_spec.rb
View file @
b2a79554
...
@@ -503,13 +503,13 @@ describe Ci::Pipeline, models: true do
...
@@ -503,13 +503,13 @@ describe Ci::Pipeline, models: true do
end
end
end
end
describe
'#
with
_warnings?'
do
describe
'#
has
_warnings?'
do
subject
{
pipeline
.
with
_warnings?
}
subject
{
pipeline
.
has
_warnings?
}
context
'build which is allowed to fail fails'
do
context
'build which is allowed to fail fails'
do
before
do
before
do
FactoryGirl
.
create
:ci_build
,
:success
,
pipeline:
pipeline
,
name:
'rspec'
create
:ci_build
,
:success
,
pipeline:
pipeline
,
name:
'rspec'
FactoryGirl
.
create
:ci_build
,
:allowed_to_fail
,
:failed
,
pipeline:
pipeline
,
name:
'rubocop'
create
:ci_build
,
:allowed_to_fail
,
:failed
,
pipeline:
pipeline
,
name:
'rubocop'
end
end
it
'returns true'
do
it
'returns true'
do
...
@@ -519,8 +519,20 @@ describe Ci::Pipeline, models: true do
...
@@ -519,8 +519,20 @@ describe Ci::Pipeline, models: true do
context
'build which is allowed to fail succeeds'
do
context
'build which is allowed to fail succeeds'
do
before
do
before
do
FactoryGirl
.
create
:ci_build
,
:success
,
pipeline:
pipeline
,
name:
'rspec'
create
:ci_build
,
:success
,
pipeline:
pipeline
,
name:
'rspec'
FactoryGirl
.
create
:ci_build
,
:allowed_to_fail
,
:success
,
pipeline:
pipeline
,
name:
'rubocop'
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
end
it
'returns false'
do
it
'returns false'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment