notes_on_merge_requests_spec.rb 9.59 KB
Newer Older
1 2 3
require 'spec_helper'

describe "On a merge request", js: true do
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
4
  let!(:project) { create(:project_with_code) }
5
  let!(:merge_request) { create(:merge_request, project: project) }
Jack Weeden's avatar
Jack Weeden committed
6
  let!(:note) { create(:note_on_merge_request_with_attachment, project: project) }
7 8 9

  before do
    login_as :user
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
10
    project.team << [@user, :master]
11 12 13 14 15 16 17

    visit project_merge_request_path(project, merge_request)
  end

  subject { page }

  describe "the note form" do
18 19 20 21 22
    it 'should be valid' do
      should have_css(".js-main-target-form", visible: true, count: 1)
      find(".js-main-target-form input[type=submit]").value.should == "Add Comment"
      within(".js-main-target-form") { should_not have_link("Cancel") }
      within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) }
23 24 25 26 27 28 29 30 31
    end

    describe "with text" do
      before do
        within(".js-main-target-form") do
          fill_in "note[note]", with: "This is awesome"
        end
      end

32 33 34 35
      it 'should have enable submit button and preview button' do
        within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") }
        within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) }
      end
36 37 38 39 40 41 42 43 44 45
    end

    describe "with preview" do
      before do
        within(".js-main-target-form") do
          fill_in "note[note]", with: "This is awesome"
          find(".js-note-preview-button").trigger("click")
        end
      end

46 47 48 49 50
      it 'should have text and visible edit button' do
        within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) }
        within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) }
        within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) }
      end
51 52 53 54 55 56 57 58 59 60 61 62
    end
  end

  describe "when posting a note" do
    before do
      within(".js-main-target-form") do
        fill_in "note[note]", with: "This is awsome!"
        find(".js-note-preview-button").trigger("click")
        click_button "Add Comment"
      end
    end

63 64 65 66 67 68
    it 'should be added and form reset' do
      should have_content("This is awsome!")
      within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!")  }
      within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) }
      within(".js-main-target-form") { should have_css(".js-note-text", visible: true) }
    end
69
  end
Jack Weeden's avatar
Jack Weeden committed
70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134

  describe "when editing a note", js: true do
    it "should contain the hidden edit form" do
      within("#note_#{note.id}") { should have_css(".note-edit-form", visible: false) }
    end

    describe "editing the note" do
      before do
        find('.note').hover
        find(".js-note-edit").click
      end

      it "should show the note edit form and hide the note body" do
        within("#note_#{note.id}") do
          find(".note-edit-form", visible: true).should be_visible
          find(".note-text", visible: false).should_not be_visible
        end
      end

      it "should reset the edit note form textarea with the original content of the note if cancelled" do
        find('.note').hover
        find(".js-note-edit").click

        within(".note-edit-form") do
          fill_in "note[note]", with: "Some new content"
          find(".btn-cancel").click
          find(".js-note-text", visible: false).text.should == note.note
        end
      end

      it "appends the edited at time to the note" do
        find('.note').hover
        find(".js-note-edit").click

        within(".note-edit-form") do
          fill_in "note[note]", with: "Some new content"
          find(".btn-save").click
        end

        within("#note_#{note.id}") do
          should have_css(".note-last-update small")
          find(".note-last-update small").text.should match(/Edited just now/)
        end
      end
    end

    describe "deleting an attachment" do
      before do
        find('.note').hover
        find(".js-note-edit").click
      end

      it "shows the delete link" do
        within(".note-attachment") do
          should have_css(".js-note-attachment-delete")
        end
      end

      it "removes the attachment div and resets the edit form" do
        find(".js-note-attachment-delete").click
        should_not have_css(".note-attachment")
        find(".note-edit-form", visible: false).should_not be_visible
      end
    end
  end
135 136 137
end

describe "On a merge request diff", js: true, focus: true do
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
138
  let!(:project) { create(:project_with_code) }
139 140
  let!(:merge_request) { create(:merge_request_with_diffs, project: project) }

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
141
  before do
142
    login_as :user
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
143 144
    project.team << [@user, :master]
    visit diffs_project_merge_request_path(project, merge_request)
145 146 147 148 149 150
  end

  subject { page }

  describe "when adding a note" do
    before do
151
      find('a[data-line-code="4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185"]').click
