expand_collapse_diffs_spec.rb 10.5 KB
Newer Older
1 2 3
require 'spec_helper'

feature 'Expand and collapse diffs', js: true, feature: true do
4
  let(:branch) { 'expand-collapse-diffs' }
5
  let(:project) { create(:project, :repository) }
6

7
  before do
8 9 10 11 12
    # Set the limits to those when these specs were written, to avoid having to
    # update the test repo every time we change them.
    allow(Gitlab::Git::Diff).to receive(:size_limit).and_return(100.kilobytes)
    allow(Gitlab::Git::Diff).to receive(:collapse_limit).and_return(10.kilobytes)

13
    sign_in(create(:admin))
14 15

    # Ensure that undiffable.md is in .gitattributes
Sean McGivern's avatar
Sean McGivern committed
16 17
    project.repository.copy_gitattributes(branch)
    visit namespace_project_commit_path(project.namespace, project, project.commit(branch))
18 19 20 21 22 23 24 25 26 27
    execute_script('window.ajaxUris = []; $(document).ajaxSend(function(event, xhr, settings) { ajaxUris.push(settings.url) });')
  end

  def file_container(filename)
    find("[data-blob-diff-path*='#{filename}']")
  end

  # Use define_method instead of let (which is memoized) so that this just works across a
  # reload.
  #
28 29 30 31 32 33
  files = [
    'small_diff.md', 'large_diff.md', 'large_diff_renamed.md', 'undiffable.md',
    'too_large.md', 'too_large_image.jpg'
  ]

  files.each do |file|
34 35 36
    define_method(file.split('.').first) { file_container(file) }
  end

37 38 39 40 41 42 43
  it 'should show the diff content with a highlighted line when linking to line' do
    expect(large_diff).not_to have_selector('.code')
    expect(large_diff).to have_selector('.nothing-here-block')

    visit namespace_project_commit_path(project.namespace, project, project.commit(branch), anchor: "#{large_diff[:id]}_0_1")
    execute_script('window.location.reload()')

44
    wait_for_requests
45 46 47 48 49 50 51 52 53 54 55 56 57

    expect(large_diff).to have_selector('.code')
    expect(large_diff).not_to have_selector('.nothing-here-block')
    expect(large_diff).to have_selector('.hll')
  end

  it 'should show the diff content when linking to file' do
    expect(large_diff).not_to have_selector('.code')
    expect(large_diff).to have_selector('.nothing-here-block')

    visit namespace_project_commit_path(project.namespace, project, project.commit(branch), anchor: large_diff[:id])
    execute_script('window.location.reload()')

58
    wait_for_requests
59 60 61 62 63

    expect(large_diff).to have_selector('.code')
    expect(large_diff).not_to have_selector('.nothing-here-block')
  end

Sean McGivern's avatar
Sean McGivern committed
64
  context 'visiting a commit with collapsed diffs' do
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
    it 'shows small diffs immediately' do
      expect(small_diff).to have_selector('.code')
      expect(small_diff).not_to have_selector('.nothing-here-block')
    end

    it 'shows non-renderable diffs as such immediately, regardless of their size' do
      expect(undiffable).not_to have_selector('.code')
      expect(undiffable).to have_selector('.nothing-here-block')
      expect(undiffable).to have_content('gitattributes')
    end

    it 'does not allow diffs that are larger than the maximum size to be expanded' do
      expect(too_large).not_to have_selector('.code')
      expect(too_large).to have_selector('.nothing-here-block')
      expect(too_large).to have_content('too large')
    end

    it 'shows image diffs immediately, regardless of their size' do
      expect(too_large_image).not_to have_selector('.nothing-here-block')
      expect(too_large_image).to have_selector('.image')
    end

87 88
    context 'expanding a diff for a renamed file' do
      before do
89
        large_diff_renamed.find('.click-to-expand').click
90
        wait_for_requests
91 92 93 94 95
      end

      it 'shows the old content' do
        old_line = large_diff_renamed.find('.line_content.old')

Sean McGivern's avatar
Sean McGivern committed
96
        expect(old_line).to have_content('two copies')
97 98 99 100 101
      end

      it 'shows the new content' do
        new_line = large_diff_renamed.find('.line_content.new', match: :prefer_exact)

Sean McGivern's avatar
Sean McGivern committed
102
        expect(new_line).to have_content('three copies')
103 104 105
      end
    end

106 107
    context 'expanding a large diff' do
      before do
108
        # Wait for diffs
109
        find('.js-file-title', match: :first)
110
        # Click `large_diff.md` title
111
        all('.diff-toggle-caret')[1].click
112
        wait_for_requests
113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130
      end

      it 'makes a request to get the content' do
        ajax_uris = evaluate_script('ajaxUris')

        expect(ajax_uris).not_to be_empty
        expect(ajax_uris.first).to include('large_diff.md')
      end

      it 'shows the diff content' do
        expect(large_diff).to have_selector('.code')
        expect(large_diff).not_to have_selector('.nothing-here-block')
      end

      context 'adding a comment to the expanded diff' do
        let(:comment_text) { 'A comment' }

        before do
Sean McGivern's avatar
Sean McGivern committed
131
          large_diff.find('.diff-line-num', match: :prefer_exact).hover
132 133 134
          large_diff.find('.add-diff-note').click
          large_diff.find('.note-textarea').send_keys comment_text
          large_diff.find_button('Comment').click
135
          wait_for_requests
136 137 138 139 140 141 142
        end

        it 'adds the comment' do
          expect(large_diff.find('.notes')).to have_content comment_text
        end

        context 'reloading the page' do
143 144 145
          before do
            refresh
          end
146 147 148 149 150 151 152 153

          it 'collapses the large diff by default' do
            expect(large_diff).not_to have_selector('.code')
            expect(large_diff).to have_selector('.nothing-here-block')
          end

          context 'expanding the diff' do
            before do
