Merge branch '222763-show-ancestor-iterations-in-subgroups' into 'master'

Show ancestor iterations in subgroups

See merge request gitlab-org/gitlab!40990

ee/app/assets/javascripts/iterations/queries/iterations.query.graphql

@@ -13,7 +13,6 @@ query Iterations(
   group(fullPath: $fullPath) @include(if: $isGroup) {
     iterations(
       state: $state
-      includeAncestors: false
       before: $beforeCursor
       after: $afterCursor
       first: $firstPageSize

ee/changelogs/unreleased/222763-show-ancestor-iterations-in-subgroups.yml

+---
+title: Show ancestor iterations in subgroups
+merge_request: 40990
+author:
+type: changed

ee/spec/features/groups/iterations/iterations_list_spec.rb

@@ -5,12 +5,15 @@ require 'spec_helper'
 RSpec.describe 'Iterations list', :js do
   let(:now) { Time.now }
   let_it_be(:group) { create(:group) }
+  let_it_be(:subgroup) { create(:group, parent: group) }
   let_it_be(:user) { create(:user) }
   let!(:started_iteration) { create(:iteration, :skip_future_date_validation, group: group, start_date: now - 1.day, due_date: now, title: 'Started iteration') }
   let!(:upcoming_iteration) { create(:iteration, group: group, start_date: now + 1.day, due_date: now + 2.days) }
   let!(:closed_iteration) { create(:closed_iteration, :skip_future_date_validation, group: group, start_date: now - 3.days, due_date: now - 2.days) }
+  let!(:subgroup_iteration) { create(:iteration, :skip_future_date_validation, group: subgroup, start_date: now - 5.days, due_date: now - 4.days) }
 
   context 'as guest' do
+    context 'when in group' do
       before do
         visit group_iterations_path(group)
       end
@@ -20,21 +23,30 @@ RSpec.describe 'Iterations list', :js do
       end
 
       it 'shows iterations on each tab' do
+        aggregate_failures do
           expect(page).to have_link(started_iteration.title)
           expect(page).to have_link(upcoming_iteration.title)
           expect(page).not_to have_link(closed_iteration.title)
+          expect(page).not_to have_link(subgroup_iteration.title)
+        end
 
         click_link('Closed')
 
+        aggregate_failures do
           expect(page).to have_link(closed_iteration.title)
           expect(page).not_to have_link(started_iteration.title)
           expect(page).not_to have_link(upcoming_iteration.title)
+          expect(page).not_to have_link(subgroup_iteration.title)
+        end
 
         click_link('All')
 
+        aggregate_failures do
           expect(page).to have_link(started_iteration.title)
           expect(page).to have_link(upcoming_iteration.title)
           expect(page).to have_link(closed_iteration.title)
+          expect(page).not_to have_link(subgroup_iteration.title)
+        end
       end
 
       context 'when an iteration is clicked' do
@@ -48,6 +60,40 @@ RSpec.describe 'Iterations list', :js do
       end
     end
 
+    context 'when in subgroup' do
+      before do
+        visit group_iterations_path(subgroup)
+      end
+
+      it 'shows iterations on each tab including ancestor iterations' do
+        aggregate_failures do
+          expect(page).to have_link(started_iteration.title)
+          expect(page).to have_link(upcoming_iteration.title)
+          expect(page).not_to have_link(closed_iteration.title)
+          expect(page).to have_link(subgroup_iteration.title)
+        end
+
+        click_link('Closed')
+
+        aggregate_failures do
+          expect(page).to have_link(closed_iteration.title)
+          expect(page).not_to have_link(started_iteration.title)
+          expect(page).not_to have_link(upcoming_iteration.title)
+          expect(page).not_to have_link(subgroup_iteration.title)
+        end
+
+        click_link('All')
+
+        aggregate_failures do
+          expect(page).to have_link(started_iteration.title)
+          expect(page).to have_link(upcoming_iteration.title)
+          expect(page).to have_link(closed_iteration.title)
+          expect(page).to have_link(subgroup_iteration.title)
+        end
+      end
+    end
+  end
+
   context 'as user' do
     before do
       stub_licensed_features(iterations: true)