Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 12 insertions, 14 deletions

diff --git a/spec/requests/api/user_counts_spec.rb b/spec/requests/api/user_counts_spec.rb
index ab2aa87d1b7..369ae49de08 100644
--- a/spec/requests/api/user_counts_spec.rb
+++ b/spec/requests/api/user_counts_spec.rb
@@ -26,24 +26,22 @@ RSpec.describe API::UserCounts do
         expect(json_response['assigned_issues']).to eq(1)
       end
 
-      context 'merge requests' do
-        it 'returns assigned MR counts for current user' do
-          get api('/user_counts', user)
+      it 'returns assigned MR counts for current user' do
+        get api('/user_counts', user)
 
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response).to be_a Hash
-          expect(json_response['merge_requests']).to eq(1)
-        end
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response).to be_a Hash
+        expect(json_response['merge_requests']).to eq(1)
+      end
 
-        it 'updates the mr count when a new mr is assigned' do
-          create(:merge_request, source_project: project, author: user, assignees: [user])
+      it 'updates the mr count when a new mr is assigned' do
+        create(:merge_request, source_project: project, author: user, assignees: [user])
 
-          get api('/user_counts', user)
+        get api('/user_counts', user)
 
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response).to be_a Hash
-          expect(json_response['merge_requests']).to eq(2)
-        end
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response).to be_a Hash
+        expect(json_response['merge_requests']).to eq(2)
       end
 
       it 'returns pending todo counts for current_user' do