expand_collapse_diffs_spec.rb 10.6 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 8 9 10
  before do
    login_as :admin

    # Ensure that undiffable.md is in .gitattributes
Sean McGivern's avatar
Sean McGivern committed
11 12
    project.repository.copy_gitattributes(branch)
    visit namespace_project_commit_path(project.namespace, project, project.commit(branch))
13 14 15 16 17 18 19 20 21 22
    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.
  #
23 24 25 26 27 28
  files = [
    'small_diff.md', 'large_diff.md', 'large_diff_renamed.md', 'undiffable.md',
    'too_large.md', 'too_large_image.jpg'
  ]

  files.each do |file|
29 30 31
    define_method(file.split('.').first) { file_container(file) }
  end

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
  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()')

    wait_for_ajax

    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()')

    wait_for_ajax

    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
59
  context 'visiting a commit with collapsed diffs' do
60 61 62 63 64
    it 'shows small diffs immediately' do
      expect(small_diff).to have_selector('.code')
      expect(small_diff).not_to have_selector('.nothing-here-block')
    end

65
    it 'collapses large diffs by default' do
66 67 68 69
      expect(large_diff).not_to have_selector('.code')
      expect(large_diff).to have_selector('.nothing-here-block')
    end

70 71 72
    it 'collapses large diffs for renamed files by default' do
      expect(large_diff_renamed).not_to have_selector('.code')
      expect(large_diff_renamed).to have_selector('.nothing-here-block')
73 74
      expect(large_diff_renamed).to have_selector('.js-file-title .deletion')
      expect(large_diff_renamed).to have_selector('.js-file-title .addition')
75 76
    end

77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
    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

94 95
    context 'expanding a diff for a renamed file' do
      before do
96
        large_diff_renamed.find('.click-to-expand').click
97 98 99 100 101 102
        wait_for_ajax
      end

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

Sean McGivern's avatar
Sean McGivern committed
103
        expect(old_line).to have_content('two copies')
104 105 106 107 108
      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
109
        expect(new_line).to have_content('three copies')
110 111 112
      end
    end

113 114
    context 'expanding a large diff' do
      before do
115
        # Wait for diffs
116
        find('.js-file-title', match: :first)
117
        # Click `large_diff.md` title
118
        all('.diff-toggle-caret')[1].click
119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
        wait_for_ajax
      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
138
          large_diff.find('.diff-line-num', match: :prefer_exact).hover
139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158
          large_diff.find('.add-diff-note').click
          large_diff.find('.note-textarea').send_keys comment_text
          large_diff.find_button('Comment').click
          wait_for_ajax
        end

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

        context 'reloading the page' do
          before { refresh }

          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
159
              # Wait for diffs
160
              find('.js-file-title', match: :first)
161
              # Click `large_diff.md` title
162
              all('.diff-toggle-caret')[1].click
163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
              wait_for_ajax
            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
180 181
      before do
        # Wait for diffs
182
        find('.js-file-title', match: :first)
183
        # Click `small_diff.md` title
184
        all('.diff-toggle-caret')[3].click
185
      end
186 187 188 189 190 191 192

      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
193 194
        before do
          # Wait for diffs
195
          find('.js-file-title', match: :first)
196
          # Click `small_diff.md` title
197
          all('.diff-toggle-caret')[3].click
198
        end
199 200 201 202 203 204 205

        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
206
          expect(evaluate_script('ajaxUris')).not_to include(a_string_matching('small_diff.md'))
207 208 209
        end
      end
    end
210 211 212 213 214 215 216 217 218 219 220 221 222 223

    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
        wait_for_ajax

        expect(page).to have_content('No longer a symlink')
      end
    end
224
  end
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 261 262 263 264 265
  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

266 267 268
  context 'expanding all diffs' do
    before do
      click_link('Expand all')
269 270 271 272 273 274 275

      # Wait for elements to appear to ensure full page reload
      expect(page).to have_content('This diff was suppressed by a .gitattributes entry')
      expect(page).to have_content('This diff could not be displayed because it is too large.')
      expect(page).to have_content('too_large_image.jpg')
      find('.note-textarea')

276 277 278 279 280 281 282 283 284 285 286 287 288
      wait_for_ajax
      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
289 290
      before do
        # Wait for diffs
291
        find('.js-file-title', match: :first)
292
        # Click `small_diff.md` title
293
        all('.diff-toggle-caret')[3].click
294
      end
295 296 297 298 299 300 301

      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
302 303
        before do
          # Wait for diffs
304
          find('.js-file-title', match: :first)
305
          # Click `small_diff.md` title
306
          all('.diff-toggle-caret')[3].click
307
        end
308 309 310 311 312 313 314

        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
315
          expect(evaluate_script('ajaxUris')).not_to include(a_string_matching('small_diff.md'))
316 317 318 319
        end
      end
    end
  end
320
end