1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe DraftNotes::CreateService, feature_category: :code_review_workflow do
let_it_be(:merge_request) { create(:merge_request) }
let_it_be(:project) { merge_request.target_project }
let_it_be(:user) { merge_request.author }
def create_draft(params)
described_class.new(merge_request, user, params).execute
end
it 'creates a simple draft note' do
draft = create_draft(note: 'This is a test')
expect(draft).to be_an_instance_of(DraftNote)
expect(draft.note).to eq('This is a test')
expect(draft.author).to eq(user)
expect(draft.project).to eq(merge_request.target_project)
expect(draft.discussion_id).to be_nil
end
it 'tracks the start event when the draft is persisted' do
expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter)
.to receive(:track_create_review_note_action)
.with(user: user)
draft = create_draft(note: 'This is a test')
expect(draft).to be_persisted
end
it 'does not track the start event when the draft is not persisted' do
expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter)
.not_to receive(:track_create_review_note_action)
draft = create_draft(note: 'Not a reply!', resolve_discussion: true)
expect(draft).not_to be_persisted
end
it 'cannot resolve when there is nothing to resolve' do
draft = create_draft(note: 'Not a reply!', resolve_discussion: true)
expect(draft.errors[:base]).to include('User is not allowed to resolve thread')
expect(draft).not_to be_persisted
end
it 'updates reviewer state on first draft note' do
expect_next_instance_of(
MergeRequests::UpdateReviewerStateService,
project: project, current_user: user
) do |service|
expect(service).to receive(:execute).with(merge_request, 'review_started')
end
create_draft(note: 'This is a test')
end
context 'when a draft note has already been created' do
let_it_be(:note) { create(:draft_note, merge_request: merge_request, author: user) }
it 'does not update reviewer state' do
expect(MergeRequests::UpdateReviewerStateService).not_to receive(:new)
create_draft(note: 'This is a test')
end
end
context 'in a thread' do
it 'creates a draft note with discussion_id' do
discussion = create(:discussion_note_on_merge_request, noteable: merge_request, project: project).discussion
draft = create_draft(note: 'A reply!', in_reply_to_discussion_id: discussion.reply_id)
expect(draft.note).to eq('A reply!')
expect(draft.discussion_id).to eq(discussion.reply_id)
expect(draft.resolve_discussion).to be_falsey
end
it 'creates a draft that resolves the thread' do
discussion = create(:discussion_note_on_merge_request, noteable: merge_request, project: project).discussion
draft = create_draft(note: 'A reply!', in_reply_to_discussion_id: discussion.reply_id, resolve_discussion: true)
expect(draft.note).to eq('A reply!')
expect(draft.discussion_id).to eq(discussion.reply_id)
expect(draft.resolve_discussion).to be true
end
end
it 'creates a draft note with a position in a diff' do
diff_refs = project.commit(RepoHelpers.sample_commit.id).try(:diff_refs)
position = Gitlab::Diff::Position.new(
old_path: "files/ruby/popen.rb",
new_path: "files/ruby/popen.rb",
old_line: nil,
new_line: 14,
diff_refs: diff_refs
)
draft = create_draft(note: 'Comment on diff', position: position.to_json)
expect(draft.note).to eq('Comment on diff')
expect(draft.original_position.to_json).to eq(position.to_json)
end
context 'diff highlight cache clearing' do
context 'when diff file is unfolded and it is not a reply' do
it 'clears diff highlighting cache' do
expect_next_instance_of(DraftNote) do |draft|
allow(draft).to receive_message_chain(:diff_file, :unfolded?) { true }
end
expect(merge_request).to receive_message_chain(:diffs, :clear_cache)
create_draft(note: 'This is a test', line_code: '123')
end
end
context 'when diff file is not unfolded and it is not a reply' do
it 'clears diff highlighting cache' do
expect_next_instance_of(DraftNote) do |draft|
allow(draft).to receive_message_chain(:diff_file, :unfolded?) { false }
end
expect(merge_request).not_to receive(:diffs)
create_draft(note: 'This is a test', line_code: '123')
end
end
end
context 'when the draft note is invalid' do
before do
allow_next_instance_of(DraftNote) do |draft|
allow(draft).to receive(:valid?).and_return(false)
end
end
it 'does not create the note' do
draft_note = create_draft(note: 'invalid note')
expect(draft_note).not_to be_persisted
end
end
end
|
