2018-03-17 18:26:18 +05:30
|
|
|
require 'rails_helper'
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'Merge request > User posts notes', :js do
|
2017-09-10 17:25:29 +05:30
|
|
|
include NoteInteractionHelpers
|
|
|
|
|
|
|
|
let(:project) { create(:project, :repository) }
|
2018-03-17 18:26:18 +05:30
|
|
|
let(:user) { project.creator }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:merge_request) do
|
|
|
|
create(:merge_request, source_project: project, target_project: project)
|
|
|
|
end
|
|
|
|
let!(:note) do
|
|
|
|
create(:note_on_merge_request, :with_attachment, noteable: merge_request,
|
|
|
|
project: project)
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
2018-11-18 11:00:15 +05:30
|
|
|
project.add_maintainer(user)
|
2018-03-17 18:26:18 +05:30
|
|
|
sign_in(user)
|
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
|
|
|
|
|
|
|
|
subject { page }
|
|
|
|
|
|
|
|
describe 'the note form' do
|
|
|
|
it 'is valid' do
|
|
|
|
is_expected.to have_css('.js-main-target-form', visible: true, count: 1)
|
2018-11-08 19:23:39 +05:30
|
|
|
expect(find('.js-main-target-form')).to have_selector('button', text: 'Comment')
|
2017-08-17 22:00:37 +05:30
|
|
|
page.within('.js-main-target-form') do
|
2018-11-08 19:23:39 +05:30
|
|
|
expect(page).not_to have_button('Cancel')
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'with text' do
|
|
|
|
before do
|
|
|
|
page.within('.js-main-target-form') do
|
|
|
|
fill_in 'note[note]', with: 'This is awesome'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has enable submit button and preview button' do
|
|
|
|
page.within('.js-main-target-form') do
|
|
|
|
expect(page).not_to have_css('.js-comment-button[disabled]')
|
|
|
|
expect(page).to have_css('.js-md-preview-button', visible: true)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'when posting a note' do
|
|
|
|
before do
|
|
|
|
page.within('.js-main-target-form') do
|
|
|
|
fill_in 'note[note]', with: 'This is awesome!'
|
|
|
|
find('.js-md-preview-button').click
|
|
|
|
click_button 'Comment'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is added and form reset' do
|
|
|
|
is_expected.to have_content('This is awesome!')
|
|
|
|
page.within('.js-main-target-form') do
|
|
|
|
expect(page).to have_no_field('note[note]', with: 'This is awesome!')
|
2018-11-08 19:23:39 +05:30
|
|
|
expect(page).to have_css('.js-vue-md-preview', visible: :hidden)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2018-11-08 19:23:39 +05:30
|
|
|
wait_for_requests
|
2017-08-17 22:00:37 +05:30
|
|
|
page.within('.js-main-target-form') do
|
|
|
|
is_expected.to have_css('.js-note-text', visible: true)
|
|
|
|
end
|
|
|
|
end
|
2019-03-02 22:35:43 +05:30
|
|
|
|
2019-05-30 16:15:17 +05:30
|
|
|
describe 'when reply_to_individual_notes feature flag is not set' do
|
2019-03-02 22:35:43 +05:30
|
|
|
before do
|
2019-05-30 16:15:17 +05:30
|
|
|
stub_feature_flags(reply_to_individual_notes: false)
|
|
|
|
visit project_merge_request_path(project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not show a reply button' do
|
|
|
|
expect(page).to have_no_selector('.js-reply-button')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'when reply_to_individual_notes feature flag is set' do
|
|
|
|
before do
|
|
|
|
stub_feature_flags(reply_to_individual_notes: true)
|
2019-03-02 22:35:43 +05:30
|
|
|
visit project_merge_request_path(project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows a reply button' do
|
|
|
|
reply_button = find('.js-reply-button', match: :first)
|
|
|
|
|
|
|
|
expect(reply_button).to have_selector('.ic-comment')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows reply placeholder when clicking reply button' do
|
|
|
|
reply_button = find('.js-reply-button', match: :first)
|
|
|
|
|
|
|
|
reply_button.click
|
|
|
|
|
|
|
|
expect(page).to have_selector('.discussion-reply-holder')
|
|
|
|
end
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'when previewing a note' do
|
|
|
|
it 'shows the toolbar buttons when editing a note' do
|
|
|
|
page.within('.js-main-target-form') do
|
|
|
|
expect(page).to have_css('.md-header-toolbar.active')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'hides the toolbar buttons when previewing a note' do
|
2018-11-08 19:23:39 +05:30
|
|
|
wait_for_requests
|
2018-03-17 18:26:18 +05:30
|
|
|
find('.js-md-preview-button').click
|
|
|
|
page.within('.js-main-target-form') do
|
|
|
|
expect(page).not_to have_css('.md-header-toolbar.active')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
describe 'when editing a note' do
|
|
|
|
describe 'editing the note' do
|
|
|
|
before do
|
|
|
|
find('.note').hover
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
find('.js-note-edit').click
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows the note edit form and hide the note body' do
|
|
|
|
page.within("#note_#{note.id}") do
|
|
|
|
expect(find('.current-note-edit-form', visible: true)).to be_visible
|
|
|
|
expect(find('.note-edit-form', visible: true)).to be_visible
|
|
|
|
expect(find(:css, '.note-body > .note-text', visible: false)).not_to be_visible
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'resets the edit note form textarea with the original content of the note if cancelled' do
|
|
|
|
within('.current-note-edit-form') do
|
|
|
|
fill_in 'note[note]', with: 'Some new content'
|
|
|
|
find('.btn-cancel').click
|
|
|
|
end
|
2018-11-08 19:23:39 +05:30
|
|
|
expect(find('.js-note-text').text).to eq ''
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'allows using markdown buttons after saving a note and then trying to edit it again' do
|
|
|
|
page.within('.current-note-edit-form') do
|
|
|
|
fill_in 'note[note]', with: 'This is the new content'
|
2018-12-05 23:21:45 +05:30
|
|
|
find('.btn-success').click
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
find('.note').hover
|
2018-11-08 19:23:39 +05:30
|
|
|
wait_for_requests
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
find('.js-note-edit').click
|
|
|
|
|
|
|
|
page.within('.current-note-edit-form') do
|
|
|
|
expect(find('#note_note').value).to eq('This is the new content')
|
|
|
|
find('.js-md:first-child').click
|
|
|
|
expect(find('#note_note').value).to eq('This is the new content****')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'appends the edited at time to the note' do
|
|
|
|
page.within('.current-note-edit-form') do
|
|
|
|
fill_in 'note[note]', with: 'Some new content'
|
2018-12-05 23:21:45 +05:30
|
|
|
find('.btn-success').click
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
page.within("#note_#{note.id}") do
|
|
|
|
is_expected.to have_css('.note_edited_ago')
|
2017-09-10 17:25:29 +05:30
|
|
|
expect(find('.note_edited_ago').text)
|
2018-11-08 19:23:39 +05:30
|
|
|
.to match(/just now/)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-03-27 19:54:05 +05:30
|
|
|
describe 'deleting attachment on legacy diff note' do
|
2017-08-17 22:00:37 +05:30
|
|
|
before do
|
|
|
|
find('.note').hover
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
find('.js-note-edit').click
|
|
|
|
end
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
# TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
|
|
|
|
xit 'shows the delete link' do
|
2017-08-17 22:00:37 +05:30
|
|
|
page.within('.note-attachment') do
|
|
|
|
is_expected.to have_css('.js-note-attachment-delete')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
# TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
|
|
|
|
xit 'removes the attachment div and resets the edit form' do
|
2018-03-17 18:26:18 +05:30
|
|
|
accept_confirm { find('.js-note-attachment-delete').click }
|
2017-08-17 22:00:37 +05:30
|
|
|
is_expected.not_to have_css('.note-attachment')
|
|
|
|
is_expected.not_to have_css('.current-note-edit-form')
|
2017-09-10 17:25:29 +05:30
|
|
|
wait_for_requests
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|