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

3
require 'rails_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 12 13 14 15 16 17 18 19 20 21 22 23
  let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: "Bug NS-04") }
  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
  let!(:note) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) }

  before do
24
    project.add_maintainer(user)
25
    sign_in user
P
Phil Hughes 已提交
26

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

P
Phil Hughes 已提交
30 31
  context 'discussion tab' do
    before do
32
      visit project_merge_request_path(project, merge_request)
P
Phil Hughes 已提交
33 34 35 36 37 38 39
    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 已提交
40
    it 'does not render avatars after commenting on discussion tab' do
P
Phil Hughes 已提交
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
      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
57
      visit project_commit_path(project, merge_request.commits.first.id)
P
Phil Hughes 已提交
58 59 60
    end

    it 'does not render avatar after commenting' do
61
      first('.diff-line-num').click
P
Phil Hughes 已提交
62 63 64 65 66 67 68
      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'

69
        wait_for_requests
P
Phil Hughes 已提交
70 71
      end

72
      visit project_merge_request_path(project, merge_request)
P
Phil Hughes 已提交
73 74 75 76 77 78 79

      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 已提交
80
  %w(parallel).each do |view|
81 82
    context "#{view} view" do
      before do
83
        visit diffs_project_merge_request_path(project, merge_request, view: view)
84

85
        wait_for_requests
86 87

        find('.js-toggle-tree-list').click
88 89 90
      end

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

94
          expect(page).to have_selector('.js-diff-comment-avatar img', count: 1)
95 96 97 98
        end
      end

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

        expect(page).to have_content "#{note.author.name}: #{note.note.truncate(17)}"
105 106 107
      end

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

F
Felipe Artur 已提交
112
        expect(page).not_to have_selector('.notes_holder')
113

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

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

      it 'removes avatar when note is deleted' do
122 123
        open_more_actions_dropdown(note)

124
        page.within find(".note-row-#{note.id}") do
125
          accept_confirm { find('.js-note-delete').click }
126 127
        end

128
        wait_for_requests
129

130
        page.within find_line(position.line_code(project.repository)) do
131
          expect(page).not_to have_selector('.js-diff-comment-avatar img')
132 133 134 135 136 137 138 139 140 141 142
        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'

143
          wait_for_requests
144 145
        end

146
        page.within find_line(position.line_code(project.repository)) do
147
          find('.diff-notes-collapse').send_keys(:return)
148

149
          expect(page).to have_selector('.js-diff-comment-avatar img', count: 2)
150 151 152 153 154 155 156 157 158
        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')
159
            find('.js-comment-button').click
160

161
            wait_for_requests
162 163 164
          end
        end

165
        page.within find_line(position.line_code(project.repository)) do
166
          find('.diff-notes-collapse').send_keys(:return)
167

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

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

178
          wait_for_requests
179 180 181
        end

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

            expect(find('.diff-comments-more-count')).to have_content '+1'
          end
        end
      end
    end
  end
191 192 193 194 195 196

  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
197
end