Skip to content
Snippets Groups Projects
notes_on_merge_requests_spec.rb 7.01 KiB
Newer Older
  • Learn to ignore specific revisions
  • Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
    describe 'Comments' do
      include RepoHelpers
    
      describe 'On a merge request', js: true, feature: true do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
        let!(:merge_request) { create(:merge_request) }
        let!(:project) { merge_request.source_project }
    
        let!(:note) do
          create(:note_on_merge_request, :with_attachment, project: project)
        end
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
        before do
          login_as :admin
    
    Vinnie Okada's avatar
    Vinnie Okada committed
          visit namespace_project_merge_request_path(project.namespace, project, merge_request)
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
        subject { page }
    
        describe 'the note form' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
          it 'should be valid' do
    
            is_expected.to have_css('.js-main-target-form', visible: true, count: 1)
            expect(find('.js-main-target-form input[type=submit]').value).
              to eq('Add Comment')
    
            page.within('.js-main-target-form') do
    
              expect(page).not_to have_link('Cancel')
            end
    
          describe 'with text' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            before do
    
              page.within('.js-main-target-form') do
    
                fill_in 'note[note]', with: 'This is awesome'
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
            end
    
            it 'should have enable submit button and preview button' do
    
              page.within('.js-main-target-form') do
    
    Vinnie Okada's avatar
    Vinnie Okada committed
                expect(page).not_to have_css('.js-comment-button[disabled]')
    
    Vinnie Okada's avatar
    Vinnie Okada committed
                expect(page).to have_css('.js-md-preview-button', visible: true)
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            end
    
        describe 'when posting a note' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
          before do
    
            page.within('.js-main-target-form') do
    
              fill_in 'note[note]', with: 'This is awsome!'
    
              find('.js-md-preview-button').click
    
              click_button 'Add Comment'
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            end
          end
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
          it 'should be added and form reset' do
    
            is_expected.to have_content('This is awsome!')
    
            page.within('.js-main-target-form') do
    
    Vinnie Okada's avatar
    Vinnie Okada committed
              expect(page).to have_no_field('note[note]', with: 'This is awesome!')
    
    Vinnie Okada's avatar
    Vinnie Okada committed
              expect(page).to have_css('.js-md-preview', visible: :hidden)
    
            page.within('.js-main-target-form') do
    
              is_expected.to have_css('.js-note-text', visible: true)
            end
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
          end
    
        describe 'when editing a note', js: true do
          it 'should contain the hidden edit form' do
    
            page.within("#note_#{note.id}") do
    
              is_expected.to have_css('.note-edit-form', visible: false)
            end
    
          describe 'editing the note' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            before do
              find('.note').hover
              find(".js-note-edit").click
    
            it 'should show 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
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
    
            # TODO: fix after 7.7 release
    
            # 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
    
            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'
                find('.btn-save').click
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
    
    
              page.within("#note_#{note.id}") do
    
                is_expected.to have_css('.note_edited_ago')
                expect(find('.note_edited_ago').text).
                  to match(/less than a minute ago/)
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
    
          describe 'deleting an attachment' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            before do
              find('.note').hover
    
              find('.js-note-edit').click
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            end
    
            it 'shows the delete link' do
    
              page.within('.note-attachment') do
    
                is_expected.to have_css('.js-note-attachment-delete')
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
    
            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')
              expect(find('.current-note-edit-form', visible: false)).
                not_to be_visible
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            end
    
    Jack Weeden's avatar
    Jack Weeden committed
          end
        end
      end
    
      describe 'On a merge request diff', js: true, feature: true do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
        let(:merge_request) { create(:merge_request) }
        let(:project) { merge_request.source_project }
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
          login_as :admin
    
    Vinnie Okada's avatar
    Vinnie Okada committed
          visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
        subject { page }
    
        describe 'when adding a note' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
          before do
    
            click_diff_line
    
          describe 'the notes holder' do
            it { is_expected.to have_css('.js-temp-notes-holder') }
    
            it 'has .new_note css class' do
    
              page.within('.js-temp-notes-holder') do
    
                expect(subject).to have_css('.new_note')
              end
            end
    
          describe 'the note form' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            it "shouldn't add a second form for same row" do
    
              click_diff_line
    
              is_expected.
                to have_css("tr[id='#{line_code}'] + .js-temp-notes-holder form",
                            count: 1)
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
    
    
            it 'should be removed when canceled' do
    
              page.within(".diff-file form[rel$='#{line_code}']") do
    
                find('.js-close-discussion-note-form').trigger('click')
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
    
    
              is_expected.to have_no_css('.js-temp-notes-holder')
    
        describe 'with muliple note forms' do
    
            click_diff_line
            click_diff_line(line_code_2)
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
          end
    
    
          it { is_expected.to have_css('.js-temp-notes-holder', count: 2) }
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
    
    
          describe 'previewing them separately' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            before do
              # add two separate texts and trigger previews on both
    
              page.within("tr[id='#{line_code}'] + .js-temp-notes-holder") do
    
                fill_in 'note[note]', with: 'One comment on line 7'
    
                find('.js-md-preview-button').click
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
    
              page.within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
    
                fill_in 'note[note]', with: 'Another comment on line 10'
    
                find('.js-md-preview-button').click
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
    
          describe 'posting a note' do
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            before do
    
              page.within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
    
                fill_in 'note[note]', with: 'Another comment on line 10'
                click_button('Add Comment')
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
              end
            end
    
            it 'should be added as discussion' do
    
              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)
    
              is_expected.to have_button('Reply')
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
            end
    
    Dmitriy Zaporozhets's avatar
    Dmitriy Zaporozhets committed
    
      def line_code
        sample_compare.changes.first[:line_code]
      end
    
      def line_code_2
        sample_compare.changes.last[:line_code]
      end
    
      def click_diff_line(data = line_code)
        page.find(%Q{button[data-line-code="#{data}"]}, visible: false).click