diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-05 18:24:08 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-05 18:24:08 +0000 |
commit | cd85baf5e363847ee1cca2e154e5fb47484e0fdf (patch) | |
tree | 967c02ec121868c5ce04b97d5e30016602c4fd65 /spec | |
parent | 3b8c81fe9edfa62f011716b94117df8dd44251cb (diff) | |
parent | d1fc4ec01b100035d2547fff0763a9a72cd51f53 (diff) | |
download | gitlab-ce-cd85baf5e363847ee1cca2e154e5fb47484e0fdf.tar.gz |
Merge branch 'pipelines-graph-html-css' into 'master'
Pipelines graph HTML and CSS improvements and bug fixing
Closes #26257
See merge request !8443
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/projects/pipelines/pipelines_spec.rb | 4 | ||||
-rw-r--r-- | spec/views/projects/pipelines/show.html.haml_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
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') |