Merge branch 'remove_assignee_id' into 'master'

Remove issues.assignee_id column

Closes #30453

See merge request gitlab-org/gitlab-ce!11637

2 files changed, 38 insertions, 1 deletions

diff --git a/spec/migrations/remove_assignee_id_from_issue_spec.rb b/spec/migrations/remove_assignee_id_from_issue_spec.rb
new file mode 100644
index 00000000000..2c6f992d3ae
--- /dev/null
+++ b/spec/migrations/remove_assignee_id_from_issue_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20170523073948_remove_assignee_id_from_issue.rb')
+
+describe RemoveAssigneeIdFromIssue, :migration do
+  let(:issues) { table(:issues) }
+  let(:issue_assignees) { table(:issue_assignees) }
+  let(:users) { table(:users) }
+
+  let!(:user_1) { users.create(email: 'email1@example.com') }
+  let!(:user_2) { users.create(email: 'email2@example.com') }
+  let!(:user_3) { users.create(email: 'email3@example.com') }
+
+  def create_issue(assignees:)
+    issues.create.tap do |issue|
+      assignees.each do |assignee|
+        issue_assignees.create(issue_id: issue.id, user_id: assignee.id)
+      end
+    end
+  end
+
+  let!(:issue_single_assignee) { create_issue(assignees: [user_1]) }
+  let!(:issue_no_assignee) { create_issue(assignees: []) }
+  let!(:issue_multiple_assignees) { create_issue(assignees: [user_2, user_3]) }
+
+  describe '#down' do
+    it 'sets the assignee_id to a random matching assignee from the assignees table' do
+      migrate!
+      disable_migrations_output { described_class.new.down }
+
+      expect(issue_single_assignee.reload.assignee_id).to eq(user_1.id)
+      expect(issue_no_assignee.reload.assignee_id).to be_nil
+      expect(issue_multiple_assignees.reload.assignee_id).to eq(user_2.id).or(user_3.id)
+
+      disable_migrations_output { described_class.new.up }
+    end
+  end
+end
diff --git a/spec/services/members/authorized_destroy_service_spec.rb b/spec/services/members/authorized_destroy_service_spec.rb
index 2d04d824180..d4ef31c0c74 100644
--- a/spec/services/members/authorized_destroy_service_spec.rb
+++ b/spec/services/members/authorized_destroy_service_spec.rb
@@ -45,7 +45,7 @@ describe Members::AuthorizedDestroyService do
       expect { described_class.new(member, member_user).execute }
         .to change { number_of_assigned_issuables(member_user) }.from(4).to(2)
 
-      expect(issue.reload.assignee_id).to be_nil
+      expect(issue.reload.assignee_ids).to be_empty
       expect(merge_request.reload.assignee_id).to be_nil
     end
   end