user_sees_avatar_on_diff_notes_spec.rb 5.9 KB
Newer Older
1 2
# frozen_string_literal: true

3
require 'spec_helper'
4

5
describe 'Merge request > User sees avatars on diff notes', :js do
6 7
  include NoteInteractionHelpers

8
  let(:project)       { create(:project, :public, :repository) }
9
  let(:user)          { project.creator }
10 11
  let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: 'Bug NS-04') }
  let(:path)          { 'files/ruby/popen.rb' }
12 13 14 15 16 17 18 19 20 21 22 23
  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
  let!(:note) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) }

  before do
24
    stub_feature_flags(single_mr_diff_view: false)
25
    project.add_maintainer(user)
26
    sign_in user
P
Phil Hughes 已提交
27

M
Mike Greiling 已提交
28
    set_cookie('sidebar_collapsed', 'true')
29 30
  end

31 32
  it_behaves_like 'rendering a single diff version'

P
Phil Hughes 已提交
33 34
  context 'discussion tab' do
    before do
35
      visit project_merge_request_path(project, merge_request)
P
Phil Hughes 已提交
36 37 38 39 40 41 42
    end

    it 'does not show avatars on discussion tab' do
      expect(page).not_to have_selector('.js-avatar-container')
      expect(page).not_to have_selector('.diff-comment-avatar-holders')
    end

F
Felipe Artur 已提交
43
    it 'does not render avatars after commenting on discussion tab' do
P
Phil Hughes 已提交
44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
      click_button 'Reply...'

      page.within('.js-discussion-note-form') do
        find('.note-textarea').native.send_keys('Test comment')

        click_button 'Comment'
      end

      expect(page).to have_content('Test comment')
      expect(page).not_to have_selector('.js-avatar-container')
      expect(page).not_to have_selector('.diff-comment-avatar-holders')
    end
  end

  context 'commit view' do
    before do
60
      visit project_commit_path(project, merge_request.commits.first.id)
P
Phil Hughes 已提交
61 62 63
    end

    it 'does not render avatar after commenting' do
64
      first('.diff-line-num').click
P
Phil Hughes 已提交
65 66 67 68 69 70 71
      find('.js-add-diff-note-button').click

      page.within('.js-discussion-note-form') do
        find('.note-textarea').native.send_keys('test comment')

        click_button 'Comment'

72
        wait_for_requests
P
Phil Hughes 已提交
73 74
      end

75
      visit project_merge_request_path(project, merge_request)
P
Phil Hughes 已提交
76 77 78 79 80 81 82

      expect(page).to have_content('test comment')
      expect(page).not_to have_selector('.js-avatar-container')
      expect(page).not_to have_selector('.diff-comment-avatar-holders')
    end
  end

F
Felipe Artur 已提交
83
  %w(parallel).each do |view|
84 85
    context "#{view} view" do
      before do
86
        visit diffs_project_merge_request_path(project, merge_request, view: view)
87

88
        wait_for_requests
89 90

        find('.js-toggle-tree-list').click
91 92 93
      end

      it 'shows note avatar' do
94
        page.within find_line(position.line_code(project.repository)) do
95
          find('.diff-notes-collapse').send_keys(:return)
96

97
          expect(page).to have_selector('.js-diff-comment-avatar img', count: 1)
98 99 100 101
        end
      end

      it 'shows comment on note avatar' do
102
        page.within find_line(position.line_code(project.repository)) do
103
          find('.diff-notes-collapse').send_keys(:return)
104
          first('.js-diff-comment-avatar img').hover
105
        end
106 107

        expect(page).to have_content "#{note.author.name}: #{note.note.truncate(17)}"
108 109 110
      end

      it 'toggles comments when clicking avatar' do
111
        page.within find_line(position.line_code(project.repository)) do
112
          find('.diff-notes-collapse').send_keys(:return)
113 114
        end

F
Felipe Artur 已提交
115
        expect(page).not_to have_selector('.notes_holder')
116

117
        page.within find_line(position.line_code(project.repository)) do
118
          first('.js-diff-comment-avatar img').click
119 120 121 122 123 124
        end

        expect(page).to have_selector('.notes_holder')
      end

      it 'removes avatar when note is deleted' do
125 126
        open_more_actions_dropdown(note)

127
        page.within find(".note-row-#{note.id}") do
128
          accept_confirm { find('.js-note-delete').click }
129 130
        end

131
        wait_for_requests
132

133
        page.within find_line(position.line_code(project.repository)) do
134
          expect(page).not_to have_selector('.js-diff-comment-avatar img')
135 136 137 138 139 140 141 142 143 144 145
        end
      end

      it 'adds avatar when commenting' do
        click_button 'Reply...'

        page.within '.js-discussion-note-form' do
          find('.js-note-text').native.send_keys('Test')

          click_button 'Comment'

146
          wait_for_requests
147 148
        end

149
        page.within find_line(position.line_code(project.repository)) do
150
          find('.diff-notes-collapse').send_keys(:return)
151

152
          expect(page).to have_selector('.js-diff-comment-avatar img', count: 2)
153 154 155 156 157 158 159 160 161
        end
      end

      it 'adds multiple comments' do
        3.times do
          click_button 'Reply...'

          page.within '.js-discussion-note-form' do
            find('.js-note-text').native.send_keys('Test')
162
            find('.js-comment-button').click
163

164
            wait_for_requests
165 166 167
          end
        end

168
        page.within find_line(position.line_code(project.repository)) do
169
          find('.diff-notes-collapse').send_keys(:return)
170

171
          expect(page).to have_selector('.js-diff-comment-avatar img', count: 3)
172 173 174 175 176
          expect(find('.diff-comments-more-count')).to have_content '+1'
        end
      end

      context 'multiple comments' do
D
Douwe Maan 已提交
177
        before do
D
Douwe Maan 已提交
178
          create_list(:diff_note_on_merge_request, 3, project: project, noteable: merge_request, in_reply_to: note)
179
          visit diffs_project_merge_request_path(project, merge_request, view: view)
180

181
          wait_for_requests
182 183 184
        end

        it 'shows extra comment count' do
185
          page.within find_line(position.line_code(project.repository)) do
186
            find('.diff-notes-collapse').send_keys(:return)
187 188 189 190 191 192 193

            expect(find('.diff-comments-more-count')).to have_content '+1'
          end
        end
      end
    end
  end
194 195 196 197 198 199

  def find_line(line_code)
    line = find("[id='#{line_code}']")
    line = line.find(:xpath, 'preceding-sibling::*[1][self::td]') if line.tag_name == 'td'
    line
  end
200
end