Commit add9b791 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'tp-qtt182-10' into 'master'

Change qa-* class references to rspec-* in spec/features/contextual_sidebar_spec.rb

Closes gitlab-org/quality/team-tasks#182

See merge request gitlab-org/gitlab-ce!31211
parents b6b9ccbb a0a3e299
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= @project.name = @project.name
%ul.sidebar-top-level-items %ul.sidebar-top-level-items
= nav_link(path: sidebar_projects_paths, html_options: { class: 'home' }) do = nav_link(path: sidebar_projects_paths, html_options: { class: 'home' }) do
= link_to project_path(@project), class: 'shortcuts-project', data: { qa_selector: 'project_link' } do = link_to project_path(@project), class: 'shortcuts-project rspec-project-link', data: { qa_selector: 'project_link' } do
.nav-icon-container .nav-icon-container
= sprite_icon('home') = sprite_icon('home')
%span.nav-item-name %span.nav-item-name
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
- if project_nav_tab? :pipelines - if project_nav_tab? :pipelines
= nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :artifacts]) do = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :artifacts]) do
= link_to project_pipelines_path(@project), class: 'shortcuts-pipelines qa-link-pipelines' do = link_to project_pipelines_path(@project), class: 'shortcuts-pipelines qa-link-pipelines rspec-link-pipelines' do
.nav-icon-container .nav-icon-container
= sprite_icon('rocket') = sprite_icon('rocket')
%span.nav-item-name#js-onboarding-pipelines-link %span.nav-item-name#js-onboarding-pipelines-link
......
%a.toggle-sidebar-button.js-toggle-sidebar.qa-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" } %a.toggle-sidebar-button.js-toggle-sidebar.qa-toggle-sidebar.rspec-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" }
= sprite_icon('angle-double-left', css_class: 'icon-angle-double-left') = sprite_icon('angle-double-left', css_class: 'icon-angle-double-left')
= sprite_icon('angle-double-right', css_class: 'icon-angle-double-right') = sprite_icon('angle-double-right', css_class: 'icon-angle-double-right')
%span.collapse-text= _("Collapse sidebar") %span.collapse-text= _("Collapse sidebar")
......
...@@ -16,21 +16,21 @@ describe 'Contextual sidebar', :js do ...@@ -16,21 +16,21 @@ describe 'Contextual sidebar', :js do
it 'shows flyout navs when collapsed or expanded apart from on the active item when expanded' do it 'shows flyout navs when collapsed or expanded apart from on the active item when expanded' do
expect(page).not_to have_selector('.js-sidebar-collapsed') expect(page).not_to have_selector('.js-sidebar-collapsed')
find('.qa-link-pipelines').hover find('.rspec-link-pipelines').hover
expect(page).to have_selector('.is-showing-fly-out') expect(page).to have_selector('.is-showing-fly-out')
find('a[data-qa-selector="project_link"]').hover find('.rspec-project-link').hover
expect(page).not_to have_selector('.is-showing-fly-out') expect(page).not_to have_selector('.is-showing-fly-out')
find('.qa-toggle-sidebar').click find('.rspec-toggle-sidebar').click
find('.qa-link-pipelines').hover find('.rspec-link-pipelines').hover
expect(page).to have_selector('.is-showing-fly-out') expect(page).to have_selector('.is-showing-fly-out')
find('a[data-qa-selector="project_link"]').hover find('.rspec-project-link').hover
expect(page).to have_selector('.is-showing-fly-out') expect(page).to have_selector('.is-showing-fly-out')
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment