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
Tatuya Kamada
gitlab-ce
Commits
c83be391
Commit
c83be391
authored
Mar 08, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust specs for core pipeline detailed statuses
parent
7319460c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
3 deletions
+25
-3
spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
+24
-2
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+1
-1
No files found.
spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
View file @
c83be391
...
@@ -11,7 +11,8 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
...
@@ -11,7 +11,8 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
end
end
context
'when pipeline has a core status'
do
context
'when pipeline has a core status'
do
HasStatus
::
AVAILABLE_STATUSES
.
each
do
|
simple_status
|
(
HasStatus
::
AVAILABLE_STATUSES
-
[
HasStatus
::
BLOCKED_STATUS
])
.
each
do
|
simple_status
|
context
"when core status is
#{
simple_status
}
"
do
context
"when core status is
#{
simple_status
}
"
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
status:
simple_status
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
status:
simple_status
)
}
...
@@ -23,7 +24,7 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
...
@@ -23,7 +24,7 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
expect
(
factory
.
core_status
).
to
be_a
expected_status
expect
(
factory
.
core_status
).
to
be_a
expected_status
end
end
it
'does not match
e
extended statuses'
do
it
'does not match extended statuses'
do
expect
(
factory
.
extended_statuses
).
to
be_empty
expect
(
factory
.
extended_statuses
).
to
be_empty
end
end
...
@@ -39,6 +40,27 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
...
@@ -39,6 +40,27 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
end
end
end
end
end
end
context
"when core status is manual"
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
status: :manual
)
}
it
"matches manual core status"
do
expect
(
factory
.
core_status
)
.
to
be_a
Gitlab
::
Ci
::
Status
::
Manual
end
it
'matches a correct extended statuses'
do
expect
(
factory
.
extended_statuses
)
.
to
eq
[
Gitlab
::
Ci
::
Status
::
Pipeline
::
Blocked
]
end
it
'extends core status with common pipeline methods'
do
expect
(
status
).
to
have_details
expect
(
status
).
not_to
have_action
expect
(
status
.
details_path
)
.
to
include
"pipelines/
#{
pipeline
.
id
}
"
end
end
end
end
context
'when pipeline has warnings'
do
context
'when pipeline has warnings'
do
...
...
spec/models/ci/pipeline_spec.rb
View file @
c83be391
...
@@ -647,7 +647,7 @@ describe Ci::Pipeline, models: true do
...
@@ -647,7 +647,7 @@ describe Ci::Pipeline, models: true do
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
status: :manual
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
status: :manual
)
}
it
'returns detailed status for blocked pipeline'
do
it
'returns detailed status for blocked pipeline'
do
expect
(
subject
.
text
).
to
eq
'
manual
'
expect
(
subject
.
text
).
to
eq
'
blocked
'
end
end
end
end
...
...
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