diff --git a/ee/lib/gitlab/elastic/group_search_results.rb b/ee/lib/gitlab/elastic/group_search_results.rb index e83c026ffb82d9aa70e7f954d40be4b79cd9b458..2d075f072ff69b658e6e1f7daf6d0a0c161c8dc9 100644 --- a/ee/lib/gitlab/elastic/group_search_results.rb +++ b/ee/lib/gitlab/elastic/group_search_results.rb @@ -31,7 +31,7 @@ def scope_options(scope) case scope when :users super.except(:group_ids) # User uses group_id for namespace_query - when :wiki_blobs, :work_items + when :wiki_blobs, :work_items, :epics super.merge(root_ancestor_ids: [group.root_ancestor.id]) else super diff --git a/ee/spec/features/search/elastic/group_search_spec.rb b/ee/spec/features/search/elastic/group_search_spec.rb index c96e15150481bfbad0d689086a316568c7d38d36..07ce76276e825787a6b03bc1860eeb635a236776 100644 --- a/ee/spec/features/search/elastic/group_search_spec.rb +++ b/ee/spec/features/search/elastic/group_search_spec.rb @@ -86,15 +86,13 @@ def choose_group(group) choose_group(group) end - it 'finds epics', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/500148' do - # issues + it 'finds epics' do submit_search('chosen') select_search_scope('Epics') expect(page).to have_content('chosen epic title') end it 'finds issues' do - # issues submit_search('chosen') select_search_scope('Issues') expect(page).to have_content('chosen issue title') diff --git a/ee/spec/lib/gitlab/elastic/group_search_results_spec.rb b/ee/spec/lib/gitlab/elastic/group_search_results_spec.rb index d2843de6d357667e6a1a8b67cd991f6287c0272e..669bbdbfed7b231722246d89d3fe8d214376517a 100644 --- a/ee/spec/lib/gitlab/elastic/group_search_results_spec.rb +++ b/ee/spec/lib/gitlab/elastic/group_search_results_spec.rb @@ -498,6 +498,18 @@ end end + context ':work_items' do + it 'has root_ancestor_ids' do + expect(subject.scope_options(:work_items)).to include :root_ancestor_ids + end + end + + context ':epics' do + it 'has root_ancestor_ids' do + expect(subject.scope_options(:epics)).to include :root_ancestor_ids + end + end + context ':wiki_blobs' do it 'has root_ancestor_ids' do expect(subject.scope_options(:wiki_blobs)).to include :root_ancestor_ids