Commit c2d4060f authored by Grzegorz Bizon's avatar Grzegorz Bizon

Rewrite references in notes when moving issue

parent 8d3f072e
...@@ -57,7 +57,10 @@ module Issues ...@@ -57,7 +57,10 @@ module Issues
def rewrite_notes def rewrite_notes
@issue_old.notes.find_each do |note| @issue_old.notes.find_each do |note|
new_note = note.dup new_note = note.dup
new_note.update(project: @project_new, noteable: @issue_new) new_params = { project: @project_new, noteable: @issue_new,
note: rewrite_references(new_note) }
new_note.update(new_params)
end end
end end
...@@ -79,8 +82,10 @@ module Issues ...@@ -79,8 +82,10 @@ module Issues
def rewrite_references(mentionable) def rewrite_references(mentionable)
references = mentionable.all_references references = mentionable.all_references
new_content = mentionable_content(mentionable).dup new_content = mentionable_content(mentionable).dup
cross_project_refs = [:issues, :merge_requests, :milestones,
:snippets, :commits, :commit_ranges]
[:issues, :merge_requests, :milestones].each do |type| cross_project_refs.each do |type|
references.public_send(type).each do |mentioned| references.public_send(type).each do |mentioned|
new_content.gsub!(mentioned.to_reference, new_content.gsub!(mentioned.to_reference,
mentioned.to_reference(@project_new)) mentioned.to_reference(@project_new))
......
...@@ -94,27 +94,54 @@ describe Issues::MoveService, services: true do ...@@ -94,27 +94,54 @@ describe Issues::MoveService, services: true do
end end
context 'issue with notes' do context 'issue with notes' do
let(:note_contents) do context 'notes without references' do
['Some system note 1', 'Some comment', 'Some system note 2'] let(:notes_params) do
[{ system: false, note: 'Some comment 1' },
{ system: true, note: 'Some system note' },
{ system: false, note: 'Some comment 2' }]
end end
before do before do
note_params = { noteable: old_issue, project: old_project, author: user } note_params = { noteable: old_issue, project: old_project, author: author }
create(:system_note, note_params.merge(note: note_contents.first)) notes_params.each do |note|
create(:note, note_params.merge(note: note_contents.second)) create(:note, note_params.merge(note))
create(:system_note, note_params.merge(note: note_contents.third)) end
end end
include_context 'issue move executed' include_context 'issue move executed'
let(:new_notes) { new_issue.notes.order('id ASC').pluck(:note) } let(:all_notes) { new_issue.notes.order('id ASC') }
let(:system_notes) { all_notes.system }
let(:user_notes) { all_notes.user }
it 'rewrites existing system notes in valid order' do it 'rewrites existing notes in valid order' do
expect(new_notes.first(3)).to eq note_contents expect(all_notes.pluck(:note).first(3))
.to eq notes_params.map { |n| n[:note] }
end end
it 'adds a system note about move after rewritten notes' do it 'adds a system note about move after rewritten notes' do
expect(new_notes.last).to match /^Moved from/ expect(system_notes.last.note).to match /^Moved from/
end
it 'preserves orignal author of comment' do
expect(user_notes.pluck(:author_id)).to all(eq(author.id))
end
end
context 'notes with references' do
before do
create(:merge_request, source_project: old_project)
create(:note, noteable: old_issue, project: old_project, author: author,
note: 'Note with reference to merge request !1')
end
include_context 'issue move executed'
let(:new_note) { new_issue.notes.first }
it 'rewrites references using a cross reference to old project' do
expect(new_note.note)
.to eq "Note with reference to merge request #{old_project.to_reference}!1"
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment