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
daff6445
Commit
daff6445
authored
Dec 22, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not show retried builds in pipeline stage dropdown
parent
6e2a6fd0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
7 deletions
+39
-7
app/views/projects/pipelines/_stage.html.haml
app/views/projects/pipelines/_stage.html.haml
+1
-1
spec/views/projects/pipelines/_stage.html.haml_spec.rb
spec/views/projects/pipelines/_stage.html.haml_spec.rb
+38
-6
No files found.
app/views/projects/pipelines/_stage.html.haml
View file @
daff6445
%ul
%ul
-
@stage
.
statuses
.
each
do
|
status
|
-
@stage
.
statuses
.
latest
.
each
do
|
status
|
%li
.dropdown-build
%li
.dropdown-build
=
render
'ci/status/graph_badge'
,
subject:
status
=
render
'ci/status/graph_badge'
,
subject:
status
spec/views/projects/pipelines/_stage.html.haml_spec.rb
View file @
daff6445
...
@@ -7,7 +7,10 @@ describe 'projects/pipelines/_stage', :view do
...
@@ -7,7 +7,10 @@ describe 'projects/pipelines/_stage', :view do
before
do
before
do
assign
:stage
,
stage
assign
:stage
,
stage
end
context
'when there are only latest builds present'
do
before
do
create
(
:ci_build
,
name:
'test:build'
,
create
(
:ci_build
,
name:
'test:build'
,
stage:
stage
.
name
,
stage:
stage
.
name
,
pipeline:
pipeline
)
pipeline:
pipeline
)
...
@@ -18,4 +21,33 @@ describe 'projects/pipelines/_stage', :view do
...
@@ -18,4 +21,33 @@ describe 'projects/pipelines/_stage', :view do
expect
(
rendered
).
to
have_text
'test:build'
expect
(
rendered
).
to
have_text
'test:build'
end
end
end
context
'when build belongs to different stage'
do
before
do
create
(
:ci_build
,
name:
'test:build'
,
stage:
'other:stage'
,
pipeline:
pipeline
)
end
it
'does not render build'
do
render
expect
(
rendered
).
not_to
have_text
'test:build'
end
end
context
'when there are retried builds present'
do
before
do
create_list
(
:ci_build
,
2
,
name:
'test:build'
,
stage:
stage
.
name
,
pipeline:
pipeline
)
end
it
'shows only latest builds'
do
render
expect
(
rendered
).
to
have_text
'test:build'
,
count:
1
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