user_resolves_diff_notes_and_discussions_resolve_spec.rb 16.8 KB
Newer Older
1
require 'rails_helper'
2

3
describe 'Merge request > User resolves diff notes and discussions', :js do
4
  let(:project)       { create(:project, :public, :repository) }
5 6
  let(:user)          { project.creator }
  let(:guest)         { create(:user) }
7
  let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: "Bug NS-04") }
8
  let!(:note)         { create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "| Markdown | Table |\n|-------|---------|\n| first | second |") }
9 10 11 12 13 14 15 16 17 18 19
  let(:path)          { "files/ruby/popen.rb" }
  let(:position) do
    Gitlab::Diff::Position.new(
      old_path: path,
      new_path: path,
      old_line: nil,
      new_line: 9,
      diff_refs: merge_request.diff_refs
    )
  end

20 21
  context 'no discussions' do
    before do
22
      project.add_maintainer(user)
23
      sign_in(user)
24 25 26 27 28 29 30 31 32 33
      note.destroy
      visit_merge_request
    end

    it 'displays no discussion resolved data' do
      expect(page).not_to have_content('discussion resolved')
      expect(page).not_to have_selector('.discussion-next-btn')
    end
  end

34 35
  context 'as authorized user' do
    before do
36
      project.add_maintainer(user)
37
      sign_in(user)
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
      visit_merge_request
    end

    context 'single discussion' do
      it 'shows text with how many discussions' do
        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end

      it 'allows user to mark a note as resolved' do
        page.within '.diff-content .note' do
          find('.line-resolve-btn').click

          expect(page).to have_selector('.line-resolve-btn.is-active')