152 153 154
    end

    describe "the notes holder" do
155
      it { should have_css(".js-temp-notes-holder") }
156 157 158 159 160

      it { within(".js-temp-notes-holder") { should have_css(".new_note") } }
    end

    describe "the note form" do
161 162 163 164 165 166 167
      it 'should be valid' do
        within(".js-temp-notes-holder") { find("#note_noteable_type").value.should == "MergeRequest" }
        within(".js-temp-notes-holder") { find("#note_noteable_id").value.should == merge_request.id.to_s }
        within(".js-temp-notes-holder") { find("#note_commit_id").value.should == "" }
        within(".js-temp-notes-holder") { find("#note_line_code").value.should == "4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185" }
        should have_css(".js-close-discussion-note-form", text: "Cancel")
      end
168 169

      it "shouldn't add a second form for same row" do
170
        find('a[data-line-code="4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185"]').click
171

172
        should have_css("tr[id='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185'] + .js-temp-notes-holder form", count: 1)
173 174 175
      end

      it "should be removed when canceled" do
176 177 178
        within(".file form[rel$='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185']") do
          find(".js-close-discussion-note-form").trigger("click")
        end
179 180 181 182 183 184 185 186

        should have_no_css(".js-temp-notes-holder")
      end
    end
  end

  describe "with muliple note forms" do
    before do
187 188
      find('a[data-line-code="4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185"]').click
      find('a[data-line-code="342e16cbbd482ac2047dc679b2749d248cc1428f_18_17"]').click
189 190 191 192 193 194 195
    end

    it { should have_css(".js-temp-notes-holder", count: 2) }

    describe "previewing them separately" do
      before do
        # add two separate texts and trigger previews on both
196
        within("tr[id='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185'] + .js-temp-notes-holder") do
197 198 199
          fill_in "note[note]", with: "One comment on line 185"
          find(".js-note-preview-button").trigger("click")
        end
200
        within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .js-temp-notes-holder") do
201 202 203 204 205
          fill_in "note[note]", with: "Another comment on line 17"
          find(".js-note-preview-button").trigger("click")
        end
      end

206 207 208 209 210 211 212 213 214 215
      # TODO: fix
      #it 'should check if previews were rendered separately' do
        #within("tr[id='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185'] + .js-temp-notes-holder") do
          #should have_css(".js-note-preview", text: "One comment on line 185")
        #end

        #within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .js-temp-notes-holder") do
          #should have_css(".js-note-preview", text: "Another comment on line 17")
        #end
      #end
216 217 218 219
    end

    describe "posting a note" do
      before do
220
        within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .js-temp-notes-holder") do
221 222 223 224 225
          fill_in "note[note]", with: "Another comment on line 17"
          click_button("Add Comment")
        end
      end

226 227 228 229 230
      it do
        within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .js-temp-notes-holder") do
          should have_no_css(".js-temp-notes-holder")
        end
      end
231

232 233
      it 'should be added as discussion' do
        should have_content("Another comment on line 17")
234 235
        should have_css(".notes_holder")
        should have_css(".notes_holder .note", count: 1)
236 237
        should have_link("Reply")
      end
238

239 240 241 242 243
      # TODO: fix
      #it "should remove last note of a discussion" do
        #within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .notes-holder") do
          #find(".js-note-delete").click
        #end
244

245 246
        #should_not have_css(".note_holder")
      #end
247 248 249
    end
  end

250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274
  # TODO: fix
  #describe "when replying to a note" do
    #before do
      ## create first note
      #find('a[data-line-code="4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184"]').click

      #within(".js-temp-notes-holder") do
        #fill_in "note[note]", with: "One comment on line 184"
        #click_button("Add Comment")
      #end

      #within(".js-temp-notes-holder") do
        #find(".js-discussion-reply-button").click
        #fill_in "note[note]", with: "An additional comment in reply"
        #click_button("Add Comment")
      #end
    #end

    #it 'should be inserted and form removed from reply' do
      #should have_content("An additional comment in reply")
      #within(".notes_holder") { should have_css(".note", count: 2) }
      #within(".notes_holder") { should have_no_css("form") }
      #within(".notes_holder") { should have_link("Reply") }
    #end
  #end
275 276 277 278 279 280
end

describe "On merge request discussion", js: true do
  describe "with merge request diff note"
  describe "with commit note"
  describe "with commit diff note"
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
281
end