From 387c4b2c21a44360386a9b8ce6849e7f1b8a3de9 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Thu, 4 May 2017 15:11:15 +0300
Subject: Backport of multiple_assignees_feature [ci skip]

---
 spec/features/atom/dashboard_issues_spec.rb        |  8 ++--
 spec/features/atom/issues_spec.rb                  |  6 +--
 spec/features/boards/boards_spec.rb                |  2 +-
 spec/features/boards/modal_filter_spec.rb          |  2 +-
 spec/features/boards/sidebar_spec.rb               | 35 +++++++++++---
 spec/features/dashboard/issuables_counter_spec.rb  |  4 +-
 spec/features/dashboard/issues_spec.rb             |  7 ++-
 spec/features/dashboard_issues_spec.rb             |  4 +-
 spec/features/gitlab_flavored_markdown_spec.rb     |  4 +-
 spec/features/issues/award_emoji_spec.rb           |  2 +-
 .../issues/filtered_search/filter_issues_spec.rb   | 11 +++--
 spec/features/issues/form_spec.rb                  | 54 +++++++++++++++++++---
 spec/features/issues/issue_sidebar_spec.rb         | 15 ++++++
 spec/features/issues/update_issues_spec.rb         |  2 +-
 spec/features/issues_spec.rb                       | 40 +++++++++-------
 spec/features/merge_requests/assign_issues_spec.rb |  2 +-
 spec/features/milestones/show_spec.rb              |  2 +-
 spec/features/projects/issuable_templates_spec.rb  |  4 +-
 spec/features/search_spec.rb                       |  2 +-
 spec/features/unsubscribe_links_spec.rb            |  2 +-
 20 files changed, 150 insertions(+), 58 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/atom/dashboard_issues_spec.rb b/spec/features/atom/dashboard_issues_spec.rb
index 58b14e09740..9ea325ab41b 100644
--- a/spec/features/atom/dashboard_issues_spec.rb
+++ b/spec/features/atom/dashboard_issues_spec.rb
@@ -32,7 +32,7 @@ describe "Dashboard Issues Feed", feature: true  do
       end
 
       context "issue with basic fields" do
-        let!(:issue2) { create(:issue, author: user, assignee: assignee, project: project2, description: 'test desc') }
+        let!(:issue2) { create(:issue, author: user, assignees: [assignee], project: project2, description: 'test desc') }
 
         it "renders issue fields" do
           visit issues_dashboard_path(:atom, private_token: user.private_token)
@@ -41,7 +41,7 @@ describe "Dashboard Issues Feed", feature: true  do
 
           expect(entry).to be_present
           expect(entry).to have_selector('author email', text: issue2.author_public_email)
-          expect(entry).to have_selector('assignee email', text: issue2.assignee_public_email)
+          expect(entry).to have_selector('assignees email', text: assignee.public_email)
           expect(entry).not_to have_selector('labels')
           expect(entry).not_to have_selector('milestone')
           expect(entry).to have_selector('description', text: issue2.description)
@@ -51,7 +51,7 @@ describe "Dashboard Issues Feed", feature: true  do
       context "issue with label and milestone" do
         let!(:milestone1) { create(:milestone, project: project1, title: 'v1') }
         let!(:label1)     { create(:label, project: project1, title: 'label1') }
-        let!(:issue1)     { create(:issue, author: user, assignee: assignee, project: project1, milestone: milestone1) }
+        let!(:issue1)     { create(:issue, author: user, assignees: [assignee], project: project1, milestone: milestone1) }
 
         before do
           issue1.labels << label1
@@ -64,7 +64,7 @@ describe "Dashboard Issues Feed", feature: true  do
 
           expect(entry).to be_present
           expect(entry).to have_selector('author email', text: issue1.author_public_email)
-          expect(entry).to have_selector('assignee email', text: issue1.assignee_public_email)
+          expect(entry).to have_selector('assignees email', text: assignee.public_email)
           expect(entry).to have_selector('labels label', text: label1.title)
           expect(entry).to have_selector('milestone', text: milestone1.title)
           expect(entry).not_to have_selector('description')
diff --git a/spec/features/atom/issues_spec.rb b/spec/features/atom/issues_spec.rb
index b3903ec2faf..78f8f46a04e 100644
--- a/spec/features/atom/issues_spec.rb
+++ b/spec/features/atom/issues_spec.rb
@@ -6,7 +6,7 @@ describe 'Issues Feed', feature: true  do
     let!(:assignee) { create(:user, email: 'private2@example.com', public_email: 'public2@example.com') }
     let!(:group)    { create(:group) }
     let!(:project)  { create(:project) }
-    let!(:issue)    { create(:issue, author: user, assignee: assignee, project: project) }
+    let!(:issue)    { create(:issue, author: user, assignees: [assignee], project: project) }
 
     before do
       project.team << [user, :developer]
@@ -22,7 +22,7 @@ describe 'Issues Feed', feature: true  do
           to have_content('application/atom+xml')
         expect(body).to have_selector('title', text: "#{project.name} issues")
         expect(body).to have_selector('author email', text: issue.author_public_email)
-        expect(body).to have_selector('assignee email', text: issue.author_public_email)
+        expect(body).to have_selector('assignees email', text: issue.author_public_email)
         expect(body).to have_selector('entry summary', text: issue.title)
       end
     end
@@ -36,7 +36,7 @@ describe 'Issues Feed', feature: true  do
           to have_content('application/atom+xml')
         expect(body).to have_selector('title', text: "#{project.name} issues")
         expect(body).to have_selector('author email', text: issue.author_public_email)
-        expect(body).to have_selector('assignee email', text: issue.author_public_email)
+        expect(body).to have_selector('assignees email', text: issue.author_public_email)
         expect(body).to have_selector('entry summary', text: issue.title)
       end
     end
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index a172ce1e8c0..18585488e26 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -71,7 +71,7 @@ describe 'Issue Boards', feature: true, js: true do
     let!(:list2) { create(:list, board: board, label: development, position: 1) }
 
     let!(:confidential_issue) { create(:labeled_issue, :confidential, project: project, author: user, labels: [planning], relative_position: 9) }
-    let!(:issue1) { create(:labeled_issue, project: project, assignee: user, labels: [planning], relative_position: 8) }
+    let!(:issue1) { create(:labeled_issue, project: project, assignees: [user], labels: [planning], relative_position: 8) }
     let!(:issue2) { create(:labeled_issue, project: project, author: user2, labels: [planning], relative_position: 7) }
     let!(:issue3) { create(:labeled_issue, project: project, labels: [planning], relative_position: 6) }
     let!(:issue4) { create(:labeled_issue, project: project, labels: [planning], relative_position: 5) }
diff --git a/spec/features/boards/modal_filter_spec.rb b/spec/features/boards/modal_filter_spec.rb
index 4a4c13e79c8..e1367c675e5 100644
--- a/spec/features/boards/modal_filter_spec.rb
+++ b/spec/features/boards/modal_filter_spec.rb
@@ -98,7 +98,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
   end
 
   context 'assignee' do
-    let!(:issue) { create(:issue, project: project, assignee: user2) }
+    let!(:issue) { create(:issue, project: project, assignees: [user2]) }
 
     before do
       project.team << [user2, :developer]
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index bafa4f05937..02b6b5dc888 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -4,13 +4,14 @@ describe 'Issue Boards', feature: true, js: true do
   include WaitForVueResource
 
   let(:user)         { create(:user) }
+  let(:user2)        { create(:user) }
   let(:project)      { create(:empty_project, :public) }
   let!(:milestone)   { create(:milestone, project: project) }
   let!(:development) { create(:label, project: project, name: 'Development') }
   let!(:bug)         { create(:label, project: project, name: 'Bug') }
   let!(:regression)  { create(:label, project: project, name: 'Regression') }
   let!(:stretch)     { create(:label, project: project, name: 'Stretch') }
-  let!(:issue1)      { create(:labeled_issue, project: project, assignee: user, milestone: milestone, labels: [development], relative_position: 2) }
+  let!(:issue1)      { create(:labeled_issue, project: project, assignees: [user], milestone: milestone, labels: [development], relative_position: 2) }
   let!(:issue2)      { create(:labeled_issue, project: project, labels: [development, stretch], relative_position: 1) }
   let(:board)        { create(:board, project: project) }
   let!(:list)        { create(:list, board: board, label: development, position: 0) }
