Merge branch '31914-support-multiple-query-on-todos-finder-type-pd' into 'master'

Add spec for filtering by multiple types

See merge request gitlab-org/gitlab!18489

spec/finders/todos_finder_spec.rb

@@ -36,12 +36,20 @@ describe TodosFinder do
           expect(todos).to match_array([todo1, todo2])
         end
 
+        context 'when filtering by type' do
           it 'returns correct todos when filtered by a type' do
             todos = finder.new(user, { type: 'Issue' }).execute
 
             expect(todos).to match_array([todo1])
           end
 
+          it 'returns the correct todos when filtering for multiple types' do
+            todos = finder.new(user, { type: %w[Issue MergeRequest] }).execute
+
+            expect(todos).to match_array([todo1, todo2])
+          end
+        end
+
         context 'when filtering for actions' do
           let!(:todo1) { create(:todo, user: user, project: project, target: issue, action: Todo::ASSIGNED) }
           let!(:todo2) { create(:todo, user: user, group: group, target: merge_request, action: Todo::DIRECTLY_ADDRESSED) }
@@ -53,14 +61,12 @@ describe TodosFinder do
               expect(todos).to match_array([todo2])
             end
 
-            context 'multiple actions' do
-              it 'returns the expected todos' do
+            it 'returns the expected todos when filtering for multiple action ids' do
               todos = finder.new(user, { action_id: [Todo::DIRECTLY_ADDRESSED, Todo::ASSIGNED] }).execute
 
               expect(todos).to match_array([todo2, todo1])
             end
           end
-          end
 
           context 'by action names' do
             it 'returns the expected todos' do
@@ -69,15 +75,13 @@ describe TodosFinder do
               expect(todos).to match_array([todo2])
             end
 
-            context 'multiple actions' do
-              it 'returns the expected todos' do
+            it 'returns the expected todos when filtering for multiple action names' do
               todos = finder.new(user, { action: [:directly_addressed, :assigned] }).execute
 
               expect(todos).to match_array([todo2, todo1])
             end
           end
         end
-        end
 
         context 'when filtering by author' do
           let(:author1) { create(:user) }