Commit b0de07d0 authored by Jan Provaznik's avatar Jan Provaznik

Merge branch '322019-iterations-list-and-report-views-missing-left-sidebar-status' into 'master'

Expand left sidebar when viewing group iteration report

See merge request gitlab-org/gitlab!56358
parents a1d5ed78 24aa6633
...@@ -25,10 +25,14 @@ module EE ...@@ -25,10 +25,14 @@ module EE
controllers = %w(issues_analytics#show) controllers = %w(issues_analytics#show)
if @group&.feature_available?(:iterations) if @group&.feature_available?(:iterations)
controllers = %w(iterations#index) controllers = iterations_sub_menu_controllers
end end
super.concat(controllers) super.concat(controllers)
end end
def iterations_sub_menu_controllers
['iterations#index', 'iterations#show']
end
end end
end end
- if group_sidebar_link?(:iterations) - if group_sidebar_link?(:iterations)
= nav_link(path: 'iterations#index') do = nav_link(path: iterations_sub_menu_controllers) do
= link_to group_iterations_path(@group), data: { qa_selector: 'group_iterations_link' } do = link_to group_iterations_path(@group), data: { qa_selector: 'group_iterations_link' } do
%span %span
= _('Iterations') = _('Iterations')
---
title: Expand left sidebar when viewing group iteration report
merge_request: 56358
author:
type: fixed
...@@ -33,6 +33,12 @@ RSpec.describe 'User views iteration' do ...@@ -33,6 +33,12 @@ RSpec.describe 'User views iteration' do
end end
it 'shows iteration info' do it 'shows iteration info' do
aggregate_failures 'expect Iterations highlighted on left sidebar' do
page.within '.qa-group-sidebar' do
expect(page).to have_css('li.active > a', text: 'Iterations')
end
end
aggregate_failures 'expect title, description, and dates' do aggregate_failures 'expect title, description, and dates' do
expect(page).to have_content(iteration.title) expect(page).to have_content(iteration.title)
expect(page).to have_content(iteration.description) expect(page).to have_content(iteration.description)
......
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