Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/support/shared_examples/finders/issues_finder_shared_examples.rb b/spec/support/shared_examples/finders/issues_finder_shared_examples.rb
index 622a88e8323..9d8f37a3e64 100644
--- a/spec/support/shared_examples/finders/issues_finder_shared_examples.rb
+++ b/spec/support/shared_examples/finders/issues_finder_shared_examples.rb
@@ -269,6 +269,17 @@ RSpec.shared_examples 'issues or work items finder' do |factory, execute_context
         it 'returns items not assigned to that milestone' do
           expect(items).to contain_exactly(item2, item3, item4, item5)
         end
+
+        context 'with multiple milestones' do
+          let(:milestone2) { create(:milestone, project: project2) }
+          let(:params) { { not: { milestone_title: [milestone.title, milestone2.title] } } }
+
+          it 'returns items not assigned to both milestones' do
+            item2.update!(milestone: milestone2)
+
+            expect(items).to contain_exactly(item3, item4, item5)
+          end
+        end
       end
 
       context 'filtering by group milestone' do
@@ -962,7 +973,7 @@ RSpec.shared_examples 'issues or work items finder' do |factory, execute_context
         group = create(:group)
         project = create(:project, group: group)
         item = create(factory, project: project)
-        group.add_user(user, :owner)
+        group.add_member(user, :owner)
 
         expect(items).to include(item)
       end