summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2017-05-04 20:22:03 +0300
committerValery Sizov <valery@gitlab.com>2017-05-04 20:22:03 +0300
commitfc464f1ff27734df81f7f85cbc23e93902c97cda (patch)
treee4dc7d6caba428fa9d86fa85f6e9476c310f6b09
parent0f2a9681a318e5d27ef4e45195f2ac4b75f351dc (diff)
downloadgitlab-ce-fc464f1ff27734df81f7f85cbc23e93902c97cda.tar.gz
Multiple issue assignee: fixed services/issues/update_service by using new NoteSummary
-rw-r--r--app/services/system_note_service.rb2
-rw-r--r--spec/features/boards/sidebar_spec.rb21
2 files changed, 1 insertions, 22 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 898c69b3f8c..1dee791cfd6 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -84,7 +84,7 @@ module SystemNoteService
"assigned to #{issue.assignees.map(&:to_reference).to_sentence}"
end
- create_note(noteable: issue, project: project, author: author, note: body)
+ NoteSummary.new(issue, project, author, body, action: 'assignee')
end
# Called when one or more labels on a Noteable are added and/or removed
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index 02b6b5dc888..7c53d2b47d9 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -21,7 +21,6 @@ describe 'Issue Boards', feature: true, js: true do
Timecop.freeze
project.team << [user, :master]
- project.team.add_developer(user2)
login_as(user)
@@ -103,26 +102,6 @@ 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)