154
              # Wait for diffs
155
              find('.js-file-title', match: :first)
156
              # Click `large_diff.md` title
157
              all('.diff-toggle-caret')[1].click
158
              wait_for_requests
159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174
            end

            it 'shows the diff content' do
              expect(large_diff).to have_selector('.code')
              expect(large_diff).not_to have_selector('.nothing-here-block')
            end

            it 'shows the diff comment' do
              expect(large_diff.find('.notes')).to have_content comment_text
            end
          end
        end
      end
    end

    context 'collapsing an expanded diff' do
175 176
      before do
        # Wait for diffs
177
        find('.js-file-title', match: :first)
178
        # Click `small_diff.md` title
179
        all('.diff-toggle-caret')[3].click
180
      end
181 182 183 184 185 186 187

      it 'hides the diff content' do
        expect(small_diff).not_to have_selector('.code')
        expect(small_diff).to have_selector('.nothing-here-block')
      end

      context 're-expanding the same diff' do
188 189
        before do
          # Wait for diffs
190
          find('.js-file-title', match: :first)
191
          # Click `small_diff.md` title
192
          all('.diff-toggle-caret')[3].click
193
        end
194 195 196 197 198 199 200

        it 'shows the diff content' do
          expect(small_diff).to have_selector('.code')
          expect(small_diff).not_to have_selector('.nothing-here-block')
        end

        it 'does not make a new HTTP request' do
Sean McGivern's avatar
Sean McGivern committed
201
          expect(evaluate_script('ajaxUris')).not_to include(a_string_matching('small_diff.md'))
202 203 204
        end
      end
    end
205 206 207 208 209 210 211 212 213

    context 'expanding a diff when symlink was converted to a regular file' do
      let(:branch) { 'symlink-expand-diff' }

      it 'shows the content of the regular file' do
        expect(page).to have_content('This diff is collapsed')
        expect(page).to have_no_content('No longer a symlink')

        find('.click-to-expand').click
214
        wait_for_requests
215 216 217 218

        expect(page).to have_content('No longer a symlink')
      end
    end
219
  end
220

221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260
  context 'visiting a commit without collapsed diffs' do
    let(:branch) { 'feature' }

    it 'does not show Expand all button' do
      expect(page).not_to have_link('Expand all')
    end
  end

  context 'visiting a commit with more than safe files' do
    let(:branch) { 'expand-collapse-files' }

    # safe-files -> 100 | safe-lines -> 5000 | commit-files -> 105
    it 'does collapsing from the safe number of files to the end on small files' do
      expect(page).to have_link('Expand all')

      expect(page).to have_selector('.diff-content', count: 105)
      expect(page).to have_selector('.diff-collapsed', count: 5)

      %w(file-95.txt file-96.txt file-97.txt file-98.txt file-99.txt).each do |filename|
        expect(find("[data-blob-diff-path*='#{filename}']")).to have_selector('.diff-collapsed')
      end
    end
  end

  context 'visiting a commit with more than safe lines' do
    let(:branch) { 'expand-collapse-lines' }

    # safe-files -> 100 | safe-lines -> 5000 | commit_files -> 8 (each 1250 lines)
    it 'does collapsing from the safe number of lines to the end' do
      expect(page).to have_link('Expand all')

      expect(page).to have_selector('.diff-content', count: 6)
      expect(page).to have_selector('.diff-collapsed', count: 2)

      %w(file-4.txt file-5.txt).each do |filename|
        expect(find("[data-blob-diff-path*='#{filename}']")).to have_selector('.diff-collapsed')
      end
    end
  end

261 262 263
  context 'expanding all diffs' do
    before do
      click_link('Expand all')
264 265 266

      # Wait for elements to appear to ensure full page reload
      expect(page).to have_content('This diff was suppressed by a .gitattributes entry')
Douwe Maan's avatar
Douwe Maan committed
267
      expect(page).to have_content('This source diff could not be displayed because it is too large.')
268 269 270
      expect(page).to have_content('too_large_image.jpg')
      find('.note-textarea')

271
      wait_for_requests
272 273 274 275 276 277 278 279 280 281 282 283
      execute_script('window.ajaxUris = []; $(document).ajaxSend(function(event, xhr, settings) { ajaxUris.push(settings.url) });')
    end

    it 'reloads the page with all diffs expanded' do
      expect(small_diff).to have_selector('.code')
      expect(small_diff).not_to have_selector('.nothing-here-block')

      expect(large_diff).to have_selector('.code')
      expect(large_diff).not_to have_selector('.nothing-here-block')
    end

    context 'collapsing an expanded diff' do
284 285
      before do
        # Wait for diffs
286
        find('.js-file-title', match: :first)
287
        # Click `small_diff.md` title
288
        all('.diff-toggle-caret')[3].click
289
      end
290 291 292 293 294 295 296

      it 'hides the diff content' do
        expect(small_diff).not_to have_selector('.code')
        expect(small_diff).to have_selector('.nothing-here-block')
      end

      context 're-expanding the same diff' do
297 298
        before do
          # Wait for diffs
299
          find('.js-file-title', match: :first)
300
          # Click `small_diff.md` title
301
          all('.diff-toggle-caret')[3].click
302
        end
303 304 305 306 307 308 309

        it 'shows the diff content' do
          expect(small_diff).to have_selector('.code')
          expect(small_diff).not_to have_selector('.nothing-here-block')
        end

        it 'does not make a new HTTP request' do
Sean McGivern's avatar
Sean McGivern committed
310
          expect(evaluate_script('ajaxUris')).not_to include(a_string_matching('small_diff.md'))
311 312 313 314
        end
      end
    end
  end
315
end