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
Boxiang Sun
gitlab-ce
Commits
4ae28cb3
Commit
4ae28cb3
authored
Dec 15, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review
parent
23f4d182
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
44 deletions
+62
-44
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+1
-9
app/views/ci/status/_graph_badge.html.haml
app/views/ci/status/_graph_badge.html.haml
+3
-2
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+58
-33
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
4ae28cb3
...
@@ -645,14 +645,6 @@
...
@@ -645,14 +645,6 @@
margin-bottom
:
0
;
margin-bottom
:
0
;
line-height
:
1
.2
;
line-height
:
1
.2
;
}
}
li
:first-child
{
padding-top
:
6px
;
}
li
:last-child
{
padding-bottom
:
6px
;
}
}
}
.dropdown-build
{
.dropdown-build
{
...
...
app/views/ci/status/_graph_badge.html.haml
View file @
4ae28cb3
...
@@ -3,9 +3,10 @@
...
@@ -3,9 +3,10 @@
-
subject
=
local_assigns
.
fetch
(
:subject
)
-
subject
=
local_assigns
.
fetch
(
:subject
)
-
status
=
subject
.
detailed_status
(
current_user
)
-
status
=
subject
.
detailed_status
(
current_user
)
-
klass
=
"ci-status-icon ci-status-icon-
#{
status
}
"
-
klass
=
"ci-status-icon ci-status-icon-
#{
status
}
"
-
tooltip_title
=
"
#{
subject
.
name
}
-
#{
status
.
label
}
"
-
if
status
.
has_details?
-
if
status
.
has_details?
=
link_to
status
.
details_path
,
data:
{
toggle:
'tooltip'
,
title:
"
#{
subject
.
name
}
-
#{
status
}
"
}
do
=
link_to
status
.
details_path
,
data:
{
toggle:
'tooltip'
,
title:
tooltip_title
}
do
%span
{
class:
klass
}=
custom_icon
(
status
.
icon
)
%span
{
class:
klass
}=
custom_icon
(
status
.
icon
)
.ci-status-text
=
subject
.
name
.ci-status-text
=
subject
.
name
-
else
-
else
...
@@ -14,6 +15,6 @@
...
@@ -14,6 +15,6 @@
-
if
status
.
has_action?
-
if
status
.
has_action?
=
link_to
status
.
action_path
,
method:
status
.
action_method
,
=
link_to
status
.
action_path
,
method:
status
.
action_method
,
title:
"
#{
subject
.
name
}
:
#{
status
.
action_title
}
"
,
class:
'ci-action-icon-container'
do
title:
tooltip_title
,
class:
'ci-action-icon-container'
do
%i
.ci-action-icon-wrapper
%i
.ci-action-icon-wrapper
=
icon
(
status
.
action_icon
,
class:
status
.
action_class
)
=
icon
(
status
.
action_icon
,
class:
status
.
action_class
)
spec/features/projects/pipelines/pipeline_spec.rb
View file @
4ae28cb3
...
@@ -39,64 +39,89 @@ describe "Pipelines", feature: true, js: true do
...
@@ -39,64 +39,89 @@ describe "Pipelines", feature: true, js: true do
end
end
context
'pipeline graph'
do
context
'pipeline graph'
do
context
'running build'
do
it
'shows a running icon and a cancel action for the running build'
do
it
'shows a running icon and a cancel action for the running build'
do
title
=
"
#{
@running
.
name
}
-
#{
@running
.
status
}
"
page
.
within
(
'a[data-title="deploy - running"]'
)
do
page
.
within
(
"a[data-title='
#{
title
}
']"
)
do
expect
(
page
).
to
have_selector
(
'.ci-status-icon-running'
)
expect
(
page
).
to
have_selector
(
'.ci-status-icon-running'
)
expect
(
page
).
to
have_content
(
'deploy'
)
expect
(
page
).
to
have_content
(
'deploy'
)
end
end
page
.
within
(
"a[data-title='
#{
title
}
'] + .ci-action-icon-container"
)
do
page
.
within
(
'a[data-title="deploy - running"] + .ci-action-icon-container'
)
do
expect
(
page
).
to
have_selector
(
'.ci-action-icon-container .fa-ban'
)
expect
(
page
).
to
have_selector
(
'.ci-action-icon-container .fa-ban'
)
end
end
end
it
'should be possible to cancel the running build'
do
find
(
'a[data-title="deploy - running"] + .ci-action-icon-container'
).
trigger
(
'click'
)
expect
(
page
).
not_to
have_content
(
'Cancel running'
)
end
end
end
context
'success build'
do
it
'shows the success icon and a retry action for the successfull build'
do
it
'shows the success icon and a retry action for the successfull build'
do
title
=
"
#{
@success
.
name
}
-
#{
@success
.
status
}
"
page
.
within
(
'a[data-title="build - passed"]'
)
do
page
.
within
(
"a[data-title='
#{
title
}
']"
)
do
expect
(
page
).
to
have_selector
(
'.ci-status-icon-success'
)
expect
(
page
).
to
have_selector
(
'.ci-status-icon-success'
)
expect
(
page
).
to
have_content
(
'build'
)
expect
(
page
).
to
have_content
(
'build'
)
end
end
page
.
within
(
"a[data-title='
#{
title
}
'] + .ci-action-icon-container"
)
do
page
.
within
(
'a[data-title="build - passed"] + .ci-action-icon-container'
)
do
expect
(
page
).
to
have_selector
(
'.ci-action-icon-container .fa-refresh'
)
expect
(
page
).
to
have_selector
(
'.ci-action-icon-container .fa-refresh'
)
end
end
end
end
it
'shows the failed icon and a retry action for the failed
build'
do
it
'should be possible to retry the success
build'
do
title
=
"
#{
@failed
.
name
}
-
#{
@failed
.
status
}
"
find
(
'a[data-title="build - passed"] + .ci-action-icon-container'
).
trigger
(
'click'
)
page
.
within
(
"a[data-title='
#{
title
}
']"
)
do
expect
(
page
).
not_to
have_content
(
'Retry build'
)
end
end
context
'failed build'
do
it
'shows the failed icon and a retry action for the failed build'
do
page
.
within
(
'a[data-title="test - failed"]'
)
do
expect
(
page
).
to
have_selector
(
'.ci-status-icon-failed'
)
expect
(
page
).
to
have_selector
(
'.ci-status-icon-failed'
)
expect
(
page
).
to
have_content
(
'test'
)
expect
(
page
).
to
have_content
(
'test'
)
end
end
page
.
within
(
"a[data-title='
#{
title
}
'] + .ci-action-icon-container"
)
do
page
.
within
(
'a[data-title="test - failed"] + .ci-action-icon-container'
)
do
expect
(
page
).
to
have_selector
(
'.ci-action-icon-container .fa-refresh'
)
expect
(
page
).
to
have_selector
(
'.ci-action-icon-container .fa-refresh'
)
end
end
end
end
it
'shows the skipped icon and a play action for the manual
build'
do
it
'should be possible to retry the failed
build'
do
title
=
"
#{
@manual
.
name
}
-
#{
@manual
.
status
}
"
find
(
'a[data-title="test - failed"] + .ci-action-icon-container'
).
trigger
(
'click'
)
page
.
within
(
"a[data-title='
#{
title
}
']"
)
do
expect
(
page
).
not_to
have_content
(
'Retry build'
)
end
end
context
'manual build'
do
it
'shows the skipped icon and a play action for the manual build'
do
page
.
within
(
'a[data-title="manual build - manual play action"]'
)
do
expect
(
page
).
to
have_selector
(
'.ci-status-icon-skipped'
)
expect
(
page
).
to
have_selector
(
'.ci-status-icon-skipped'
)
expect
(
page
).
to
have_content
(
'manual'
)
expect
(
page
).
to
have_content
(
'manual'
)
end
end
page
.
within
(
"a[data-title='
#{
title
}
'] + .ci-action-icon-container"
)
do
page
.
within
(
'a[data-title="manual build - manual play action"] + .ci-action-icon-container'
)
do
expect
(
page
).
to
have_selector
(
'.ci-action-icon-container .fa-play'
)
expect
(
page
).
to
have_selector
(
'.ci-action-icon-container .fa-play'
)
end
end
end
end
it
'should be possible to play the manual build'
do
find
(
'a[data-title="manual build - manual play action"] + .ci-action-icon-container'
).
trigger
(
'click'
)
expect
(
page
).
not_to
have_content
(
'Play build'
)
end
end
context
'external build'
do
it
'shows the success icon and the generic comit status build'
do
it
'shows the success icon and the generic comit status build'
do
expect
(
page
).
to
have_selector
(
'.ci-status-icon-success'
)
expect
(
page
).
to
have_selector
(
'.ci-status-icon-success'
)
expect
(
page
).
to
have_content
(
'jenkins'
)
expect
(
page
).
to
have_content
(
'jenkins'
)
end
end
end
end
end
context
'page tabs'
do
context
'page tabs'
do
it
'shows Pipeline and Builds tabs with link'
do
it
'shows Pipeline and Builds tabs with link'
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