2017-03-08 11:07:26 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2017-06-29 00:13:10 -04:00
|
|
|
feature 'Diff note avatars', js: true do
|
2017-06-07 14:33:50 -04:00
|
|
|
include NoteInteractionHelpers
|
|
|
|
|
2017-03-08 11:07:26 -05:00
|
|
|
let(:user) { create(:user) }
|
2017-07-26 17:52:10 -04:00
|
|
|
let(:project) { create(:project, :public, :repository) }
|
2017-03-08 11:07:26 -05:00
|
|
|
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
|
|
|
|
project.team << [user, :master]
|
2017-06-21 19:44:10 -04:00
|
|
|
sign_in user
|
2017-08-29 10:54:06 -04:00
|
|
|
|
2017-09-11 03:30:43 -04:00
|
|
|
page.driver.set_cookie('sidebar_collapsed', 'true')
|
2017-03-08 11:07:26 -05:00
|
|
|
end
|
|
|
|
|
2017-03-09 04:47:01 -05:00
|
|
|
context 'discussion tab' do
|
|
|
|
before do
|
2017-07-06 12:20:50 -04:00
|
|
|
visit project_merge_request_path(project, merge_request)
|
2017-03-09 04:47:01 -05:00
|
|
|
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
|
|
|
|
|
|
|
|
it 'does not render avatars after commening on discussion tab' do
|
|
|
|
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
|
2017-07-06 12:20:50 -04:00
|
|
|
visit project_commit_path(project, merge_request.commits.first.id)
|
2017-03-09 04:47:01 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not render avatar after commenting' do
|
|
|
|
first('.diff-line-num').trigger('mouseover')
|
|
|
|
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'
|
|
|
|
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-03-09 04:47:01 -05:00
|
|
|
end
|
|
|
|
|
2017-07-06 12:20:50 -04:00
|
|
|
visit project_merge_request_path(project, merge_request)
|
2017-03-09 04:47:01 -05:00
|
|
|
|
|
|
|
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
|
|
|
|
|
2017-03-08 11:07:26 -05:00
|
|
|
%w(inline parallel).each do |view|
|
|
|
|
context "#{view} view" do
|
|
|
|
before do
|
2017-07-06 12:20:50 -04:00
|
|
|
visit diffs_project_merge_request_path(project, merge_request, view: view)
|
2017-03-08 11:07:26 -05:00
|
|
|
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-03-08 11:07:26 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows note avatar' do
|
2017-09-28 10:55:25 -04:00
|
|
|
page.within find_line(position.line_code(project.repository)) do
|
2017-03-08 11:07:26 -05:00
|
|
|
find('.diff-notes-collapse').click
|
|
|
|
|
|
|
|
expect(page).to have_selector('img.js-diff-comment-avatar', count: 1)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows comment on note avatar' do
|
2017-09-28 10:55:25 -04:00
|
|
|
page.within find_line(position.line_code(project.repository)) do
|
2017-03-08 11:07:26 -05:00
|
|
|
find('.diff-notes-collapse').click
|
|
|
|
|
2017-04-15 19:38:07 -04:00
|
|
|
expect(first('img.js-diff-comment-avatar')["data-original-title"]).to eq("#{note.author.name}: #{note.note.truncate(17)}")
|
2017-03-08 11:07:26 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'toggles comments when clicking avatar' do
|
2017-09-28 10:55:25 -04:00
|
|
|
page.within find_line(position.line_code(project.repository)) do
|
2017-03-08 11:07:26 -05:00
|
|
|
find('.diff-notes-collapse').click
|
|
|
|
end
|
|
|
|
|
|
|
|
expect(page).to have_selector('.notes_holder', visible: false)
|
|
|
|
|
2017-09-28 10:55:25 -04:00
|
|
|
page.within find_line(position.line_code(project.repository)) do
|
2017-03-08 11:07:26 -05:00
|
|
|
first('img.js-diff-comment-avatar').click
|
|
|
|
end
|
|
|
|
|
|
|
|
expect(page).to have_selector('.notes_holder')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'removes avatar when note is deleted' do
|
2017-06-07 14:33:50 -04:00
|
|
|
open_more_actions_dropdown(note)
|
|
|
|
|
2017-03-08 11:07:26 -05:00
|
|
|
page.within find(".note-row-#{note.id}") do
|
|
|
|
find('.js-note-delete').click
|
|
|
|
end
|
|
|
|
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-03-08 11:07:26 -05:00
|
|
|
|
2017-09-28 10:55:25 -04:00
|
|
|
page.within find_line(position.line_code(project.repository)) do
|
2017-03-08 11:07:26 -05:00
|
|
|
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'
|
|
|
|
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-03-08 11:07:26 -05:00
|
|
|
end
|
|
|
|
|
2017-09-28 10:55:25 -04:00
|
|
|
page.within find_line(position.line_code(project.repository)) do
|
2017-09-06 08:47:58 -04:00
|
|
|
find('.diff-notes-collapse').trigger('click')
|
2017-03-08 11:07:26 -05:00
|
|
|
|
|
|
|
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')
|
|
|
|
|
2017-09-06 08:47:58 -04:00
|
|
|
find('.js-comment-button').trigger('click')
|
2017-03-08 11:07:26 -05:00
|
|
|
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-03-08 11:07:26 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-28 10:55:25 -04:00
|
|
|
page.within find_line(position.line_code(project.repository)) do
|
2017-07-18 01:09:04 -04:00
|
|
|
find('.diff-notes-collapse').trigger('click')
|
2017-03-08 11:07:26 -05:00
|
|
|
|
|
|
|
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
|
2017-03-31 17:52:38 -04:00
|
|
|
before do
|
2017-04-04 18:27:23 -04:00
|
|
|
create_list(:diff_note_on_merge_request, 3, project: project, noteable: merge_request, in_reply_to: note)
|
|
|
|
|
2017-07-06 12:20:50 -04:00
|
|
|
visit diffs_project_merge_request_path(project, merge_request, view: view)
|
2017-03-08 11:07:26 -05:00
|
|
|
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-03-08 11:07:26 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows extra comment count' do
|
2017-09-28 10:55:25 -04:00
|
|
|
page.within find_line(position.line_code(project.repository)) do
|
2017-03-08 11:07:26 -05:00
|
|
|
find('.diff-notes-collapse').click
|
|
|
|
|
|
|
|
expect(find('.diff-comments-more-count')).to have_content '+1'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2017-09-28 10:55:25 -04:00
|
|
|
|
|
|
|
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
|
2017-03-08 11:07:26 -05:00
|
|
|
end
|