diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-01-04 18:12:03 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-01-04 21:45:19 +0000 |
commit | a2b52c3449221cd458bea6f1f4f51539ab7b82cb (patch) | |
tree | 9e93b2aaeec7b771c44216149b7df8d03ba08b85 | |
parent | 304f85e8f20b48ab4b202042ac0245f047bc841c (diff) | |
download | gitlab-ce-a2b52c3449221cd458bea6f1f4f51539ab7b82cb.tar.gz |
Fixes broken tests
Fix broken test
5 files changed, 6 insertions, 6 deletions
diff --git a/app/views/ci/status/_dropdown_graph_badge.html.haml b/app/views/ci/status/_dropdown_graph_badge.html.haml index 5b05d9f451b..8dea3479f82 100644 --- a/app/views/ci/status/_dropdown_graph_badge.html.haml +++ b/app/views/ci/status/_dropdown_graph_badge.html.haml @@ -15,5 +15,5 @@ %span.ci-build-text= subject.name - if status.has_action? - = link_to status.action_path, class: 'ci-action-icon-wrapper', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title } do + = link_to status.action_path, class: 'ci-action-icon-wrapper js-ci-action-icon', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title } do = icon(status.action_icon, class: status.action_class) diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 0d62cd32871..aaf1b428178 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -47,7 +47,7 @@ - icon_status = "#{detailed_status.icon}_borderless" - status_klass = "ci-status-icon ci-status-icon-#{detailed_status.group}" - .stage-container.dropdown + .stage-container.dropdown.js-mini-pipeline-graph %button.mini-pipeline-graph-dropdown-toggle.has-tooltip.js-builds-dropdown-button{ class: "ci-status-icon-#{detailed_status.group}", type: 'button', data: { toggle: 'dropdown', title: "#{stage.name}: #{detailed_status.label}", placement: 'top', "stage-endpoint" => stage_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline, stage: stage.name) } } = custom_icon(icon_status) = icon('caret-down') diff --git a/app/views/projects/stage/_in_stage_group.html.haml b/app/views/projects/stage/_in_stage_group.html.haml index 6a168d50d15..9c5eb501174 100644 --- a/app/views/projects/stage/_in_stage_group.html.haml +++ b/app/views/projects/stage/_in_stage_group.html.haml @@ -6,7 +6,7 @@ = name %span.dropdown-counter-badge= subject.size -%ul.dropdown-menu.big-pipeline-graph-dropdown-menu +%ul.dropdown-menu.big-pipeline-graph-dropdown-menu.js-grouped-pipeline-dropdown .arrow .scrollable-menu - subject.each do |status| diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index 1ff57f92c4c..cef50f6f237 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -183,7 +183,7 @@ describe 'Pipelines', :feature, :js do it 'should render a mini pipeline graph' do endpoint = stage_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline, stage: build.name) - expect(page).to have_selector('.mini-pipeline-graph') + expect(page).to have_selector('.js-mini-pipeline-graph') expect(page).to have_selector(".js-builds-dropdown-button[data-stage-endpoint='#{endpoint}']") end @@ -201,7 +201,7 @@ describe 'Pipelines', :feature, :js do wait_for_ajax - find('a.ci-action-icon-container').trigger('click') + find('a.js-ci-action-icon').trigger('click') expect(page).not_to have_content('Cancel running') end end diff --git a/spec/views/projects/pipelines/show.html.haml_spec.rb b/spec/views/projects/pipelines/show.html.haml_spec.rb index a066ea078e6..c101f6f164d 100644 --- a/spec/views/projects/pipelines/show.html.haml_spec.rb +++ b/spec/views/projects/pipelines/show.html.haml_spec.rb @@ -29,7 +29,7 @@ describe 'projects/pipelines/show' do render expect(rendered).to have_css('.js-pipeline-graph') - expect(rendered).to have_css('.grouped-pipeline-dropdown') + expect(rendered).to have_css('.js-grouped-pipeline-dropdown') # stages expect(rendered).to have_text('Build') |