[CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requests

Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).

2 files changed, 57 insertions, 56 deletions

diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index fe53fabe54c..6e6dc334354 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -13,60 +13,32 @@ describe IssuesFinder do
         expect(issues).to contain_exactly(issue1, issue2, issue3, issue4)
       end
 
-      context 'filtering by assignee ID' do
-        let(:params) { { assignee_id: user.id } }
+      context 'assignee filtering' do
+        let(:issuables) { issues }
 
-        it 'returns issues assigned to that user' do
-          expect(issues).to contain_exactly(issue1, issue2)
-        end
-      end
-
-      context 'filtering by assignee usernames' do
-        set(:user3) { create(:user) }
-        let(:params) { { assignee_username: [user2.username, user3.username] } }
-
-        before do
-          project2.add_developer(user3)
-
-          issue3.assignees = [user2, user3]
-        end
-
-        it 'returns issues assigned to those users' do
-          expect(issues).to contain_exactly(issue3)
-        end
-      end
-
-      context 'filtering by no assignee' do
-        let(:params) { { assignee_id: 'None' } }
-
-        it 'returns issues not assigned to any assignee' do
-          expect(issues).to contain_exactly(issue4)
-        end
-
-        it 'returns issues not assigned to any assignee' do
-          params[:assignee_id] = 0
-
-          expect(issues).to contain_exactly(issue4)
+        it_behaves_like 'assignee ID filter' do
+          let(:params) { { assignee_id: user.id } }
+          let(:expected_issuables) { [issue1, issue2] }
         end
 
-        it 'returns issues not assigned to any assignee' do
-          params[:assignee_id] = 'none'
+        it_behaves_like 'assignee username filter' do
+          before do
+            project2.add_developer(user3)
+            issue3.assignees = [user2, user3]
+          end
 
-          expect(issues).to contain_exactly(issue4)
+          set(:user3) { create(:user) }
+          let(:params) { { assignee_username: [user2.username, user3.username] } }
+          let(:expected_issuables) { [issue3] }
         end
-      end
 
-      context 'filtering by any assignee' do
-        let(:params) { { assignee_id: 'Any' } }
-
-        it 'returns issues assigned to any assignee' do
-          expect(issues).to contain_exactly(issue1, issue2, issue3)
+        it_behaves_like 'no assignee filter' do
+          set(:user3) { create(:user) }
+          let(:expected_issuables) { [issue4] }
         end
 
-        it 'returns issues assigned to any assignee' do
-          params[:assignee_id] = 'any'
-
-          expect(issues).to contain_exactly(issue1, issue2, issue3)
+        it_behaves_like 'any assignee filter' do
+          let(:expected_issuables) { [issue1, issue2, issue3] }
         end
       end
 
diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
index f508b9bdb6f..ef002125635 100644
--- a/spec/finders/merge_requests_finder_spec.rb
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -136,21 +136,50 @@ describe MergeRequestsFinder do
         end
       end
 
-      context 'filtering by group milestone' do
-        let(:group_milestone) { create(:milestone, group: group) }
+      context 'assignee filtering' do
+        let(:issuables) { described_class.new(user, params).execute }
 
-        before do
-          project2.update(namespace: group)
-          merge_request2.update(milestone: group_milestone)
-          merge_request3.update(milestone: group_milestone)
+        it_behaves_like 'assignee ID filter' do
+          let(:params) { { assignee_id: user.id } }
+          let(:expected_issuables) { [merge_request1, merge_request2] }
         end
 
-        it 'returns merge requests assigned to that group milestone' do
-          params = { milestone_title: group_milestone.title }
+        it_behaves_like 'assignee username filter' do
+          before do
+            project2.add_developer(user3)
+            merge_request3.assignees = [user2, user3]
+          end
 
-          merge_requests = described_class.new(user, params).execute
+          set(:user3) { create(:user) }
+          let(:params) { { assignee_username: [user2.username, user3.username] } }
+          let(:expected_issuables) { [merge_request3] }
+        end
+
+        it_behaves_like 'no assignee filter' do
+          set(:user3) { create(:user) }
+          let(:expected_issuables) { [merge_request4, merge_request5] }
+        end
+
+        it_behaves_like 'any assignee filter' do
+          let(:expected_issuables) { [merge_request1, merge_request2, merge_request3] }
+        end
+
+        context 'filtering by group milestone' do
+          let(:group_milestone) { create(:milestone, group: group) }
+
+          before do
+            project2.update(namespace: group)
+            merge_request2.update(milestone: group_milestone)
+            merge_request3.update(milestone: group_milestone)
+          end
+
+          it 'returns merge requests assigned to that group milestone' do
+            params = { milestone_title: group_milestone.title }
 
-          expect(merge_requests).to contain_exactly(merge_request2, merge_request3)
+            merge_requests = described_class.new(user, params).execute
+
+            expect(merge_requests).to contain_exactly(merge_request2, merge_request3)
+          end
         end
       end