debian-mirror-gitlab/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb

197 lines
5.9 KiB
Ruby
Raw Normal View History

2019-10-12 21:52:04 +05:30
# frozen_string_literal: true
2019-12-04 20:38:33 +05:30
require 'spec_helper'
2017-08-17 22:00:37 +05:30
2020-06-23 00:09:42 +05:30
RSpec.describe 'Merge request > User sees avatars on diff notes', :js do
2017-09-10 17:25:29 +05:30
include NoteInteractionHelpers
let(:project) { create(:project, :public, :repository) }
2018-03-17 18:26:18 +05:30
let(:user) { project.creator }
2019-12-26 22:10:19 +05:30
let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: 'Bug NS-04') }
let(:path) { 'files/ruby/popen.rb' }
2017-08-17 22:00:37 +05:30
let(:position) do
2020-03-13 15:44:24 +05:30
build(:text_diff_position, :added,
file: path,
2017-08-17 22:00:37 +05:30
new_line: 9,
diff_refs: merge_request.diff_refs
)
end
2020-10-24 23:57:45 +05:30
2017-08-17 22:00:37 +05:30
let!(:note) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) }
before do
2018-11-18 11:00:15 +05:30
project.add_maintainer(user)
2017-09-10 17:25:29 +05:30
sign_in user
2018-03-17 18:26:18 +05:30
set_cookie('sidebar_collapsed', 'true')
2017-08-17 22:00:37 +05:30
end
context 'discussion tab' do
before do
2017-09-10 17:25:29 +05:30
visit project_merge_request_path(project, merge_request)
2017-08-17 22:00:37 +05:30
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
2018-11-08 19:23:39 +05:30
it 'does not render avatars after commenting on discussion tab' do
2021-04-17 20:07:23 +05:30
find_field('Reply…').click
2017-08-17 22:00:37 +05:30
page.within('.js-discussion-note-form') do
find('.note-textarea').native.send_keys('Test comment')
2020-06-23 00:09:42 +05:30
click_button 'Add comment now'
2017-08-17 22:00:37 +05:30
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-09-10 17:25:29 +05:30
visit project_commit_path(project, merge_request.commits.first.id)
2017-08-17 22:00:37 +05:30
end
it 'does not render avatar after commenting' do
2018-03-17 18:26:18 +05:30
first('.diff-line-num').click
2017-08-17 22:00:37 +05:30
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-09-10 17:25:29 +05:30
wait_for_requests
2017-08-17 22:00:37 +05:30
end
2017-09-10 17:25:29 +05:30
visit project_merge_request_path(project, merge_request)
2017-08-17 22:00:37 +05:30
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
2018-11-08 19:23:39 +05:30
%w(parallel).each do |view|
2017-08-17 22:00:37 +05:30
context "#{view} view" do
before do
2017-09-10 17:25:29 +05:30
visit diffs_project_merge_request_path(project, merge_request, view: view)
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
wait_for_requests
2018-12-05 23:21:45 +05:30
find('.js-toggle-tree-list').click
2017-08-17 22:00:37 +05:30
end
it 'shows note avatar' do
2018-03-17 18:26:18 +05:30
page.within find_line(position.line_code(project.repository)) do
find('.diff-notes-collapse').send_keys(:return)
2017-08-17 22:00:37 +05:30
2018-12-13 13:39:08 +05:30
expect(page).to have_selector('.js-diff-comment-avatar img', count: 1)
2017-08-17 22:00:37 +05:30
end
end
it 'shows comment on note avatar' do
2018-03-17 18:26:18 +05:30
page.within find_line(position.line_code(project.repository)) do
find('.diff-notes-collapse').send_keys(:return)
2018-12-13 13:39:08 +05:30
first('.js-diff-comment-avatar img').hover
2017-08-17 22:00:37 +05:30
end
2018-12-13 13:39:08 +05:30
expect(page).to have_content "#{note.author.name}: #{note.note.truncate(17)}"
2017-08-17 22:00:37 +05:30
end
it 'toggles comments when clicking avatar' do
2018-03-17 18:26:18 +05:30
page.within find_line(position.line_code(project.repository)) do
find('.diff-notes-collapse').send_keys(:return)
2017-08-17 22:00:37 +05:30
end
2018-11-08 19:23:39 +05:30
expect(page).not_to have_selector('.notes_holder')
2017-08-17 22:00:37 +05:30
2018-03-17 18:26:18 +05:30
page.within find_line(position.line_code(project.repository)) do
2018-12-13 13:39:08 +05:30
first('.js-diff-comment-avatar img').click
2017-08-17 22:00:37 +05:30
end
expect(page).to have_selector('.notes_holder')
end
it 'removes avatar when note is deleted' do
2017-09-10 17:25:29 +05:30
open_more_actions_dropdown(note)
2017-08-17 22:00:37 +05:30
page.within find(".note-row-#{note.id}") do
2018-03-17 18:26:18 +05:30
accept_confirm { find('.js-note-delete').click }
2017-08-17 22:00:37 +05:30
end
2017-09-10 17:25:29 +05:30
wait_for_requests
2017-08-17 22:00:37 +05:30
2018-03-17 18:26:18 +05:30
page.within find_line(position.line_code(project.repository)) do
2018-12-13 13:39:08 +05:30
expect(page).not_to have_selector('.js-diff-comment-avatar img')
2017-08-17 22:00:37 +05:30
end
end
it 'adds avatar when commenting' do
2021-04-17 20:07:23 +05:30
find_field('Reply…', match: :first).click
2017-08-17 22:00:37 +05:30
page.within '.js-discussion-note-form' do
find('.js-note-text').native.send_keys('Test')
2020-06-23 00:09:42 +05:30
click_button 'Add comment now'
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
wait_for_requests
2017-08-17 22:00:37 +05:30
end
2018-03-17 18:26:18 +05:30
page.within find_line(position.line_code(project.repository)) do
find('.diff-notes-collapse').send_keys(:return)
2017-08-17 22:00:37 +05:30
2018-12-13 13:39:08 +05:30
expect(page).to have_selector('.js-diff-comment-avatar img', count: 2)
2017-08-17 22:00:37 +05:30
end
end
it 'adds multiple comments' do
3.times do
2021-04-17 20:07:23 +05:30
find_field('Reply…', match: :first).click
2017-08-17 22:00:37 +05:30
page.within '.js-discussion-note-form' do
find('.js-note-text').native.send_keys('Test')
2020-06-23 00:09:42 +05:30
click_button 'Add comment now'
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
wait_for_requests
2017-08-17 22:00:37 +05:30
end
end
2018-03-17 18:26:18 +05:30
page.within find_line(position.line_code(project.repository)) do
find('.diff-notes-collapse').send_keys(:return)
2017-08-17 22:00:37 +05:30
2018-12-13 13:39:08 +05:30
expect(page).to have_selector('.js-diff-comment-avatar img', count: 3)
2017-08-17 22:00:37 +05:30
expect(find('.diff-comments-more-count')).to have_content '+1'
end
end
context 'multiple comments' do
before do
create_list(:diff_note_on_merge_request, 3, project: project, noteable: merge_request, in_reply_to: note)
2017-09-10 17:25:29 +05:30
visit diffs_project_merge_request_path(project, merge_request, view: view)
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
wait_for_requests
2017-08-17 22:00:37 +05:30
end
it 'shows extra comment count' do
2018-03-17 18:26:18 +05:30
page.within find_line(position.line_code(project.repository)) do
find('.diff-notes-collapse').send_keys(:return)
2017-08-17 22:00:37 +05:30
expect(find('.diff-comments-more-count')).to have_content '+1'
end
end
end
end
end
2018-03-17 18:26:18 +05:30
def find_line(line_code)
line = find("[id='#{line_code}']")
2020-04-08 14:13:33 +05:30
line = line.find(:xpath, 'preceding-sibling::*[1][self::td]/preceding-sibling::*[1][self::td]') if line.tag_name == 'td'
2018-03-17 18:26:18 +05:30
line
end
2017-08-17 22:00:37 +05:30
end