user_sees_avatar_on_diff_notes_spec.rb 5.8 KB
Newer Older
1
require 'rails_helper'
2

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

6
  let(:project)       { create(:project, :public, :repository) }
7
  let(:user)          { project.creator }
8 9 10 11 12 13 14 15 16 17 18 19 20 21
  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
22
    project.add_maintainer(user)
23
    sign_in user
P
Phil Hughes 已提交
24

M
Mike Greiling 已提交
25
    set_cookie('sidebar_collapsed', 'true')
26 27
  end

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

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

67
        wait_for_requests
P
Phil Hughes 已提交
68 69
      end

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

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

83
        wait_for_requests
84 85

        find('.js-toggle-tree-list').click
86 87 88
      end

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

          expect(page).to have_selector('img.js-diff-comment-avatar', count: 1)
        end
      end

      it 'shows comment on note avatar' do
97
        page.within find_line(position.line_code(project.repository)) do
98
          find('.diff-notes-collapse').send_keys(:return)
99

100
          expect(first('img.js-diff-comment-avatar')["data-original-title"]).to eq("#{note.author.name}: #{note.note.truncate(17)}")
101 102 103 104
        end
      end

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

F
Felipe Artur 已提交
109
        expect(page).not_to have_selector('.notes_holder')
110

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

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

      it 'removes avatar when note is deleted' do
119 120
        open_more_actions_dropdown(note)

121
        page.within find(".note-row-#{note.id}") do
122
          accept_confirm { find('.js-note-delete').click }
123 124
        end

125
        wait_for_requests
126

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

140
          wait_for_requests
141 142
        end

143
        page.within find_line(position.line_code(project.repository)) do
144
          find('.diff-notes-collapse').send_keys(:return)
145 146 147 148 149 150 151 152 153 154 155

          expect(page).to have_selector('img.js-diff-comment-avatar', count: 2)
        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')
156
            find('.js-comment-button').click
157

158
            wait_for_requests
159 160 161
          end
        end

162
        page.within find_line(position.line_code(project.repository)) do
163
          find('.diff-notes-collapse').send_keys(:return)
164 165 166 167 168 169 170

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

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

175
          wait_for_requests
176 177 178
        end

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

            expect(find('.diff-comments-more-count')).to have_content '+1'
          end
        end
      end
    end
  end
188 189 190 191 192 193

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