[Multiple issue asignees] fix a few specs

app/services/issuable/bulk_update_service.rb

@@ -7,10 +7,14 @@ module Issuable
       ids = params.delete(:issuable_ids).split(",")
       items = model_class.where(id: ids)
 
-      %i(state_event milestone_id assignee_id add_label_ids remove_label_ids subscription_event).each do |key|
+      %i(state_event milestone_id assignee_id assignee_ids add_label_ids remove_label_ids subscription_event).each do |key|
         params.delete(key) unless params[key].present?
       end
 
+      if params[:assignee_ids] == [IssuableFinder::NONE.to_s]
+        params[:assignee_ids] = []
+      end
+
       items.each do |issuable|
         next unless can?(current_user, :"update_#{type}", issuable)
 

app/services/merge_requests/assign_issues_service.rb

@@ -14,7 +14,7 @@ module MergeRequests
 
     def execute
       assignable_issues.each do |issue|
-        Issues::UpdateService.new(issue.project, current_user, assignee_ids: current_user.id.to_s).execute(issue)
+        Issues::UpdateService.new(issue.project, current_user, assignee_ids: [current_user.id]).execute(issue)
       end
 
       {

app/services/system_note_service.rb

@@ -84,7 +84,6 @@ module SystemNoteService
     create_note(noteable: issue, project: project, author: author, note: body)
   end
 
-
   # Called when one or more labels on a Noteable are added and/or removed
   #
   # noteable       - Noteable object

spec/features/issues/award_emoji_spec.rb

@@ -7,7 +7,7 @@ describe 'Awards Emoji', feature: true do
   let!(:user)      { create(:user) }
   let(:issue) do
     create(:issue,
-           assignees: [@user],
+           assignees: [user],
            project: project)
   end
 

spec/features/issues_spec.rb

@@ -62,7 +62,7 @@ describe 'Issues', feature: true do
         expect(page).to have_content 'No assignee - assign yourself'
       end
 
-      expect(issue.reload.assignee).to be_nil
+      expect(issue.reload.assignees).to be_empty
     end
   end
 
@@ -363,9 +363,9 @@ describe 'Issues', feature: true do
       let(:user2) { create(:user) }
 
       before do
-        foo.assignee = user2
+        foo.assignees << user2
         foo.save
-        bar.assignee = user2
+        bar.assignees << user2
         bar.save
       end
 
@@ -440,7 +440,7 @@ describe 'Issues', feature: true do
           expect(page).to have_content 'No assignee'
         end
 
-        expect(issue.reload.assignee).to be_nil
+        expect(issue.reload.assignees).to be_empty
       end
 
       it 'allows user to select an assignee', js: true do
@@ -498,7 +498,7 @@ describe 'Issues', feature: true do
         login_with guest
 
         visit namespace_project_issue_path(project.namespace, project, issue)
-        expect(page).to have_content issue.assignee.name
+        expect(page).to have_content issue.assignees.first.name
       end
     end
   end
@@ -590,7 +590,7 @@ describe 'Issues', feature: true do
       let(:user2) { create(:user) }
 
       before do
-        issue.assignee = user2
+        issue.assignees << user2
         issue.save
       end
     end

spec/lib/banzai/filter/redactor_filter_spec.rb

@@ -103,7 +103,7 @@ describe Banzai::Filter::RedactorFilter, lib: true do
       it 'allows references for assignee' do
         assignee = create(:user)
         project = create(:empty_project, :public)
-        issue = create(:issue, :confidential, project: project, assignee: assignee)
+        issue = create(:issue, :confidential, project: project, assignees: [assignee])
 
         link = reference_link(project: project.id, issue: issue.id, reference_type: 'issue')
         doc = filter(link, current_user: assignee)

spec/models/user_spec.rb

@@ -24,7 +24,6 @@ describe User, models: true do
     it { is_expected.to have_many(:recent_events).class_name('Event') }
     it { is_expected.to have_many(:issues).dependent(:restrict_with_exception) }
     it { is_expected.to have_many(:notes).dependent(:destroy) }
-    it { is_expected.to have_many(:assigned_issues).dependent(:nullify) }
     it { is_expected.to have_many(:merge_requests).dependent(:destroy) }
     it { is_expected.to have_many(:assigned_merge_requests).dependent(:nullify) }
     it { is_expected.to have_many(:identities).dependent(:destroy) }

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

spec/services/issues/create_service_spec.rb

@@ -20,7 +20,7 @@ describe Issues::CreateService, services: true do
       let(:opts) do
         { title: 'Awesome issue',
           description: 'please fix',
-          assignee_ids: assignee.id.to_s,
+          assignee_ids: [assignee.id],
           label_ids: labels.map(&:id),
           milestone_id: milestone.id,
           due_date: Date.tomorrow }