@@ -20,6 +21,7 @@ describe 'Issue Boards', feature: true, js: true do
     Timecop.freeze
 
     project.team << [user, :master]
+    project.team.add_developer(user2)
 
     login_as(user)
 
@@ -101,6 +103,26 @@ describe 'Issue Boards', feature: true, js: true do
       expect(card).to have_selector('.avatar')
     end
 
+    it 'adds multiple assignees' do
+      click_card(card)
+
+      page.within('.assignee') do
+        click_link 'Edit'
+
+        wait_for_ajax
+
+        page.within('.dropdown-menu-user') do
+          click_link user.name
+          click_link user2.name
+        end
+
+        expect(page).to have_content(user.name)
+        expect(page).to have_content(user2.name)
+      end
+
+      expect(card.all('.avatar').length).to eq(2)
+    end
+
     it 'removes the assignee' do
       card_two = first('.board').find('.card:nth-child(2)')
       click_card(card_two)
@@ -112,10 +134,11 @@ describe 'Issue Boards', feature: true, js: true do
 
         page.within('.dropdown-menu-user') do
           click_link 'Unassigned'
-
-          wait_for_vue_resource
         end
 
+        find('.dropdown-menu-toggle').click
+        wait_for_vue_resource
+
         expect(page).to have_content('No assignee')
       end
 
@@ -128,7 +151,7 @@ describe 'Issue Boards', feature: true, js: true do
       page.within(find('.assignee')) do
         expect(page).to have_content('No assignee')
 
-        click_link 'assign yourself'
+        click_button 'assign yourself'
 
         wait_for_vue_resource
 
@@ -138,7 +161,7 @@ describe 'Issue Boards', feature: true, js: true do
       expect(card).to have_selector('.avatar')
     end
 
-    it 'resets assignee dropdown' do
+    it 'updates assignee dropdown' do
       click_card(card)
 
       page.within('.assignee') do
@@ -162,7 +185,7 @@ describe 'Issue Boards', feature: true, js: true do
       page.within('.assignee') do
         click_link 'Edit'
 
-        expect(page).not_to have_selector('.is-active')
+        expect(page).to have_selector('.is-active')
       end
     end
   end
diff --git a/spec/features/dashboard/issuables_counter_spec.rb b/spec/features/dashboard/issuables_counter_spec.rb
index 4fca7577e74..3d536c5ba40 100644
--- a/spec/features/dashboard/issuables_counter_spec.rb
+++ b/spec/features/dashboard/issuables_counter_spec.rb
@@ -7,7 +7,7 @@ describe 'Navigation bar counter', feature: true, caching: true do
   let(:merge_request) { create(:merge_request, source_project: project) }
 
   before do
-    issue.update(assignee: user)
+    issue.assignees = [user]
     merge_request.update(assignee: user)
     login_as(user)
   end
@@ -17,7 +17,7 @@ describe 'Navigation bar counter', feature: true, caching: true do
 
     expect_counters('issues', '1')
 
-    issue.update(assignee: nil)
+    issue.assignees = []
 
     Timecop.travel(3.minutes.from_now) do
       visit issues_path
diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb
index f4420814c3a..86c7954e60c 100644
--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe 'Dashboard Issues', feature: true do
 
   let!(:authored_issue) { create :issue, author: current_user, project: project }
   let!(:authored_issue_on_public_project) { create :issue, author: current_user, project: public_project }
-  let!(:assigned_issue) { create :issue, assignee: current_user, project: project }
+  let!(:assigned_issue) { create :issue, assignees: [current_user], project: project }
   let!(:other_issue) { create :issue, project: project }
 
   before do
@@ -30,6 +30,11 @@ RSpec.describe 'Dashboard Issues', feature: true do
     find('#assignee_id', visible: false).set('')
     find('.js-author-search', match: :first).click
     find('.dropdown-menu-author li a', match: :first, text: current_user.to_reference).click
