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
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'Merge request > Batch comments', :js do
include MergeRequestDiffHelpers
include RepoHelpers
let(:user) { create(:user) }
let(:project) { create(:project, :repository) }
let(:merge_request) do
create(:merge_request_with_diffs, source_project: project, target_project: project, source_branch: 'merge-test')
end
before do
project.add_maintainer(user)
sign_in(user)
end
context 'Feature is enabled' do
before do
visit_diffs
end
it 'has review bar' do
expect(page).to have_selector('[data-testid="review_bar_component"]', visible: false)
end
it 'adds draft note' do
write_diff_comment
expect(find('.draft-note-component')).to have_content('Line is wrong')
expect(page).to have_selector('[data-testid="review_bar_component"]')
expect(find('.review-bar-content .btn-confirm')).to have_content('1')
end
it 'publishes review' do
write_diff_comment
page.within('.review-bar-content') do
click_button 'Submit review'
end
wait_for_requests
expect(page).not_to have_selector('.draft-note-component', text: 'Line is wrong')
expect(page).to have_selector('.note:not(.draft-note)', text: 'Line is wrong')
end
it 'publishes single comment' do
write_diff_comment
click_button 'Add comment now'
wait_for_requests
expect(page).not_to have_selector('.draft-note-component', text: 'Line is wrong')
expect(page).to have_selector('.note:not(.draft-note)', text: 'Line is wrong')
end
it 'deletes draft note' do
write_diff_comment
accept_alert { find('.js-note-delete').click }
wait_for_requests
expect(page).not_to have_selector('.draft-note-component', text: 'Line is wrong')
end
it 'edits draft note' do
write_diff_comment
find('.js-note-edit').click
# make sure comment form is in view
execute_script("window.scrollBy(0, 200)")
write_comment(text: 'Testing update', button_text: 'Save comment')
expect(page).to have_selector('.draft-note-component', text: 'Testing update')
end
context 'with image and file draft note' do
let(:merge_request) { create(:merge_request_with_diffs, :with_image_diffs, source_project: project) }
let!(:draft_on_text) { create(:draft_note_on_text_diff, merge_request: merge_request, author: user, path: 'README.md', note: 'Lorem ipsum on text...') }
let!(:draft_on_image) { create(:draft_note_on_image_diff, merge_request: merge_request, author: user, path: 'files/images/ee_repo_logo.png', note: 'Lorem ipsum on an image...') }
it 'does not show in overview' do
visit_overview
expect(page).to have_no_text(draft_on_text.note)
expect(page).to have_no_text(draft_on_image.note)
end
end
context 'adding single comment to review' do
before do
visit_overview
end
it 'at first does not show `Add to review` and `Add comment now` buttons' do
expect(page).to have_no_button('Add to review')
expect(page).to have_no_button('Add comment now')
end
context 'when review has started' do
before do
visit_diffs
write_diff_comment
visit_overview
end
it 'can add comment to review' do
write_comment(selector: '.js-main-target-form', field: 'note-body', text: 'Its a draft comment', button_text: 'Add to review')
expect(page).to have_selector('.draft-note-component', text: 'Its a draft comment')
click_button('Pending comments')
expect(page).to have_text('2 pending comments')
end
it 'can add comment right away' do
write_comment(selector: '.js-main-target-form', field: 'note-body', text: 'Its a regular comment', button_text: 'Add comment now')
expect(page).to have_selector('.note:not(.draft-note)', text: 'Its a regular comment')
click_button('Pending comments')
expect(page).to have_text('1 pending comment')
end
end
end
context 'in parallel diff' do
before do
find('.js-show-diff-settings').click
click_button 'Side-by-side'
end
it 'adds draft comments to both sides' do
write_parallel_comment('2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9')
# make sure line 9 is in the view
execute_script("window.scrollBy(0, -200)")
write_parallel_comment('2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9', button_text: 'Add to review', text: 'Another wrong line')
expect(find('.new .draft-note-component')).to have_content('Line is wrong')
expect(find('.old .draft-note-component')).to have_content('Another wrong line')
expect(find('.review-bar-content .btn-confirm')).to have_content('2')
end
end
context 'thread is unresolved' do
let!(:active_discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
before do
visit_diffs
end
it 'publishes comment right away and resolves the thread' do
expect(active_discussion.resolved?).to eq(false)
write_reply_to_discussion(button_text: 'Add comment now', resolve: true)
page.within '.line-resolve-all-container' do
expect(page).to have_content('All threads resolved')
expect(page).to have_selector('.line-resolve-btn.is-active')
end
end
it 'publishes review and resolves the thread' do
expect(active_discussion.resolved?).to eq(false)
write_reply_to_discussion(resolve: true)
page.within('.review-bar-content') do
click_button 'Submit review'
end
wait_for_requests
page.within '.line-resolve-all-container' do
expect(page).to have_content('All threads resolved')
expect(page).to have_selector('.line-resolve-btn.is-active')
end
end
end
context 'thread is resolved' do
let!(:active_discussion) { create(:diff_note_on_merge_request, :resolved, noteable: merge_request, project: project).to_discussion }
before do
active_discussion.resolve!(@current_user)
visit_diffs
page.find('.js-diff-comment-avatar').click
end
it 'publishes comment right away and unresolves the thread' do
expect(active_discussion.resolved?).to eq(true)
write_reply_to_discussion(button_text: 'Add comment now', unresolve: true)
page.within '.line-resolve-all-container' do
expect(page).to have_content('1 unresolved thread')
expect(page).not_to have_selector('.line-resolve-btn.is-active')
end
end
it 'publishes review and unresolves the thread' do
expect(active_discussion.resolved?).to eq(true)
wait_for_requests
write_reply_to_discussion(button_text: 'Start a review', unresolve: true)
page.within('.review-bar-content') do
click_button 'Submit review'
end
wait_for_requests
page.within '.line-resolve-all-container' do
expect(page).to have_content('1 unresolved thread')
expect(page).not_to have_selector('.line-resolve-btn.is-active')
end
end
end
end
def visit_diffs
visit diffs_project_merge_request_path(merge_request.project, merge_request)
wait_for_requests
end
def visit_overview
visit project_merge_request_path(merge_request.project, merge_request)
wait_for_requests
end
def write_diff_comment(**params)
click_diff_line(find("[id='#{sample_compare.changes[0][:line_code]}']"))
write_comment(**params)
end
def write_parallel_comment(line, **params)
find("div[id='#{line}']").hover
find(".js-add-diff-note-button").click
write_comment(selector: "form[data-line-code='#{line}']", **params)
end
def write_comment(selector: '.js-discussion-note-form', field: 'note_note', button_text: 'Start a review', text: 'Line is wrong')
page.within(selector) do
fill_in(field, with: text)
click_button(button_text)
end
wait_for_requests
end
def write_reply_to_discussion(button_text: 'Start a review', text: 'Line is wrong', resolve: false, unresolve: false)
page.within(first('.diff-files-holder .discussion-reply-holder')) do
find_field('Reply…', match: :first).click
fill_in('note_note', with: text)
if resolve
page.check('Resolve thread')
end
if unresolve
page.check('Unresolve thread')
end
click_button(button_text)
end
wait_for_requests
end
end
|