370f07361c
**Why?** The previous behavior had resolved discussions being unresolved when commented on. This was strange UX, especially since there is a separate button for "Comment & unresolve discussion". https://gitlab.com/gitlab-org/gitlab-ce/issues/24128 **Note:** - Also adds changelog
127 lines
4.7 KiB
Ruby
127 lines
4.7 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Notes::BuildService do
|
|
let(:note) { create(:discussion_note_on_issue) }
|
|
let(:project) { note.project }
|
|
let(:author) { note.author }
|
|
let(:merge_request) { create(:merge_request, source_project: project) }
|
|
let(:mr_note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, author: author) }
|
|
|
|
describe '#execute' do
|
|
context 'when in_reply_to_discussion_id is specified' do
|
|
context 'when a note with that original discussion ID exists' do
|
|
it 'sets the note up to be in reply to that note' do
|
|
new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: note.discussion_id).execute
|
|
expect(new_note).to be_valid
|
|
expect(new_note.in_reply_to?(note)).to be_truthy
|
|
expect(new_note.resolved?).to be_falsey
|
|
end
|
|
|
|
context 'when discussion is resolved' do
|
|
before do
|
|
mr_note.resolve!(author)
|
|
end
|
|
|
|
it 'resolves the note' do
|
|
new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: mr_note.discussion_id).execute
|
|
expect(new_note).to be_valid
|
|
expect(new_note.resolved?).to be_truthy
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when a note with that discussion ID exists' do
|
|
it 'sets the note up to be in reply to that note' do
|
|
new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: note.discussion_id).execute
|
|
expect(new_note).to be_valid
|
|
expect(new_note.in_reply_to?(note)).to be_truthy
|
|
end
|
|
end
|
|
|
|
context 'when no note with that discussion ID exists' do
|
|
it 'sets an error' do
|
|
new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: 'foo').execute
|
|
expect(new_note.errors[:base]).to include('Discussion to reply to cannot be found')
|
|
end
|
|
end
|
|
|
|
context 'personal snippet note' do
|
|
def reply(note, user = nil)
|
|
user ||= create(:user)
|
|
|
|
described_class.new(nil,
|
|
user,
|
|
note: 'Test',
|
|
in_reply_to_discussion_id: note.discussion_id).execute
|
|
end
|
|
|
|
let(:snippet_author) { create(:user) }
|
|
|
|
context 'when a snippet is public' do
|
|
it 'creates a reply note' do
|
|
snippet = create(:personal_snippet, :public)
|
|
note = create(:discussion_note_on_personal_snippet, noteable: snippet)
|
|
|
|
new_note = reply(note)
|
|
|
|
expect(new_note).to be_valid
|
|
expect(new_note.in_reply_to?(note)).to be_truthy
|
|
end
|
|
end
|
|
|
|
context 'when a snippet is private' do
|
|
let(:snippet) { create(:personal_snippet, :private, author: snippet_author) }
|
|
let(:note) { create(:discussion_note_on_personal_snippet, noteable: snippet) }
|
|
|
|
it 'creates a reply note when the author replies' do
|
|
new_note = reply(note, snippet_author)
|
|
|
|
expect(new_note).to be_valid
|
|
expect(new_note.in_reply_to?(note)).to be_truthy
|
|
end
|
|
|
|
it 'sets an error when another user replies' do
|
|
new_note = reply(note)
|
|
|
|
expect(new_note.errors[:base]).to include('Discussion to reply to cannot be found')
|
|
end
|
|
end
|
|
|
|
context 'when a snippet is internal' do
|
|
let(:snippet) { create(:personal_snippet, :internal, author: snippet_author) }
|
|
let(:note) { create(:discussion_note_on_personal_snippet, noteable: snippet) }
|
|
|
|
it 'creates a reply note when the author replies' do
|
|
new_note = reply(note, snippet_author)
|
|
|
|
expect(new_note).to be_valid
|
|
expect(new_note.in_reply_to?(note)).to be_truthy
|
|
end
|
|
|
|
it 'creates a reply note when a regular user replies' do
|
|
new_note = reply(note)
|
|
|
|
expect(new_note).to be_valid
|
|
expect(new_note.in_reply_to?(note)).to be_truthy
|
|
end
|
|
|
|
it 'sets an error when an external user replies' do
|
|
new_note = reply(note, create(:user, :external))
|
|
|
|
expect(new_note.errors[:base]).to include('Discussion to reply to cannot be found')
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
it 'builds a note without saving it' do
|
|
new_note = described_class.new(project,
|
|
author,
|
|
noteable_type: note.noteable_type,
|
|
noteable_id: note.noteable_id,
|
|
note: 'Test').execute
|
|
expect(new_note).to be_valid
|
|
expect(new_note).not_to be_persisted
|
|
end
|
|
end
|
|
end
|