debian-mirror-gitlab/spec/features/notes_on_merge_requests_spec.rb

260 lines
8.2 KiB
Ruby
Raw Normal View History

2014-09-02 18:07:02 +05:30
require 'spec_helper'
2015-09-11 14:41:01 +05:30
describe 'Comments', feature: true do
2014-09-02 18:07:02 +05:30
include RepoHelpers
2015-12-23 02:04:40 +05:30
include WaitForAjax
2014-09-02 18:07:02 +05:30
describe 'On a merge request', js: true, feature: true do
let!(:project) { create(:project) }
let!(:merge_request) do
create(:merge_request, source_project: project, target_project: project)
2016-06-02 11:05:42 +05:30
end
2015-04-26 12:48:37 +05:30
let!(:note) do
create(:note_on_merge_request, :with_attachment, noteable: merge_request,
project: project)
2015-04-26 12:48:37 +05:30
end
2014-09-02 18:07:02 +05:30
before do
login_as :admin
2015-04-26 12:48:37 +05:30
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
2014-09-02 18:07:02 +05:30
end
subject { page }
2015-04-26 12:48:37 +05:30
describe 'the note form' do
2014-09-02 18:07:02 +05:30
it 'should be valid' do
2015-04-26 12:48:37 +05:30
is_expected.to have_css('.js-main-target-form', visible: true, count: 1)
expect(find('.js-main-target-form input[type=submit]').value).
2016-06-02 11:05:42 +05:30
to eq('Comment')
2015-09-11 14:41:01 +05:30
page.within('.js-main-target-form') do
2015-04-26 12:48:37 +05:30
expect(page).not_to have_link('Cancel')
end
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
describe 'with text' do
2014-09-02 18:07:02 +05:30
before do
2015-09-11 14:41:01 +05:30
page.within('.js-main-target-form') do
2015-04-26 12:48:37 +05:30
fill_in 'note[note]', with: 'This is awesome'
2014-09-02 18:07:02 +05:30
end
end
it 'should have enable submit button and preview button' do
2015-09-11 14:41:01 +05:30
page.within('.js-main-target-form') do
2015-04-26 12:48:37 +05:30
expect(page).not_to have_css('.js-comment-button[disabled]')
expect(page).to have_css('.js-md-preview-button', visible: true)
end
2014-09-02 18:07:02 +05:30
end
end
end
2015-04-26 12:48:37 +05:30
describe 'when posting a note' do
2014-09-02 18:07:02 +05:30
before do
2015-09-11 14:41:01 +05:30
page.within('.js-main-target-form') do
2015-04-26 12:48:37 +05:30
fill_in 'note[note]', with: 'This is awsome!'
find('.js-md-preview-button').click
2016-06-02 11:05:42 +05:30
click_button 'Comment'
2014-09-02 18:07:02 +05:30
end
end
it 'should be added and form reset' do
2015-04-26 12:48:37 +05:30
is_expected.to have_content('This is awsome!')
2015-09-11 14:41:01 +05:30
page.within('.js-main-target-form') do
2015-04-26 12:48:37 +05:30
expect(page).to have_no_field('note[note]', with: 'This is awesome!')
expect(page).to have_css('.js-md-preview', visible: :hidden)
end
2015-09-11 14:41:01 +05:30
page.within('.js-main-target-form') do
2015-04-26 12:48:37 +05:30
is_expected.to have_css('.js-note-text', visible: true)
end
2014-09-02 18:07:02 +05:30
end
end
2015-04-26 12:48:37 +05:30
describe 'when editing a note', js: true do
it 'should contain the hidden edit form' do
2015-09-11 14:41:01 +05:30
page.within("#note_#{note.id}") do
2015-04-26 12:48:37 +05:30
is_expected.to have_css('.note-edit-form', visible: false)
end
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
describe 'editing the note' do
2014-09-02 18:07:02 +05:30
before do
find('.note').hover
find(".js-note-edit").click
end
2015-04-26 12:48:37 +05:30
it 'should show the note edit form and hide the note body' do
2015-09-11 14:41:01 +05:30
page.within("#note_#{note.id}") do
2015-04-26 12:48:37 +05:30
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
2014-09-02 18:07:02 +05:30
end
end
2015-04-26 12:48:37 +05:30
# TODO: fix after 7.7 release
2015-09-11 14:41:01 +05:30
# it "should reset 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
# expect(find(".js-note-text", visible: false).text).to eq note.note
# end
# end
2015-04-26 12:48:37 +05:30
it 'appends the edited at time to the note' do
2015-09-11 14:41:01 +05:30
page.within('.current-note-edit-form') do
2015-04-26 12:48:37 +05:30
fill_in 'note[note]', with: 'Some new content'
find('.btn-save').click
2014-09-02 18:07:02 +05:30
end
2015-09-11 14:41:01 +05:30
page.within("#note_#{note.id}") do
2015-04-26 12:48:37 +05:30
is_expected.to have_css('.note_edited_ago')
expect(find('.note_edited_ago').text).
to match(/less than a minute ago/)
2014-09-02 18:07:02 +05:30
end
end
end
2015-04-26 12:48:37 +05:30
describe 'deleting an attachment' do
2014-09-02 18:07:02 +05:30
before do
find('.note').hover
2015-04-26 12:48:37 +05:30
find('.js-note-edit').click
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
it 'shows the delete link' do
2015-09-11 14:41:01 +05:30
page.within('.note-attachment') do
2015-04-26 12:48:37 +05:30
is_expected.to have_css('.js-note-attachment-delete')
2014-09-02 18:07:02 +05:30
end
end
2015-04-26 12:48:37 +05:30
it 'removes the attachment div and resets the edit form' do
find('.js-note-attachment-delete').click
is_expected.not_to have_css('.note-attachment')
2015-12-23 02:04:40 +05:30
is_expected.not_to have_css('.current-note-edit-form')
wait_for_ajax
2014-09-02 18:07:02 +05:30
end
end
end
end
2016-08-24 12:49:21 +05:30
describe 'Handles cross-project system notes', js: true, feature: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:project2) { create(:project, :private) }
let(:issue) { create(:issue, project: project2) }
let(:merge_request) { create(:merge_request, source_project: project, source_branch: 'markdown') }
let!(:note) { create(:note_on_merge_request, :system, noteable: merge_request, project: project, note: "mentioned in #{issue.to_reference(project)}") }
it 'shows the system note' do
login_as :admin
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
expect(page).to have_css('.system-note')
end
it 'hides redacted system note' do
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
expect(page).not_to have_css('.system-note')
end
end
2015-04-26 12:48:37 +05:30
describe 'On a merge request diff', js: true, feature: true do
2014-09-02 18:07:02 +05:30
let(:merge_request) { create(:merge_request) }
let(:project) { merge_request.source_project }
before do
login_as :admin
2015-04-26 12:48:37 +05:30
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
2014-09-02 18:07:02 +05:30
end
subject { page }
2015-04-26 12:48:37 +05:30
describe 'when adding a note' do
2014-09-02 18:07:02 +05:30
before do
2015-04-26 12:48:37 +05:30
click_diff_line
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
describe 'the notes holder' do
it { is_expected.to have_css('.js-temp-notes-holder') }
2014-09-02 18:07:02 +05:30
2015-04-26 12:48:37 +05:30
it 'has .new_note css class' do
2015-09-11 14:41:01 +05:30
page.within('.js-temp-notes-holder') do
2016-06-02 11:05:42 +05:30
expect(subject).to have_css('.new-note')
2015-04-26 12:48:37 +05:30
end
end
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
describe 'the note form' do
2014-09-02 18:07:02 +05:30
it "shouldn't add a second form for same row" do
2015-04-26 12:48:37 +05:30
click_diff_line
2014-09-02 18:07:02 +05:30
2015-04-26 12:48:37 +05:30
is_expected.
2016-08-24 12:49:21 +05:30
to have_css("form[data-line-code='#{line_code}']",
2015-04-26 12:48:37 +05:30
count: 1)
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
it 'should be removed when canceled' do
2016-08-24 12:49:21 +05:30
is_expected.to have_css('.js-temp-notes-holder')
page.within("form[data-line-code='#{line_code}']") do
2015-04-26 12:48:37 +05:30
find('.js-close-discussion-note-form').trigger('click')
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
is_expected.to have_no_css('.js-temp-notes-holder')
2014-09-02 18:07:02 +05:30
end
end
end
2015-04-26 12:48:37 +05:30
describe 'with muliple note forms' do
2014-09-02 18:07:02 +05:30
before do
2015-04-26 12:48:37 +05:30
click_diff_line
click_diff_line(line_code_2)
2014-09-02 18:07:02 +05:30
end
2015-04-26 12:48:37 +05:30
it { is_expected.to have_css('.js-temp-notes-holder', count: 2) }
2014-09-02 18:07:02 +05:30
2015-04-26 12:48:37 +05:30
describe 'previewing them separately' do
2014-09-02 18:07:02 +05:30
before do
# add two separate texts and trigger previews on both
2015-09-11 14:41:01 +05:30
page.within("tr[id='#{line_code}'] + .js-temp-notes-holder") do
2015-04-26 12:48:37 +05:30
fill_in 'note[note]', with: 'One comment on line 7'
find('.js-md-preview-button').click
2014-09-02 18:07:02 +05:30
end
2015-09-11 14:41:01 +05:30
page.within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
2015-04-26 12:48:37 +05:30
fill_in 'note[note]', with: 'Another comment on line 10'
find('.js-md-preview-button').click
2014-09-02 18:07:02 +05:30
end
end
end
2015-04-26 12:48:37 +05:30
describe 'posting a note' do
2014-09-02 18:07:02 +05:30
before do
2015-09-11 14:41:01 +05:30
page.within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
2015-04-26 12:48:37 +05:30
fill_in 'note[note]', with: 'Another comment on line 10'
2016-06-02 11:05:42 +05:30
click_button('Comment')
2014-09-02 18:07:02 +05:30
end
end
it 'should be added as discussion' do
2015-04-26 12:48:37 +05:30
is_expected.to have_content('Another comment on line 10')
is_expected.to have_css('.notes_holder')
is_expected.to have_css('.notes_holder .note', count: 1)
2016-06-02 11:05:42 +05:30
is_expected.to have_button('Reply...')
2014-09-02 18:07:02 +05:30
end
end
end
end
def line_code
sample_compare.changes.first[:line_code]
end
def line_code_2
sample_compare.changes.last[:line_code]
end
2015-04-26 12:48:37 +05:30
2015-09-11 14:41:01 +05:30
def click_diff_line(data = line_code)
2016-08-24 12:49:21 +05:30
find(".line_holder[id='#{data}'] td.line_content").hover
find(".line_holder[id='#{data}'] button").trigger('click')
2015-04-26 12:48:37 +05:30
end
2014-09-02 18:07:02 +05:30
end