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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
10178af1
Commit
10178af1
authored
Jan 26, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes after review
parent
7db05c4d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/ci/status/_graph_badge.html.haml
app/views/ci/status/_graph_badge.html.haml
+1
-1
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+4
-4
No files found.
app/views/ci/status/_graph_badge.html.haml
View file @
10178af1
...
@@ -16,5 +16,5 @@
...
@@ -16,5 +16,5 @@
-
if
status
.
has_action?
-
if
status
.
has_action?
=
link_to
status
.
action_path
,
class:
'ci-action-icon-container has-tooltip'
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
}
do
=
link_to
status
.
action_path
,
class:
'ci-action-icon-container has-tooltip'
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
}
do
%i
.ci-action-icon-wrapper
{
class:
"js-#{status.action_icon}"
}
%i
.ci-action-icon-wrapper
{
class:
"js-#{status.action_icon
.dasherize
}"
}
=
custom_icon
(
status
.
action_icon
)
=
custom_icon
(
status
.
action_icon
)
spec/features/projects/pipelines/pipeline_spec.rb
View file @
10178af1
...
@@ -67,7 +67,7 @@ describe 'Pipeline', :feature, :js do
...
@@ -67,7 +67,7 @@ describe 'Pipeline', :feature, :js 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
page
.
within
(
'#ci-badge-deploy'
)
do
page
.
within
(
'#ci-badge-deploy'
)
do
expect
(
page
).
to
have_selector
(
'.js-ci-status-icon-running'
)
expect
(
page
).
to
have_selector
(
'.js-ci-status-icon-running'
)
expect
(
page
).
to
have_selector
(
'.js-icon
_action_
cancel'
)
expect
(
page
).
to
have_selector
(
'.js-icon
-action-
cancel'
)
expect
(
page
).
to
have_content
(
'deploy'
)
expect
(
page
).
to
have_content
(
'deploy'
)
end
end
end
end
...
@@ -87,7 +87,7 @@ describe 'Pipeline', :feature, :js do
...
@@ -87,7 +87,7 @@ describe 'Pipeline', :feature, :js do
end
end
page
.
within
(
'#ci-badge-build .ci-action-icon-container'
)
do
page
.
within
(
'#ci-badge-build .ci-action-icon-container'
)
do
expect
(
page
).
to
have_selector
(
'.js-icon
_action_
retry'
)
expect
(
page
).
to
have_selector
(
'.js-icon
-action-
retry'
)
end
end
end
end
...
@@ -106,7 +106,7 @@ describe 'Pipeline', :feature, :js do
...
@@ -106,7 +106,7 @@ describe 'Pipeline', :feature, :js do
end
end
page
.
within
(
'#ci-badge-test .ci-action-icon-container'
)
do
page
.
within
(
'#ci-badge-test .ci-action-icon-container'
)
do
expect
(
page
).
to
have_selector
(
'.js-icon
_action_
retry'
)
expect
(
page
).
to
have_selector
(
'.js-icon
-action-
retry'
)
end
end
end
end
...
@@ -125,7 +125,7 @@ describe 'Pipeline', :feature, :js do
...
@@ -125,7 +125,7 @@ describe 'Pipeline', :feature, :js do
end
end
page
.
within
(
'#ci-badge-manual-build .ci-action-icon-container'
)
do
page
.
within
(
'#ci-badge-manual-build .ci-action-icon-container'
)
do
expect
(
page
).
to
have_selector
(
'.js-icon
_action_
play'
)
expect
(
page
).
to
have_selector
(
'.js-icon
-action-
play'
)
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