BigW Consortium Gitlab

diff_notes_spec.rb 8.7 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
require 'spec_helper'

feature 'Diff notes', js: true, feature: true do
  include WaitForAjax

  before do
    login_as :admin
    @merge_request = create(:merge_request)
    @project = @merge_request.source_project
  end

  context 'merge request diffs' do
    let(:comment_button_class) { '.add-diff-note' }
    let(:notes_holder_input_class) { 'js-temp-notes-holder' }
    let(:notes_holder_input_xpath) { './following-sibling::*[contains(concat(" ", @class, " "), " notes_holder ")]' }
    let(:test_note_comment) { 'this is a test note!' }

18
    context 'when hovering over a parallel view diff file' do
19
      before(:each) do
20
        visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, view: 'parallel')
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
      end

      context 'with an old line on the left and no line on the right' do
        it 'should allow commenting on the left side' do
          should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_23_22"]').find(:xpath, '..'), 'left')
        end

        it 'should not allow commenting on the right side' do
          should_not_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_23_22"]').find(:xpath, '..'), 'right')
        end
      end

      context 'with no line on the left and a new line on the right' do
        it 'should not allow commenting on the left side' do
          should_not_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_15"]').find(:xpath, '..'), 'left')
        end

        it 'should allow commenting on the right side' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_15"]').find(:xpath, '..'), 'right')
        end
      end

      context 'with an old line on the left and a new line on the right' do
        it 'should allow commenting on the left side' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9"]').find(:xpath, '..'), 'left')
        end

        it 'should allow commenting on the right side' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9"]').find(:xpath, '..'), 'right')
        end
      end

      context 'with an unchanged line on the left and an unchanged line on the right' do
        it 'should allow commenting on the left side' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]', match: :first).find(:xpath, '..'), 'left')
        end

        it 'should allow commenting on the right side' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]', match: :first).find(:xpath, '..'), 'right')
        end
      end

      context 'with a match line' do
        it 'should not allow commenting on the left side' do
          should_not_allow_commenting(find('.match', match: :first).find(:xpath, '..'), 'left')
        end

        it 'should not allow commenting on the right side' do
          should_not_allow_commenting(find('.match', match: :first).find(:xpath, '..'), 'right')
        end
      end
72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90

      context 'with an unfolded line' do
        before(:each) do
          find('.js-unfold', match: :first).click
          wait_for_ajax
        end

        # The first `.js-unfold` unfolds upwards, therefore the first
        # `.line_holder` will be an unfolded line.
        let(:line_holder) { first('.line_holder[id="1"]') }

        it 'should not allow commenting on the left side' do
          should_not_allow_commenting(line_holder, 'left')
        end

        it 'should not allow commenting on the right side' do
          should_not_allow_commenting(line_holder, 'right')
        end
      end
91 92
    end

93
    context 'when hovering over an inline view diff file' do
94
      before do
95
        visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, view: 'inline')
96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118
      end

      context 'with a new line' do
        it 'should allow commenting' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))
        end
      end

      context 'with an old line' do
        it 'should allow commenting' do
          should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]'))
        end
      end

      context 'with an unchanged line' do
        it 'should allow commenting' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]'))
        end
      end

      context 'with a match line' do
        it 'should not allow commenting' do
          should_not_allow_commenting(find('.match', match: :first))
119 120 121 122 123
        end
      end

      context 'with an unfolded line' do
        before(:each) do
124
          find('.js-unfold', match: :first).click
125 126 127 128 129 130 131 132 133
          wait_for_ajax
        end

        # The first `.js-unfold` unfolds upwards, therefore the first
        # `.line_holder` will be an unfolded line.
        let(:line_holder) { first('.line_holder[id="1"]') }

        it 'should not allow commenting' do
          should_not_allow_commenting line_holder
134 135
        end
      end
136 137 138 139 140 141 142 143 144 145 146 147

      context 'when hovering over a diff discussion' do
        before do
          visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, view: 'inline')
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]'))
          visit namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
        end

        it 'should not allow commenting' do
          should_not_allow_commenting(find('.line_holder', match: :first))
        end
      end
148 149
    end

150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180
    context 'when the MR only supports legacy diff notes' do
      before do
        @merge_request.merge_request_diff.update_attributes(start_commit_sha: nil)
        visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, view: 'inline')
      end

      context 'with a new line' do
        it 'should allow commenting' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))
        end
      end

      context 'with an old line' do
        it 'should allow commenting' do
          should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]'))
        end
      end

      context 'with an unchanged line' do
        it 'should allow commenting' do
          should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]'))
        end
      end

      context 'with a match line' do
        it 'should not allow commenting' do
          should_not_allow_commenting(find('.match', match: :first))
        end
      end
    end

181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226
    def should_allow_commenting(line_holder, diff_side = nil)
      line = get_line_components(line_holder, diff_side)
      line[:content].hover
      expect(line[:num]).to have_css comment_button_class

      comment_on_line(line_holder, line)

      assert_comment_persistence(line_holder)
    end

    def should_not_allow_commenting(line_holder, diff_side = nil)
      line = get_line_components(line_holder, diff_side)
      line[:content].hover
      expect(line[:num]).not_to have_css comment_button_class
    end

    def get_line_components(line_holder, diff_side = nil)
      if diff_side.nil?
        get_inline_line_components(line_holder)
      else
        get_parallel_line_components(line_holder, diff_side)
      end
    end

    def get_inline_line_components(line_holder)
      { content: line_holder.find('.line_content', match: :first), num: line_holder.find('.diff-line-num', match: :first) }
    end

    def get_parallel_line_components(line_holder, diff_side = nil)
      side_index = diff_side == 'left' ? 0 : 1
      # Wait for `.line_content`
      line_holder.find('.line_content', match: :first)
      # Wait for `.diff-line-num`
      line_holder.find('.diff-line-num', match: :first)
      { content: line_holder.all('.line_content')[side_index], num: line_holder.all('.diff-line-num')[side_index] }
    end

    def comment_on_line(line_holder, line)
      line[:num].find(comment_button_class).trigger 'click'
      line_holder.find(:xpath, notes_holder_input_xpath)

      notes_holder_input = line_holder.find(:xpath, notes_holder_input_xpath)
      expect(notes_holder_input[:class]).to include(notes_holder_input_class)

      notes_holder_input.fill_in 'note[note]', with: test_note_comment
      click_button 'Comment'
227
      wait_for_ajax
228 229 230 231 232 233 234 235 236 237 238
    end

    def assert_comment_persistence(line_holder)
      expect(line_holder).to have_xpath notes_holder_input_xpath

      notes_holder_saved = line_holder.find(:xpath, notes_holder_input_xpath)
      expect(notes_holder_saved[:class]).not_to include(notes_holder_input_class)
      expect(notes_holder_saved).to have_content test_note_comment
    end
  end
end