diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-01-04 11:48:48 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-05 10:01:50 -0600 |
| commit | 043cc8196e41a3b44301f1ae093bb5cd6b4ebc82 (patch) | |
| tree | dcac8812d01b2eac3021e87a898aec46714fd83a /spec | |
| parent | d2608ce042ce6a112ccc26aef0a74d1a6ef40d7f (diff) | |
| download | gitlab-ce-043cc8196e41a3b44301f1ae093bb5cd6b4ebc82.tar.gz | |
Simplify HTML of mini pipeline graph and dropdown
Creates individual html for dropdown
Adds simplified CSS for the new dropdown
Removes old CSS
Improves dropdown item in Chrome, Firefox and Safari
Use SCSS variables for colors.
Fix scss linter errors
Adds animation when the stage is hovered.
Adds back tooltip on dropdown toggle
Fixes broken tests
additional css changes to get more into direction of mockups
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') |