Backport of multiple_assignees_feature [ci skip]

1 files changed, 50 insertions, 12 deletions

diff --git a/spec/services/issuable/bulk_update_service_spec.rb b/spec/services/issuable/bulk_update_service_spec.rb
index 7a1ac027310..5b1639ca0d6 100644
--- a/spec/services/issuable/bulk_update_service_spec.rb
+++ b/spec/services/issuable/bulk_update_service_spec.rb
@@ -4,11 +4,12 @@ describe Issuable::BulkUpdateService, services: true do
   let(:user)    { create(:user) }
   let(:project) { create(:empty_project, namespace: user.namespace) }
 
-  def bulk_update(issues, extra_params = {})
+  def bulk_update(issuables, extra_params = {})
     bulk_update_params = extra_params
-      .reverse_merge(issuable_ids: Array(issues).map(&:id).join(','))
+      .reverse_merge(issuable_ids: Array(issuables).map(&:id).join(','))
 
-    Issuable::BulkUpdateService.new(project, user, bulk_update_params).execute('issue')
+    type = Array(issuables).first.model_name.param_key
+    Issuable::BulkUpdateService.new(project, user, bulk_update_params).execute(type)
   end
 
   describe 'close issues' do
@@ -47,15 +48,15 @@ describe Issuable::BulkUpdateService, services: true do
     end
   end
 
-  describe 'updating assignee' do
-    let(:issue) { create(:issue, project: project, assignee: user) }
+  describe 'updating merge request assignee' do
+    let(:merge_request) { create(:merge_request, target_project: project, source_project: project, assignee: user) }
 
     context 'when the new assignee ID is a valid user' do
       it 'succeeds' do
         new_assignee = create(:user)
         project.team << [new_assignee, :developer]
 
-        result = bulk_update(issue, assignee_id: new_assignee.id)
+        result = bulk_update(merge_request, assignee_id: new_assignee.id)
 
         expect(result[:success]).to be_truthy
         expect(result[:count]).to eq(1)
@@ -65,22 +66,59 @@ describe Issuable::BulkUpdateService, services: true do
         assignee = create(:user)
         project.team << [assignee, :developer]
 
-        expect { bulk_update(issue, assignee_id: assignee.id) }
-          .to change { issue.reload.assignee }.from(user).to(assignee)
+        expect { bulk_update(merge_request, assignee_id: assignee.id) }
+          .to change { merge_request.reload.assignee }.from(user).to(assignee)
       end
     end
 
     context "when the new assignee ID is #{IssuableFinder::NONE}" do
       it "unassigns the issues" do
-        expect { bulk_update(issue, assignee_id: IssuableFinder::NONE) }
-          .to change { issue.reload.assignee }.to(nil)
+        expect { bulk_update(merge_request, assignee_id: IssuableFinder::NONE) }
+          .to change { merge_request.reload.assignee }.to(nil)
       end
     end
 
     context 'when the new assignee ID is not present' do
       it 'does not unassign' do
-        expect { bulk_update(issue, assignee_id: nil) }
-          .not_to change { issue.reload.assignee }
+        expect { bulk_update(merge_request, assignee_id: nil) }
+          .not_to change { merge_request.reload.assignee }
+      end
+    end
+  end
+
+  describe 'updating issue assignee' do
+    let(:issue) { create(:issue, project: project, assignees: [user]) }
+
+    context 'when the new assignee ID is a valid user' do
+      it 'succeeds' do
+        new_assignee = create(:user)
+        project.team << [new_assignee, :developer]
+
+        result = bulk_update(issue, assignee_ids: [new_assignee.id])
+
+        expect(result[:success]).to be_truthy
+        expect(result[:count]).to eq(1)
+      end
+
+      it 'updates the assignee to the use ID passed' do
+        assignee = create(:user)
+        project.team << [assignee, :developer]
+        expect { bulk_update(issue, assignee_ids: [assignee.id]) }
+          .to change { issue.reload.assignees.first }.from(user).to(assignee)
+      end
+    end
+
+    context "when the new assignee ID is #{IssuableFinder::NONE}" do
+      it "unassigns the issues" do
+        expect { bulk_update(issue, assignee_ids: [IssuableFinder::NONE.to_s]) }
+          .to change { issue.reload.assignees.count }.from(1).to(0)
+      end
+    end
+
+    context 'when the new assignee ID is not present' do
+      it 'does not unassign' do
+        expect { bulk_update(issue, assignee_ids: []) }
+          .not_to change{ issue.reload.assignees }
       end
     end
   end