[CE] Support multiple assignees for merge requests

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

12 files changed, 41 insertions, 25 deletions

diff --git a/spec/features/dashboard/issuables_counter_spec.rb b/spec/features/dashboard/issuables_counter_spec.rb
index fbc2e5cc3d3..50b71368e13 100644
--- a/spec/features/dashboard/issuables_counter_spec.rb
+++ b/spec/features/dashboard/issuables_counter_spec.rb
@@ -8,7 +8,7 @@ describe 'Navigation bar counter', :use_clean_rails_memory_store_caching do
 
   before do
     issue.assignees = [user]
-    merge_request.update(assignee: user)
+    merge_request.update(assignees: [user])
     sign_in(user)
   end
 
@@ -33,7 +33,7 @@ describe 'Navigation bar counter', :use_clean_rails_memory_store_caching do
 
     expect_counters('merge_requests', '1')
 
-    merge_request.update(assignee: nil)
+    merge_request.update(assignees: [])
 
     user.invalidate_cache_counts
 
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb
index 4965770605a..0c6713f623c 100644
--- a/spec/features/dashboard/merge_requests_spec.rb
+++ b/spec/features/dashboard/merge_requests_spec.rb
@@ -48,14 +48,14 @@ describe 'Dashboard Merge Requests' do
 
     let!(:assigned_merge_request) do
       create(:merge_request,
-        assignee: current_user,
+        assignees: [current_user],
         source_project: project,
         author: create(:user))
     end
 
     let!(:assigned_merge_request_from_fork) do
       create(:merge_request,
-              source_branch: 'markdown', assignee: current_user,
+              source_branch: 'markdown', assignees: [current_user],
               target_project: public_project, source_project: forked_project,
               author: create(:user))
     end
diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb
index 54a8016c157..e1bc4eca619 100644
--- a/spec/features/groups/merge_requests_spec.rb
+++ b/spec/features/groups/merge_requests_spec.rb
@@ -38,7 +38,7 @@ describe 'Group merge requests page' do
 
   context 'when merge request assignee to user' do
     before do
-      issuable.update!(assignee: user)
+      issuable.update!(assignees: [user])
 
       visit path
     end
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index 26c781350e5..6fa2ad8711f 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -30,8 +30,8 @@ describe 'New/edit issue', :js do
         # the original method, resulting in infinite recursion when called.
         # This is likely a bug with helper modules included into dynamically generated view classes.
         # To work around this, we have to hold on to and call to the original implementation manually.
-        original_issue_dropdown_options = FormHelper.instance_method(:issue_assignees_dropdown_options)
-        allow_any_instance_of(FormHelper).to receive(:issue_assignees_dropdown_options).and_wrap_original do |original, *args|
+        original_issue_dropdown_options = FormHelper.instance_method(:assignees_dropdown_options)
+        allow_any_instance_of(FormHelper).to receive(:assignees_dropdown_options).and_wrap_original do |original, *args|
           options = original_issue_dropdown_options.bind(original.receiver).call(*args)
           options[:data][:per_page] = 2
 
diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb
index ea2bb1503bb..bcc11217389 100644
--- a/spec/features/merge_request/user_creates_merge_request_spec.rb
+++ b/spec/features/merge_request/user_creates_merge_request_spec.rb
@@ -68,15 +68,15 @@ describe "User creates a merge request", :js do
         fill_in("Title", with: title)
       end
 
-      click_button("Assignee")
-
       expect(find(".js-assignee-search")["data-project-id"]).to eq(project.id.to_s)
+      find('.js-assignee-search').click
 
       page.within(".dropdown-menu-user") do
         expect(page).to have_content("Unassigned")
                    .and have_content(user.name)
                    .and have_content(project.users.first.name)
       end
+      find('.js-assignee-search').click
 
       click_button("Submit merge request")
 
diff --git a/spec/features/merge_request/user_creates_mr_spec.rb b/spec/features/merge_request/user_creates_mr_spec.rb
index c169a68cd1c..c9dedab048a 100644
--- a/spec/features/merge_request/user_creates_mr_spec.rb
+++ b/spec/features/merge_request/user_creates_mr_spec.rb
@@ -1,11 +1,18 @@
 require 'rails_helper'
 
 describe 'Merge request > User creates MR' do
-  it_behaves_like 'a creatable merge request'
+  include ProjectForksHelper
 
-  context 'from a forked project' do
-    include ProjectForksHelper
+  before do
+    stub_licensed_features(multiple_merge_request_assignees: false)
+  end
 
+  context 'non-fork merge request' do
+    include_context 'merge request create context'
+    it_behaves_like 'a creatable merge request'
+  end
+
+  context 'from a forked project' do
     let(:canonical_project) { create(:project, :public, :repository) }
 
     let(:source_project) do
@@ -15,6 +22,7 @@ describe 'Merge request > User creates MR' do
     end
 
     context 'to canonical project' do
+      include_context 'merge request create context'
       it_behaves_like 'a creatable merge request'
     end
 
@@ -25,6 +33,7 @@ describe 'Merge request > User creates MR' do
           namespace: user.namespace)
       end
 