53
          expect(find('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}")
54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
        end

        page.within '.diff-content' do
          expect(page).to have_selector('.btn', text: 'Unresolve discussion')
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user to mark discussion as resolved' do
        page.within '.diff-content' do
          click_button 'Resolve discussion'
        end

71 72
        expect(page).to have_selector('.discussion-body', visible: false)

73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
        page.within '.diff-content .note' do
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user to unresolve discussion' do
        page.within '.diff-content' do
          click_button 'Resolve discussion'
          click_button 'Unresolve discussion'
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end

94 95 96 97 98 99 100
      describe 'resolved discussion' do
        before do
          page.within '.diff-content' do
            click_button 'Resolve discussion'
          end

          visit_merge_request
101 102
        end

103 104
        describe 'timeline view' do
          it 'hides when resolve discussion is clicked' do
F
Felipe Artur 已提交
105 106
            expect(page).to have_selector('.discussion-header')
            expect(page).not_to have_selector('.discussion-body')
107 108 109 110 111
          end

          it 'shows resolved discussion when toggled' do
            find(".timeline-content .discussion[data-discussion-id='#{note.discussion_id}'] .discussion-toggle-button").click

112
            expect(page.find(".line-holder-placeholder")).to be_visible
113
            expect(page.find(".timeline-content #note_#{note.id}")).to be_visible
114
          end
115 116 117 118 119 120 121 122 123

          it 'renders tables in lazy-loaded resolved diff dicussions' do
            find(".timeline-content .discussion[data-discussion-id='#{note.discussion_id}'] .discussion-toggle-button").click

            wait_for_requests

            expect(page.find(".timeline-content #note_#{note.id}")).not_to have_css(".line_holder")
            expect(page.find(".timeline-content #note_#{note.id}")).to have_css("tr", count: 2)
          end
124 125
        end

126 127 128 129 130
        describe 'side-by-side view' do
          before do
            page.within('.merge-request-tabs') { click_link 'Changes' }
            page.find('#parallel-diff-btn').click
          end
131

132
          it 'hides when resolve discussion is clicked' do
F
Felipe Artur 已提交
133
            expect(page).not_to have_selector('.diffs .diff-file .notes_holder')
134 135 136 137 138 139 140
          end

          it 'shows resolved discussion when toggled' do
            find('.diff-comment-avatar-holders').click

            expect(find('.diffs .diff-file .notes_holder')).to be_visible
          end
141
        end
142 143
      end

144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
      it 'allows user to resolve from reply form without a comment' do
        page.within '.diff-content' do
          click_button 'Reply...'

          click_button 'Resolve discussion'
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user to unresolve from reply form without a comment' do
        page.within '.diff-content' do
          click_button 'Resolve discussion'
P
Phil Hughes 已提交
160
          sleep 1
161 162 163

          click_button 'Reply...'

P
Phil Hughes 已提交
164
          click_button 'Unresolve discussion'
165 166 167 168
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
P
Phil Hughes 已提交
169
          expect(page).not_to have_selector('.line-resolve-btn.is-active')
170 171 172
        end
      end

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
      it 'allows user to comment & resolve discussion' do
        page.within '.diff-content' do
          click_button 'Reply...'

          find('.js-note-text').set 'testing'

          click_button 'Comment & resolve discussion'
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user to comment & unresolve discussion' do
        page.within '.diff-content' do
          click_button 'Resolve discussion'

          click_button 'Reply...'

          find('.js-note-text').set 'testing'

          click_button 'Comment & unresolve discussion'
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end

      it 'allows user to quickly scroll to next unresolved discussion' do
        page.within '.line-resolve-all-container' do
          page.find('.discussion-next-btn').click
        end

M
Mike Greiling 已提交
209
        expect(page.evaluate_script("window.pageYOffset")).to be > 0
210 211 212 213 214 215 216 217 218
      end

      it 'hides jump to next button when all resolved' do
        page.within '.diff-content' do
          click_button 'Resolve discussion'
        end

        expect(page).to have_selector('.discussion-next-btn', visible: false)
      end
219 220 221

      it 'updates updated text after resolving note' do
        page.within '.diff-content .note' do
F
Felipe Artur 已提交
222 223 224 225
          resolve_button = find('.line-resolve-btn')

          resolve_button.click
          wait_for_requests
226

F
Felipe Artur 已提交
227 228
          expect(resolve_button['data-original-title']).to eq("Resolved by #{user.name}")
        end
229
      end
230 231 232 233 234 235

      it 'hides jump to next discussion button' do
        page.within '.discussion-reply-holder' do
          expect(page).not_to have_selector('.discussion-next-btn')
        end
      end
236 237 238 239
    end

    context 'multiple notes' do
      before do
D
Douwe Maan 已提交
240
        create(:diff_note_on_merge_request, project: project, noteable: merge_request, in_reply_to: note)
241
        visit_merge_request
242 243 244
      end

      it 'does not mark discussion as resolved when resolving single note' do
245
        page.within("#note_#{note.id}") do
246
          first('.line-resolve-btn').click
247

248 249
          wait_for_requests

250
          expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}")
251 252
        end

N
Nur Rony 已提交
253
        expect(page).to have_content('Last updated')
254 255 256 257 258 259 260

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end

      it 'resolves discussion' do
F
Felipe Artur 已提交
261 262
        resolve_buttons = page.all('.note .line-resolve-btn', count: 2)
        resolve_buttons.each do |button|
263
          button.click
264 265
        end

F
Felipe Artur 已提交
266 267 268 269 270
        wait_for_requests

        resolve_buttons.each do |button|
          expect(button['data-original-title']).to eq("Resolved by #{user.name}")
        end
271 272 273 274 275

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
        end
      end
276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298
    end

    context 'muliple discussions' do
      before do
        create(:diff_note_on_merge_request, project: project, position: position, noteable: merge_request)
        visit_merge_request
      end

      it 'shows text with how many discussions' do
        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/2 discussions resolved')
        end
      end

      it 'allows user to mark a single note as resolved' do
        click_button('Resolve discussion', match: :first)

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/2 discussions resolved')
        end
      end

      it 'allows user to mark all notes as resolved' do
F
Felipe Artur 已提交
299
        page.all('.note .line-resolve-btn', count: 2).each do |btn|
300 301 302 303 304 305 306 307 308 309
          btn.click
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('2/2 discussions resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user user to mark all discussions as resolved' do
F
Felipe Artur 已提交
310
        page.all('.discussion-reply-holder', count: 2).each do |reply_holder|
311 312 313 314 315 316 317 318 319 320 321 322
          page.within reply_holder do
            click_button 'Resolve discussion'
          end
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('2/2 discussions resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user to quickly scroll to next unresolved discussion' do
F
Felipe Artur 已提交
323
        page.within('.discussion-reply-holder', match: :first) do
324 325 326 327
          click_button 'Resolve discussion'
        end

        page.within '.line-resolve-all-container' do
328
          page.find('.discussion-next-btn').click
329 330
        end

M
Mike Greiling 已提交
331
        expect(page.evaluate_script("window.pageYOffset")).to be > 0
332 333 334
      end

      it 'updates updated text after resolving note' do
F
Felipe Artur 已提交
335 336
        page.within('.diff-content .note', match: :first) do
          resolve_button = find('.line-resolve-btn')
337

F
Felipe Artur 已提交
338 339 340 341 342
          resolve_button.click
          wait_for_requests

          expect(resolve_button['data-original-title']).to eq("Resolved by #{user.name}")
        end
343
      end
344

345 346 347
      it 'shows jump to next discussion button, apart from the last one' do
        expect(page).to have_selector('.discussion-reply-holder', count: 2)
        expect(page).to have_selector('.discussion-reply-holder .discussion-next-btn', count: 1)
348
      end
349

350
      it 'displays next discussion even if hidden' do
F
Felipe Artur 已提交
351
        page.all('.note-discussion', count: 2).each do |discussion|
352
          page.within discussion do
E
Eric Eastwood 已提交
353
            click_button 'Toggle discussion'
354 355 356 357 358 359 360 361 362 363 364 365 366
          end
        end

        page.within('.issuable-discussion #notes') do
          expect(page).not_to have_selector('.btn', text: 'Resolve discussion')
        end

        page.within '.line-resolve-all-container' do
          page.find('.discussion-next-btn').click
        end

        expect(find('.discussion-with-resolve-btn')).to have_selector('.btn', text: 'Resolve discussion')
      end
367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453
    end

    context 'changes tab' do
      it 'shows text with how many discussions' do
        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end

      it 'allows user to mark a note as resolved' do
        page.within '.diff-content .note' do
          find('.line-resolve-btn').click

          expect(page).to have_selector('.line-resolve-btn.is-active')
        end

        page.within '.diff-content' do
          expect(page).to have_selector('.btn', text: 'Unresolve discussion')
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user to mark discussion as resolved' do
        page.within '.diff-content' do
          click_button 'Resolve discussion'
        end

        page.within '.diff-content .note' do
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user to unresolve discussion' do
        page.within '.diff-content' do
          click_button 'Resolve discussion'
          click_button 'Unresolve discussion'
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end

      it 'allows user to comment & resolve discussion' do
        page.within '.diff-content' do
          click_button 'Reply...'

          find('.js-note-text').set 'testing'

          click_button 'Comment & resolve discussion'
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end

      it 'allows user to comment & unresolve discussion' do
        page.within '.diff-content' do
          click_button 'Resolve discussion'

          click_button 'Reply...'

          find('.js-note-text').set 'testing'

          click_button 'Comment & unresolve discussion'
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end
    end
  end

  context 'as a guest' do
    before do
454
      project.add_guest(guest)
455
      sign_in(guest)
456 457 458 459 460 461 462 463 464
    end

    context 'someone elses merge request' do
      before do
        visit_merge_request
      end

      it 'does not allow user to mark note as resolved' do
        page.within '.diff-content .note' do
P
Phil Hughes 已提交
465
          expect(page).not_to have_selector('.line-resolve-btn')
466 467 468 469 470 471 472 473 474 475 476 477 478 479 480
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end

      it 'does not allow user to mark discussion as resolved' do
        page.within '.diff-content .note' do
          expect(page).not_to have_selector('.btn', text: 'Resolve discussion')
        end
      end
    end

    context 'guest users merge request' do
481 482
      let(:user) { guest }

483
      before do
484
        visit_merge_request
485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506
      end

      it 'allows user to mark a note as resolved' do
        page.within '.diff-content .note' do
          find('.line-resolve-btn').click

          expect(page).to have_selector('.line-resolve-btn.is-active')
        end

        page.within '.diff-content' do
          expect(page).to have_selector('.btn', text: 'Unresolve discussion')
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('1/1 discussion resolved')
          expect(page).to have_selector('.line-resolve-btn.is-active')
        end
      end
    end
  end

  context 'unauthorized user' do
P
Phil Hughes 已提交
507 508 509 510 511 512 513 514 515 516 517 518 519 520
    context 'no resolved comments' do
      before do
        visit_merge_request
      end

      it 'does not allow user to mark note as resolved' do
        page.within '.diff-content .note' do
          expect(page).not_to have_selector('.line-resolve-btn')
        end

        page.within '.line-resolve-all-container' do
          expect(page).to have_content('0/1 discussion resolved')
        end
      end
521 522
    end

P
Phil Hughes 已提交
523 524 525 526 527 528 529 530 531
    context 'resolved comment' do
      before do
        note.resolve!(user)
        visit_merge_request
      end

      it 'shows resolved icon' do
        expect(page).to have_content '1/1 discussion resolved'

E
Eric Eastwood 已提交
532
        click_button 'Toggle discussion'
P
Phil Hughes 已提交
533
        expect(page).to have_selector('.line-resolve-btn.is-active')
534 535
      end

P
Phil Hughes 已提交
536 537
      it 'does not allow user to click resolve button' do
        expect(page).to have_selector('.line-resolve-btn.is-disabled')
E
Eric Eastwood 已提交
538
        click_button 'Toggle discussion'
P
Phil Hughes 已提交
539 540

        expect(page).to have_selector('.line-resolve-btn.is-disabled')
541 542 543 544 545
      end
    end
  end

  def visit_merge_request(mr = nil)
546
    mr ||= merge_request
547
    visit project_merge_request_path(mr.project, mr)
548 549
  end
end