From 95a6825e19809cae0cee779c0ca3667b233a58f4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 7 Feb 2023 06:08:04 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/controllers/groups_controller_spec.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'spec/controllers') diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 91a4336b800..fa46a4aab2d 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -562,6 +562,21 @@ RSpec.describe GroupsController, factory_default: :keep, feature_category: :code expect(response.body).to have_content('Open 2 Merged 0 Closed 0 All 2') expect(response.body).not_to have_content('Open Merged Closed All') end + + context 'when MergeRequestsFinder raises an exception' do + before do + allow_next_instance_of(MergeRequestsFinder) do |instance| + allow(instance).to receive(:count_by_state).and_raise(ActiveRecord::QueryCanceled) + end + end + + it 'does not display MR counts in nav' do + get :merge_requests, params: { id: group.to_param } + + expect(response.body).to have_content('Open Merged Closed All') + expect(response.body).not_to have_content('Open 0 Merged 0 Closed 0 All 0') + end + end end context 'when an ActiveRecord::QueryCanceled is raised' do -- cgit v1.2.3