+    find('.js-author-search', match: :first).click
+
+    page.within '.dropdown-menu-user' do
+      expect(find('.dropdown-menu-author li a.is-active', match: :first, text: current_user.to_reference)).to be_visible
+    end
 
     expect(page).to have_content(authored_issue.title)
     expect(page).to have_content(authored_issue_on_public_project.title)
diff --git a/spec/features/dashboard_issues_spec.rb b/spec/features/dashboard_issues_spec.rb
index b6b87905231..ad60fb2c74f 100644
--- a/spec/features/dashboard_issues_spec.rb
+++ b/spec/features/dashboard_issues_spec.rb
@@ -10,8 +10,8 @@ describe "Dashboard Issues filtering", feature: true, js: true do
       project.team << [user, :master]
       login_as(user)
 
-      create(:issue, project: project, author: user, assignee: user)
-      create(:issue, project: project, author: user, assignee: user, milestone: milestone)
+      create(:issue, project: project, author: user, assignees: [user])
+      create(:issue, project: project, author: user, assignees: [user], milestone: milestone)
 
       visit_issues
     end
diff --git a/spec/features/gitlab_flavored_markdown_spec.rb b/spec/features/gitlab_flavored_markdown_spec.rb
index f5b54463df8..005a029a393 100644
--- a/spec/features/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/gitlab_flavored_markdown_spec.rb
@@ -54,11 +54,11 @@ describe "GitLab Flavored Markdown", feature: true do
     before do
       @other_issue = create(:issue,
                             author: @user,
-                            assignee: @user,
+                            assignees: [@user],
                             project: project)
       @issue = create(:issue,
                       author: @user,
-                      assignee: @user,
+                      assignees: [@user],
                       project: project,
                       title: "fix #{@other_issue.to_reference}",
                       description: "ask #{fred.to_reference} for details")
diff --git a/spec/features/issues/award_emoji_spec.rb b/spec/features/issues/award_emoji_spec.rb
index 71df3c949db..853632614c4 100644
--- a/spec/features/issues/award_emoji_spec.rb
+++ b/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,
-           assignee: @user,
+           assignees: [user],
            project: project)
   end
 
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb
index c824aa6a414..ece62c8da41 100644
--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -51,15 +51,16 @@ describe 'Filter issues', js: true, feature: true do
     create(:issue, project: project, title: "issue with 'single quotes'")
     create(:issue, project: project, title: "issue with \"double quotes\"")
     create(:issue, project: project, title: "issue with !@\#{$%^&*()-+")
-    create(:issue, project: project, title: "issue by assignee", milestone: milestone, author: user, assignee: user)
-    create(:issue, project: project, title: "issue by assignee with searchTerm", milestone: milestone, author: user, assignee: user)
+    create(:issue, project: project, title: "issue by assignee", milestone: milestone, author: user, assignees: [user])
+    create(:issue, project: project, title: "issue by assignee with searchTerm", milestone: milestone, author: user, assignees: [user])
+
 
     issue = create(:issue,
       title: "Bug 2",
       project: project,
       milestone: milestone,
       author: user,
-      assignee: user)
+      assignees: [user])
     issue.labels << bug_label
 
     issue_with_caps_label = create(:issue,
@@ -67,7 +68,7 @@ describe 'Filter issues', js: true, feature: true do
       project: project,
       milestone: milestone,
       author: user,
-      assignee: user)
+      assignees: [user])
     issue_with_caps_label.labels << caps_sensitive_label
 
     issue_with_everything = create(:issue,
@@ -75,7 +76,7 @@ describe 'Filter issues', js: true, feature: true do
       project: project,
       milestone: milestone,
       author: user,
-      assignee: user)
+      assignees: [user])
     issue_with_everything.labels << bug_label
     issue_with_everything.labels << caps_sensitive_label
 
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index 21b8cf3add5..5798292033b 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -10,7 +10,7 @@ describe 'New/edit issue', feature: true, js: true do
   let!(:milestone) { create(:milestone, project: project) }
   let!(:label)     { create(:label, project: project) }
   let!(:label2)    { create(:label, project: project) }
