summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-01-26 20:38:21 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-01-26 20:38:21 +0000
commit10178af1fd30e97dd65d11bba1e640aa7dc5bbbd (patch)
tree7d0bc5370383a81484464e59256f17d447f98303
parent7db05c4da120a394dec3b5175720a9f8751eb736 (diff)
downloadgitlab-ce-10178af1fd30e97dd65d11bba1e640aa7dc5bbbd.tar.gz
-rw-r--r--app/views/ci/status/_graph_badge.html.haml2
-rw-r--r--spec/features/projects/pipelines/pipeline_spec.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/ci/status/_graph_badge.html.haml b/app/views/ci/status/_graph_badge.html.haml
index a44adc6205a..0530d21a7e2 100644
--- a/app/views/ci/status/_graph_badge.html.haml
+++ b/app/views/ci/status/_graph_badge.html.haml
@@ -16,5 +16,5 @@
- 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
- %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)
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 7170beba799..917b545e98b 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -67,7 +67,7 @@ describe 'Pipeline', :feature, :js do
it 'shows a running icon and a cancel action for the running build' do
page.within('#ci-badge-deploy') do
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')
end
end
@@ -87,7 +87,7 @@ describe 'Pipeline', :feature, :js do
end
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
@@ -106,7 +106,7 @@ describe 'Pipeline', :feature, :js do
end
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
@@ -125,7 +125,7 @@ describe 'Pipeline', :feature, :js do
end
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