2019-07-31 22:56:46 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2016-04-02 18:10:28 +05:30
|
|
|
require 'spec_helper'
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
RSpec.describe Notes::UpdateService do
|
2019-12-21 20:55:43 +05:30
|
|
|
let(:group) { create(:group, :public) }
|
|
|
|
let(:project) { create(:project, :public, group: group) }
|
|
|
|
let(:private_group) { create(:group, :private) }
|
|
|
|
let(:private_project) { create(:project, :private, group: private_group) }
|
2016-04-02 18:10:28 +05:30
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:user2) { create(:user) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:user3) { create(:user) }
|
2016-04-02 18:10:28 +05:30
|
|
|
let(:issue) { create(:issue, project: project) }
|
2019-12-21 20:55:43 +05:30
|
|
|
let(:issue2) { create(:issue, project: private_project) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:note) { create(:note, project: project, noteable: issue, author: user, note: "Old note #{user2.to_reference}") }
|
2020-10-24 23:57:45 +05:30
|
|
|
let(:markdown) do
|
|
|
|
<<-MARKDOWN.strip_heredoc
|
|
|
|
```suggestion
|
|
|
|
foo
|
|
|
|
```
|
|
|
|
|
|
|
|
```suggestion
|
|
|
|
bar
|
|
|
|
```
|
|
|
|
MARKDOWN
|
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
|
|
|
|
before do
|
2018-11-18 11:00:15 +05:30
|
|
|
project.add_maintainer(user)
|
2018-03-17 18:26:18 +05:30
|
|
|
project.add_developer(user2)
|
|
|
|
project.add_developer(user3)
|
2019-12-21 20:55:43 +05:30
|
|
|
group.add_developer(user3)
|
|
|
|
private_group.add_developer(user)
|
|
|
|
private_group.add_developer(user2)
|
|
|
|
private_project.add_developer(user3)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe '#execute' do
|
|
|
|
def update_note(opts)
|
|
|
|
@note = Notes::UpdateService.new(project, user, opts).execute(note)
|
|
|
|
@note.reload
|
|
|
|
end
|
|
|
|
|
2020-03-13 15:44:24 +05:30
|
|
|
it 'does not update the note when params is blank' do
|
2021-01-03 14:25:43 +05:30
|
|
|
travel_to(1.day.from_now) do
|
2020-03-13 15:44:24 +05:30
|
|
|
expect { update_note({}) }.not_to change { note.reload.updated_at }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2021-01-29 00:20:46 +05:30
|
|
|
it 'does not track usage data when params is blank' do
|
|
|
|
expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).not_to receive(:track_issue_comment_edited_action)
|
2021-03-08 18:12:59 +05:30
|
|
|
expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter).not_to receive(:track_edit_comment_action)
|
2021-01-29 00:20:46 +05:30
|
|
|
|
|
|
|
update_note({})
|
|
|
|
end
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it 'tracks issue usage data', :clean_gitlab_redis_shared_state do
|
2021-01-29 00:20:46 +05:30
|
|
|
event = Gitlab::UsageDataCounters::IssueActivityUniqueCounter::ISSUE_COMMENT_EDITED
|
|
|
|
counter = Gitlab::UsageDataCounters::HLLRedisCounter
|
|
|
|
|
|
|
|
expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).to receive(:track_issue_comment_edited_action).with(author: user).and_call_original
|
|
|
|
expect do
|
|
|
|
update_note(note: 'new text')
|
|
|
|
end.to change { counter.unique_events(event_names: event, start_date: 1.day.ago, end_date: 1.day.from_now) }.by(1)
|
|
|
|
end
|
|
|
|
|
2021-04-17 20:07:23 +05:30
|
|
|
context 'when note text was changed' do
|
|
|
|
let!(:note) { create(:note, project: project, noteable: issue, author: user2, note: "Old note #{user3.to_reference}") }
|
|
|
|
let(:edit_note_text) { update_note({ note: 'new text' }) }
|
|
|
|
|
|
|
|
it 'update last_edited_at' do
|
|
|
|
travel_to(1.day.from_now) do
|
|
|
|
expect { edit_note_text }.to change { note.reload.last_edited_at }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'update updated_by' do
|
|
|
|
travel_to(1.day.from_now) do
|
|
|
|
expect { edit_note_text }.to change { note.reload.updated_by }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when note text was not changed' do
|
|
|
|
let!(:note) { create(:note, project: project, noteable: issue, author: user2, note: "Old note #{user3.to_reference}") }
|
|
|
|
let(:does_not_edit_note_text) { update_note({}) }
|
|
|
|
|
|
|
|
it 'does not update last_edited_at' do
|
|
|
|
travel_to(1.day.from_now) do
|
|
|
|
expect { does_not_edit_note_text }.not_to change { note.reload.last_edited_at }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not update updated_by' do
|
|
|
|
travel_to(1.day.from_now) do
|
|
|
|
expect { does_not_edit_note_text }.not_to change { note.reload.updated_by }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
context 'when the notable is a merge request' do
|
|
|
|
let(:merge_request) { create(:merge_request, source_project: project) }
|
|
|
|
let(:note) { create(:note, project: project, noteable: merge_request, author: user, note: "Old note #{user2.to_reference}") }
|
|
|
|
|
|
|
|
it 'tracks merge request usage data' do
|
|
|
|
expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter).to receive(:track_edit_comment_action).with(note: note)
|
|
|
|
|
|
|
|
update_note(note: 'new text')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
context 'with system note' do
|
|
|
|
before do
|
|
|
|
note.update_column(:system, true)
|
|
|
|
end
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
it 'does not update the note' do
|
|
|
|
expect { update_note(note: 'new text') }.not_to change { note.reload.note }
|
|
|
|
end
|
2021-01-29 00:20:46 +05:30
|
|
|
|
|
|
|
it 'does not track usage data' do
|
|
|
|
expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).not_to receive(:track_issue_comment_edited_action)
|
|
|
|
|
|
|
|
update_note(note: 'new text')
|
|
|
|
end
|
2020-10-24 23:57:45 +05:30
|
|
|
end
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
context 'suggestions' do
|
|
|
|
it 'refreshes note suggestions' do
|
2019-02-15 15:39:39 +05:30
|
|
|
suggestion = create(:suggestion)
|
|
|
|
note = suggestion.note
|
|
|
|
|
|
|
|
expect { described_class.new(project, user, note: markdown).execute(note) }
|
|
|
|
.to change { note.suggestions.count }.from(1).to(2)
|
|
|
|
|
|
|
|
expect(note.suggestions.order(:relative_order).map(&:to_content))
|
|
|
|
.to eq([" foo\n", " bar\n"])
|
|
|
|
end
|
2020-07-28 23:09:34 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
context 'setting confidentiality' do
|
|
|
|
let(:opts) { { confidential: true } }
|
|
|
|
|
|
|
|
context 'simple note' do
|
|
|
|
it 'updates the confidentiality' do
|
|
|
|
expect { update_note(opts) }.to change { note.reload.confidential }.from(nil).to(true)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'discussion notes' do
|
|
|
|
let(:note) { create(:discussion_note, project: project, noteable: issue, author: user, note: "Old note #{user2.to_reference}") }
|
|
|
|
let!(:response_note_1) { create(:discussion_note, project: project, noteable: issue, in_reply_to: note) }
|
|
|
|
let!(:response_note_2) { create(:discussion_note, project: project, noteable: issue, in_reply_to: note, confidential: false) }
|
|
|
|
let!(:other_note) { create(:note, project: project, noteable: issue) }
|
|
|
|
|
|
|
|
context 'when updating the root note' do
|
|
|
|
it 'updates the confidentiality of the root note and all the responses' do
|
|
|
|
update_note(opts)
|
|
|
|
|
|
|
|
expect(note.reload.confidential).to be_truthy
|
|
|
|
expect(response_note_1.reload.confidential).to be_truthy
|
|
|
|
expect(response_note_2.reload.confidential).to be_truthy
|
|
|
|
expect(other_note.reload.confidential).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when updating one of the response notes' do
|
|
|
|
it 'updates only the confidentiality of the note that is being updated' do
|
|
|
|
Notes::UpdateService.new(project, user, opts).execute(response_note_1)
|
|
|
|
|
|
|
|
expect(note.reload.confidential).to be_falsey
|
|
|
|
expect(response_note_1.reload.confidential).to be_truthy
|
|
|
|
expect(response_note_2.reload.confidential).to be_falsey
|
|
|
|
expect(other_note.reload.confidential).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2019-02-15 15:39:39 +05:30
|
|
|
end
|
|
|
|
|
2016-04-02 18:10:28 +05:30
|
|
|
context 'todos' do
|
2019-12-21 20:55:43 +05:30
|
|
|
shared_examples 'does not update todos' do
|
|
|
|
it 'keep todos' do
|
|
|
|
expect(todo.reload).to be_pending
|
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2019-12-21 20:55:43 +05:30
|
|
|
it 'does not create any new todos' do
|
|
|
|
expect(Todo.count).to eq(1)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
2019-12-21 20:55:43 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2019-12-21 20:55:43 +05:30
|
|
|
shared_examples 'creates one todo' do
|
2016-04-02 18:10:28 +05:30
|
|
|
it 'marks todos as done' do
|
|
|
|
expect(todo.reload).to be_done
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
it 'creates only 1 new todo' do
|
|
|
|
expect(Todo.count).to eq(2)
|
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2019-12-21 20:55:43 +05:30
|
|
|
context 'when note includes a user mention' do
|
|
|
|
let!(:todo) { create(:todo, :assigned, user: user, project: project, target: issue, author: user2) }
|
|
|
|
|
|
|
|
context 'when the note does not change mentions' do
|
|
|
|
before do
|
|
|
|
update_note({ note: "Old note #{user2.to_reference}" })
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'does not update todos'
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2019-12-21 20:55:43 +05:30
|
|
|
context 'when the note changes to include one more user mention' do
|
|
|
|
before do
|
|
|
|
update_note({ note: "New note #{user2.to_reference} #{user3.to_reference}" })
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'creates one todo'
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2019-12-21 20:55:43 +05:30
|
|
|
context 'when the note changes to include a group mentions' do
|
|
|
|
before do
|
|
|
|
update_note({ note: "New note #{private_group.to_reference}" })
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'creates one todo'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when note includes a group mention' do
|
|
|
|
context 'when the group is public' do
|
|
|
|
let(:note) { create(:note, project: project, noteable: issue, author: user, note: "Old note #{group.to_reference}") }
|
|
|
|
let!(:todo) { create(:todo, :assigned, user: user, project: project, target: issue, author: user2) }
|
|
|
|
|
|
|
|
context 'when the note does not change mentions' do
|
|
|
|
before do
|
|
|
|
update_note({ note: "Old note #{group.to_reference}" })
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'does not update todos'
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the note changes mentions' do
|
|
|
|
before do
|
|
|
|
update_note({ note: "New note #{user2.to_reference} #{user3.to_reference}" })
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'creates one todo'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the group is private' do
|
|
|
|
let(:note) { create(:note, project: project, noteable: issue, author: user, note: "Old note #{private_group.to_reference}") }
|
|
|
|
let!(:todo) { create(:todo, :assigned, user: user, project: project, target: issue, author: user2) }
|
|
|
|
|
|
|
|
context 'when the note does not change mentions' do
|
|
|
|
before do
|
|
|
|
update_note({ note: "Old note #{private_group.to_reference}" })
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'does not update todos'
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the note changes mentions' do
|
|
|
|
before do
|
|
|
|
update_note({ note: "New note #{user2.to_reference} #{user3.to_reference}" })
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'creates one todo'
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
end
|
2020-10-24 23:57:45 +05:30
|
|
|
|
|
|
|
context 'for a personal snippet' do
|
|
|
|
let_it_be(:snippet) { create(:personal_snippet, :public) }
|
|
|
|
let(:note) { create(:note, project: nil, noteable: snippet, author: user, note: "Note on a snippet with reference #{issue.to_reference}" ) }
|
|
|
|
|
|
|
|
it 'does not create todos' do
|
|
|
|
expect { update_note({ note: "Mentioning user #{user2}" }) }.not_to change { note.todos.count }
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create suggestions' do
|
|
|
|
expect { update_note({ note: "Updated snippet with markdown suggestion #{markdown}" }) }
|
|
|
|
.not_to change { note.suggestions.count }
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create mentions' do
|
|
|
|
expect(note).not_to receive(:create_new_cross_references!)
|
|
|
|
update_note({ note: "Updated with new reference: #{issue.to_reference}" })
|
|
|
|
end
|
2021-01-29 00:20:46 +05:30
|
|
|
|
|
|
|
it 'does not track usage data' do
|
|
|
|
expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).not_to receive(:track_issue_comment_edited_action)
|
|
|
|
|
|
|
|
update_note(note: 'new text')
|
|
|
|
end
|
2020-10-24 23:57:45 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
end
|