BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
cc43c9ac
Commit
cc43c9ac
authored
Nov 22, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expand the loop and reduce overlapped conditions
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7508#note_18794681
parent
35669654
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
5 deletions
+23
-5
pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+23
-5
No files found.
spec/models/ci/pipeline_spec.rb
View file @
cc43c9ac
...
...
@@ -425,18 +425,36 @@ describe Ci::Pipeline, models: true do
end
%i[success failed canceled]
.
each
do
|
status1
|
%i[ci_build generic_commit_status]
.
each
do
|
type0
|
%i[ci_build generic_commit_status]
.
each
do
|
type1
|
context
"when there are
#{
type0
}
and
#{
type1
}
for
#{
status0
}
and
#{
status1
}
"
do
context
"when there are generic_commit_status jobs for
#{
status0
}
and
#{
status1
}
"
do
before
do
create
(
type0
,
status0
,
pipeline:
pipeline
)
create
(
type1
,
status1
,
pipeline:
pipeline
)
create
(
:generic_commit_status
,
status0
,
pipeline:
pipeline
)
create
(
:generic_commit_status
,
status1
,
pipeline:
pipeline
)
end
it
'is cancelable'
do
expect
(
pipeline
.
cancelable?
).
to
be_truthy
end
end
context
"when there are generic_commit_status and ci_build jobs for
#{
status0
}
and
#{
status1
}
"
do
before
do
create
(
:generic_commit_status
,
status0
,
pipeline:
pipeline
)
create
(
:ci_build
,
status1
,
pipeline:
pipeline
)
end
it
'is cancelable'
do
expect
(
pipeline
.
cancelable?
).
to
be_truthy
end
end
context
"when there are ci_build jobs for
#{
status0
}
and
#{
status1
}
"
do
before
do
create
(
:ci_build
,
status0
,
pipeline:
pipeline
)
create
(
:ci_build
,
status1
,
pipeline:
pipeline
)
end
it
'is cancelable'
do
expect
(
pipeline
.
cancelable?
).
to
be_truthy
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