-  let!(:issue)     { create(:issue, project: project, assignee: user, milestone: milestone) }
+  let!(:issue)     { create(:issue, project: project, assignees: [user], milestone: milestone) }
 
   before do
     project.team << [user, :master]
@@ -23,25 +23,65 @@ describe 'New/edit issue', feature: true, js: true do
       visit new_namespace_project_issue_path(project.namespace, project)
     end
 
+    describe 'multiple assignees' do
+      before do
+        click_button 'Unassigned'
+      end
+
+      it 'unselects other assignees when unassigned is selected' do
+        page.within '.dropdown-menu-user' do
+          click_link user2.name
+        end
+
+        page.within '.dropdown-menu-user' do
+          click_link 'Unassigned'
+        end
+
+        page.within '.js-assignee-search' do
+          expect(page).to have_content 'Unassigned'
+        end
+
+        expect(find('input[name="issue[assignee_ids][]"]', visible: false).value).to match('0')
+      end
+
+      it 'toggles assign to me when current user is selected and unselected' do
+        page.within '.dropdown-menu-user' do
+          click_link user.name
+        end
+
+        expect(find('a', text: 'Assign to me', visible: false)).not_to be_visible
+
+        page.within '.dropdown-menu-user' do
+          click_link user.name
+        end
+
+        expect(find('a', text: 'Assign to me')).to be_visible
+      end
+    end
+
     it 'allows user to create new issue' do
       fill_in 'issue_title', with: 'title'
       fill_in 'issue_description', with: 'title'
 
       expect(find('a', text: 'Assign to me')).to be_visible
-      click_button 'Assignee'
+      click_button 'Unassigned'
       page.within '.dropdown-menu-user' do
         click_link user2.name
       end
-      expect(find('input[name="issue[assignee_id]"]', visible: false).value).to match(user2.id.to_s)
+      expect(find('input[name="issue[assignee_ids][]"]', visible: false).value).to match(user2.id.to_s)
       page.within '.js-assignee-search' do
         expect(page).to have_content user2.name
       end
       expect(find('a', text: 'Assign to me')).to be_visible
 
       click_link 'Assign to me'
-      expect(find('input[name="issue[assignee_id]"]', visible: false).value).to match(user.id.to_s)
+      assignee_ids = page.all('input[name="issue[assignee_ids][]"]', visible: false)
+
+      expect(assignee_ids[0].value).to match(user2.id.to_s)
+      expect(assignee_ids[1].value).to match(user.id.to_s)
+
       page.within '.js-assignee-search' do
-        expect(page).to have_content user.name
+        expect(page).to have_content "#{user2.name} + 1 more"
       end
       expect(find('a', text: 'Assign to me', visible: false)).not_to be_visible
 
@@ -69,7 +109,7 @@ describe 'New/edit issue', feature: true, js: true do
 
       page.within '.issuable-sidebar' do
         page.within '.assignee' do
-          expect(page).to have_content user.name
+          expect(page).to have_content "2 Assignees"
         end
 
         page.within '.milestone' do
@@ -141,7 +181,7 @@ describe 'New/edit issue', feature: true, js: true do
     end
 
     it 'allows user to update issue' do
-      expect(find('input[name="issue[assignee_id]"]', visible: false).value).to match(user.id.to_s)
+      expect(find('input[name="issue[assignee_ids][]"]', visible: false).value).to match(user.id.to_s)
       expect(find('input[name="issue[milestone_id]"]', visible: false).value).to match(milestone.id.to_s)
       expect(find('a', text: 'Assign to me', visible: false)).not_to be_visible
 
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index 82b80a69bed..e9a05f56543 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -42,6 +42,21 @@ feature 'Issue Sidebar', feature: true do
         expect(page).to have_content(user2.name)
       end
     end
+
+    it 'assigns yourself' do
+      find('.block.assignee .dropdown-menu-toggle').click
+
+      click_button 'assign yourself'
+
+      wait_for_ajax
+
+      find('.block.assignee .edit-link').click
+
+      page.within '.dropdown-menu-user' do
+        expect(page.find('.dropdown-header')).to be_visible
+        expect(page.find('.dropdown-menu-user-link.is-active')).to have_content(user.name)
+      end
+    end
   end
 
   context 'as a allowed user' do
diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index 7fa83c1fcf7..b250fa2ed3c 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -99,7 +99,7 @@ feature 'Multiple issue updating from issues#index', feature: true do
   end
 
   def create_assigned
-    create(:issue, project: project, assignee: user)
+    create(:issue, project: project, assignees: [user])
   end
 
   def create_with_milestone
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 81cc8513454..cc81303f032 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -18,7 +18,7 @@ describe 'Issues', feature: true do
     let!(:issue) do
       create(:issue,
              author: @user,
-             assignee: @user,
+             assignees: [@user],
              project: project)
     end
 
@@ -43,7 +43,7 @@ describe 'Issues', feature: true do
     let!(:issue) do
       create(:issue,
              author: @user,
-             assignee: @user,
+             assignees: [@user],
              project: project)
     end
 
@@ -61,7 +61,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
 
@@ -138,7 +138,7 @@ describe 'Issues', feature: true do
 
   describe 'Issue info' do
     it 'excludes award_emoji from comment count' do
-      issue = create(:issue, author: @user, assignee: @user, project: project, title: 'foobar')
+      issue = create(:issue, author: @user, assignees: [@user], project: project, title: 'foobar')
       create(:award_emoji, awardable: issue)
 
       visit namespace_project_issues_path(project.namespace, project, assignee_id: @user.id)
@@ -153,14 +153,14 @@ describe 'Issues', feature: true do
       %w(foobar barbaz gitlab).each do |title|
         create(:issue,
                author: @user,
-               assignee: @user,
+               assignees: [@user],
                project: project,
                title: title)
       end
 
       @issue = Issue.find_by(title: 'foobar')
       @issue.milestone = create(:milestone, project: project)
-      @issue.assignee = nil
+      @issue.assignees = []
       @issue.save
     end
 
@@ -351,9 +351,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
 
@@ -396,7 +396,7 @@ describe 'Issues', feature: true do
   end
 
   describe 'update labels from issue#show', js: true do
-    let(:issue) { create(:issue, project: project, author: @user, assignee: @user) }
+    let(:issue) { create(:issue, project: project, author: @user, assignees: [@user]) }
     let!(:label) { create(:label, project: project) }
 
     before do
@@ -415,7 +415,7 @@ describe 'Issues', feature: true do
   end
 
   describe 'update assignee from issue#show' do
-    let(:issue) { create(:issue, project: project, author: @user, assignee: @user) }
+    let(:issue) { create(:issue, project: project, author: @user, assignees: [@user]) }
 
     context 'by authorized user' do
       it 'allows user to select unassigned', js: true do
@@ -426,10 +426,14 @@ describe 'Issues', feature: true do
 
           click_link 'Edit'
           click_link 'Unassigned'
+          first('.title').click
           expect(page).to have_content 'No assignee'
         end
 
-        expect(issue.reload.assignee).to be_nil
+        # wait_for_ajax does not work with vue-resource at the moment
+        sleep 1
+
+        expect(issue.reload.assignees).to be_empty
       end
 
       it 'allows user to select an assignee', js: true do
@@ -461,14 +465,18 @@ describe 'Issues', feature: true do
           click_link 'Edit'
           click_link @user.name
 
-          page.within '.value' do
+          find('.dropdown-menu-toggle').click
+
+          page.within '.value .author' do
             expect(page).to have_content @user.name
           end
 
           click_link 'Edit'
           click_link @user.name
 
-          page.within '.value' do
+          find('.dropdown-menu-toggle').click
+
+          page.within '.value .assign-yourself' do
             expect(page).to have_content "No assignee"
           end
         end
@@ -487,7 +495,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
@@ -558,7 +566,7 @@ describe 'Issues', feature: true do
       let(:user2) { create(:user) }
 
       before do
-        issue.assignee = user2
+        issue.assignees << user2
         issue.save
       end
     end
@@ -655,7 +663,7 @@ describe 'Issues', feature: true do
 
   describe 'due date' do
     context 'update due on issue#show', js: true do