+      include_context 'merge request create context'
       it_behaves_like 'a creatable merge request'
     end
   end
diff --git a/spec/features/merge_request/user_edits_mr_spec.rb b/spec/features/merge_request/user_edits_mr_spec.rb
index 3152707136c..25979513ead 100644
--- a/spec/features/merge_request/user_edits_mr_spec.rb
+++ b/spec/features/merge_request/user_edits_mr_spec.rb
@@ -1,13 +1,21 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User edits MR' do
   include ProjectForksHelper
 
-  it_behaves_like 'an editable merge request'
+  before do
+    stub_licensed_features(multiple_merge_request_assignees: false)
+  end
+
+  context 'non-fork merge request' do
+    include_context 'merge request edit context'
+    it_behaves_like 'an editable merge request'
+  end
 
   context 'for a forked project' do
-    it_behaves_like 'an editable merge request' do
-      let(:source_project) { fork_project(target_project, nil, repository: true) }
-    end
+    let(:source_project) { fork_project(target_project, nil, repository: true) }
+
+    include_context 'merge request edit context'
+    it_behaves_like 'an editable merge request'
   end
 end
diff --git a/spec/features/merge_requests/user_filters_by_assignees_spec.rb b/spec/features/merge_requests/user_filters_by_assignees_spec.rb
index d6c770c93f1..0cbf1bcae30 100644
--- a/spec/features/merge_requests/user_filters_by_assignees_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_assignees_spec.rb
@@ -7,7 +7,7 @@ describe 'Merge Requests > User filters by assignees', :js do
   let(:user)    { project.creator }
 
   before do
-    create(:merge_request, assignee: user, title: 'Bugfix1', source_project: project, target_project: project, source_branch: 'bugfix1')
+    create(:merge_request, assignees: [user], title: 'Bugfix1', source_project: project, target_project: project, source_branch: 'bugfix1')
     create(:merge_request, title: 'Bugfix2', source_project: project, target_project: project, source_branch: 'bugfix2')
 
     sign_in(user)
diff --git a/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb b/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb
index 1615899a047..4627931f26a 100644
--- a/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb
@@ -10,7 +10,7 @@ describe 'Merge requests > User filters by multiple criteria', :js do
 
   before do
     sign_in(user)
-    mr = create(:merge_request, title: 'Bugfix2', author: user, assignee: user, source_project: project, target_project: project, milestone: milestone)
+    mr = create(:merge_request, title: 'Bugfix2', author: user, assignees: [user], source_project: project, target_project: project, milestone: milestone)
     mr.labels << wontfix
 
     visit project_merge_requests_path(project)
diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
index c691011b9ca..bd91fae1453 100644
--- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
@@ -12,7 +12,7 @@ describe 'Merge requests > User lists merge requests' do
                   title: 'fix',
                   source_project: project,
                   source_branch: 'fix',
-                  assignee: user,
+                  assignees: [user],
                   milestone: create(:milestone, project: project, due_date: '2013-12-11'),
                   created_at: 1.minute.ago,
                   updated_at: 1.minute.ago)
@@ -20,7 +20,7 @@ describe 'Merge requests > User lists merge requests' do
            title: 'markdown',
            source_project: project,
            source_branch: 'markdown',
-           assignee: user,
+           assignees: [user],
            milestone: create(:milestone, project: project, due_date: '2013-12-12'),
            created_at: 2.minutes.ago,
            updated_at: 2.minutes.ago)
diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb
index e535c7e5811..c2dd105324d 100644
--- a/spec/features/merge_requests/user_mass_updates_spec.rb
+++ b/spec/features/merge_requests/user_mass_updates_spec.rb
@@ -54,8 +54,7 @@ describe 'Merge requests > User mass updates', :js do
 
     describe 'remove assignee' do
       before do
-        merge_request.assignee = user
-        merge_request.save
+        merge_request.assignees = [user]
         visit project_merge_requests_path(project)
       end
 
diff --git a/spec/features/search/user_uses_header_search_field_spec.rb b/spec/features/search/user_uses_header_search_field_spec.rb
index 444de26733f..1cc47cd6bd1 100644
--- a/spec/features/search/user_uses_header_search_field_spec.rb
+++ b/spec/features/search/user_uses_header_search_field_spec.rb
@@ -36,7 +36,7 @@ describe 'User uses header search field' do
     end
 
     context 'when clicking merge requests' do
-      let!(:merge_request) { create(:merge_request, source_project: project, author: user, assignee: user) }
+      let!(:merge_request) { create(:merge_request, source_project: project, author: user, assignees: [user]) }
 
       it 'shows assigned merge requests' do
         find('.search-input-container .dropdown-menu').click_link('Merge requests assigned to me')
@@ -100,7 +100,7 @@ describe 'User uses header search field' do
       end
 
       context 'when clicking merge requests' do
-        let!(:merge_request) { create(:merge_request, source_project: project, author: user, assignee: user) }
+        let!(:merge_request) { create(:merge_request, source_project: project, author: user, assignees: [user]) }
 
         it 'shows assigned merge requests' do
           find('.dropdown-menu').click_link('Merge requests assigned to me')