-      let(:issue) { create(:issue, project: project, author: @user, assignee: @user) }
+      let(:issue) { create(:issue, project: project, author: @user, assignees: [@user]) }
 
       before do
         visit namespace_project_issue_path(project.namespace, project, issue)
diff --git a/spec/features/merge_requests/assign_issues_spec.rb b/spec/features/merge_requests/assign_issues_spec.rb
index 43cc6f2a2a7..ec49003772b 100644
--- a/spec/features/merge_requests/assign_issues_spec.rb
+++ b/spec/features/merge_requests/assign_issues_spec.rb
@@ -33,7 +33,7 @@ feature 'Merge request issue assignment', js: true, feature: true do
     end
 
     it "doesn't display if related issues are already assigned" do
-      [issue1, issue2].each { |issue| issue.update!(assignee: user) }
+      [issue1, issue2].each { |issue| issue.update!(assignees: [user]) }
 
       visit_merge_request
 
diff --git a/spec/features/milestones/show_spec.rb b/spec/features/milestones/show_spec.rb
index 40b4dc63697..227eb04ba72 100644
--- a/spec/features/milestones/show_spec.rb
+++ b/spec/features/milestones/show_spec.rb
@@ -5,7 +5,7 @@ describe 'Milestone show', feature: true do
   let(:project) { create(:empty_project) }
   let(:milestone) { create(:milestone, project: project) }
   let(:labels) { create_list(:label, 2, project: project) }
-  let(:issue_params) { { project: project, assignee: user, author: user, milestone: milestone, labels: labels } }
+  let(:issue_params) { { project: project, assignees: [user], author: user, milestone: milestone, labels: labels } }
 
   before do
     project.add_user(user, :developer) 
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index d28a853bbc2..fa5e30075e3 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -12,7 +12,7 @@ feature 'issuable templates', feature: true, js: true do
   context 'user creates an issue using templates' do
     let(:template_content) { 'this is a test "bug" template' }
     let(:longtemplate_content) { %Q(this\n\n\n\n\nis\n\n\n\n\na\n\n\n\n\nbug\n\n\n\n\ntemplate) }
-    let(:issue) { create(:issue, author: user, assignee: user, project: project) }
+    let(:issue) { create(:issue, author: user, assignees: [user], project: project) }
     let(:description_addition) { ' appending to description' }
 
     background do
@@ -72,7 +72,7 @@ feature 'issuable templates', feature: true, js: true do
   context 'user creates an issue using templates, with a prior description' do
     let(:prior_description) { 'test issue description' }
     let(:template_content) { 'this is a test "bug" template' }
-    let(:issue) { create(:issue, author: user, assignee: user, project: project) }
+    let(:issue) { create(:issue, author: user, assignees: [user], project: project) }
 
     background do
       project.repository.create_file(
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index da6388dcdf2..498a4a5cba0 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -5,7 +5,7 @@ describe "Search", feature: true  do
 
   let(:user) { create(:user) }
   let(:project) { create(:empty_project, namespace: user.namespace) }
-  let!(:issue) { create(:issue, project: project, assignee: user) }
+  let!(:issue) { create(:issue, project: project, assignees: [user]) }
   let!(:issue2) { create(:issue, project: project, author: user) }
 
   before do
diff --git a/spec/features/unsubscribe_links_spec.rb b/spec/features/unsubscribe_links_spec.rb
index e2d9cfdd0b0..a23c4ca2b92 100644
--- a/spec/features/unsubscribe_links_spec.rb
+++ b/spec/features/unsubscribe_links_spec.rb
@@ -6,7 +6,7 @@ describe 'Unsubscribe links', feature: true do
   let(:recipient) { create(:user) }
   let(:author) { create(:user) }
   let(:project) { create(:empty_project, :public) }
-  let(:params) { { title: 'A bug!', description: 'Fix it!', assignee: recipient } }
+  let(:params) { { title: 'A bug!', description: 'Fix it!', assignees: [recipient] } }
   let(:issue) { Issues::CreateService.new(project, author, params).execute }
 
   let(:mail) { ActionMailer::Base.deliveries.last }
-- 
cgit v1.2.1