versions_spec.rb 7.3 KB
Newer Older
1 2
require 'spec_helper'

3
feature 'Merge Request versions', :js do
4 5
  let(:merge_request) { create(:merge_request, importing: true) }
  let(:project) { merge_request.source_project }
6 7 8
  let!(:merge_request_diff1) { merge_request.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
  let!(:merge_request_diff2) { merge_request.merge_request_diffs.create(head_commit_sha: nil) }
  let!(:merge_request_diff3) { merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
M
micael.bergeron 已提交
9
  let!(:params) { Hash.new }
10

11
  before do
12
    sign_in(create(:admin))
M
micael.bergeron 已提交
13
    visit diffs_project_merge_request_path(project, merge_request, params)
14 15
  end

M
micael.bergeron 已提交
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
  shared_examples 'allows commenting' do |file_id:, line_code:, comment:|
    it do
      diff_file_selector = ".diff-file[id='#{file_id}']"
      line_code = "#{file_id}_#{line_code}"

      page.within(diff_file_selector) do
        find(".line_holder[id='#{line_code}'] td:nth-of-type(1)").hover
        find(".line_holder[id='#{line_code}'] button").click

        page.within("form[data-line-code='#{line_code}']") do
          fill_in "note[note]", with: comment
          find(".js-comment-button").click
        end

        wait_for_requests

        expect(page).to have_content(comment)
      end
34
    end
M
micael.bergeron 已提交
35
  end
36

M
micael.bergeron 已提交
37 38 39 40 41 42 43 44 45 46 47 48 49
  describe 'compare with the latest version' do
    it 'show the latest version of the diff' do
      page.within '.mr-version-dropdown' do
        expect(page).to have_content 'latest version'
      end

      expect(page).to have_content '8 changed files'
    end

    it_behaves_like 'allows commenting',
                    file_id: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44',
                    line_code: '1_1',
                    comment: 'Typo, please fix.'
50 51 52 53
  end

  describe 'switch between versions' do
    before do
54
      page.within '.mr-version-dropdown' do
55
        find('.btn-default').click
56 57 58 59 60 61
        click_link 'version 1'
      end

      # Wait for the page to load
      page.within '.mr-version-dropdown' do
        expect(page).to have_content 'version 1'
62 63 64 65
      end
    end

    it 'should show older version' do
66
      page.within '.mr-version-dropdown' do
67
        expect(page).to have_content 'version 1'
68 69 70 71
      end

      expect(page).to have_content '5 changed files'
    end
72

73 74
    it 'show the message about comments' do
      expect(page).to have_content 'Not all comments are displayed'
75
    end
D
Douwe Maan 已提交
76 77 78 79 80 81 82 83 84 85 86 87 88

    it 'shows comments that were last relevant at that version' do
      position = Gitlab::Diff::Position.new(
        old_path: ".gitmodules",
        new_path: ".gitmodules",
        old_line: nil,
        new_line: 4,
        diff_refs: merge_request_diff1.diff_refs
      )
      outdated_diff_note = create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position)
      outdated_diff_note.position = outdated_diff_note.original_position
      outdated_diff_note.save!

89 90
      visit current_url

D
Douwe Maan 已提交
91 92
      expect(page).to have_css(".diffs .notes[data-discussion-id='#{outdated_diff_note.discussion_id}']")
    end
93

M
micael.bergeron 已提交
94 95 96 97
    it_behaves_like 'allows commenting',
                    file_id: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44',
                    line_code: '2_2',
                    comment: 'Typo, please fix.'
98 99 100 101 102
  end

  describe 'compare with older version' do
    before do
      page.within '.mr-version-compare-dropdown' do
103
        find('.btn-default').click
104 105 106 107 108 109
        click_link 'version 1'
      end

      # Wait for the page to load
      page.within '.mr-version-compare-dropdown' do
        expect(page).to have_content 'version 1'
110 111 112
      end
    end

113
    it 'has a path with comparison context' do
114
      expect(page).to have_current_path diffs_project_merge_request_path(
115 116
        project,
        merge_request.iid,
117
        diff_id: merge_request_diff3.id,
118 119 120 121
        start_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
      )
    end

122
    it 'should have correct value in the compare dropdown' do
123
      page.within '.mr-version-compare-dropdown' do
124
        expect(page).to have_content 'version 1'
125
      end
126
    end
127

128 129 130 131 132 133 134 135 136 137 138 139 140
    it 'show the message about comments' do
      expect(page).to have_content 'Not all comments are displayed'
    end

    it 'shows comments that were last relevant at that version' do
      position = Gitlab::Diff::Position.new(
        old_path: ".gitmodules",
        new_path: ".gitmodules",
        old_line: 4,
        new_line: 4,
        diff_refs: merge_request_diff3.compare_with(merge_request_diff1.head_commit_sha).diff_refs
      )
      outdated_diff_note = create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position)
141 142
      outdated_diff_note.position = outdated_diff_note.original_position
      outdated_diff_note.save!
143 144

      visit current_url
145
      wait_for_requests
146 147 148 149

      expect(page).to have_css(".diffs .notes[data-discussion-id='#{outdated_diff_note.discussion_id}']")
    end

150 151 152 153
    it 'show diff between new and old version' do
      expect(page).to have_content '4 changed files with 15 additions and 6 deletions'
    end

154 155 156 157 158 159 160
    it 'should return to latest version when "Show latest version" button is clicked' do
      click_link 'Show latest version'
      page.within '.mr-version-dropdown' do
        expect(page).to have_content 'latest version'
      end
      expect(page).to have_content '8 changed files'
    end
M
micael.bergeron 已提交
161 162 163 164 165

    it_behaves_like 'allows commenting',
                    file_id: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44',
                    line_code: '4_4',
                    comment: 'Typo, please fix.'
166
  end
167 168 169 170 171 172 173 174 175 176 177

  describe 'compare with same version' do
    before do
      page.within '.mr-version-compare-dropdown' do
        find('.btn-default').click
        click_link 'version 1'
      end
    end

    it 'should have 0 chages between versions' do
      page.within '.mr-version-compare-dropdown' do
N
Nur Rony 已提交
178
        expect(find('.dropdown-toggle')).to have_content 'version 1'
179 180 181 182
      end

      page.within '.mr-version-dropdown' do
        find('.btn-default').click
N
Nur Rony 已提交
183
        click_link 'version 1'
184 185 186 187 188 189 190 191 192 193 194 195 196 197 198
      end
      expect(page).to have_content '0 changed files'
    end
  end

  describe 'compare with newer version' do
    before do
      page.within '.mr-version-compare-dropdown' do
        find('.btn-default').click
        click_link 'version 2'
      end
    end

    it 'should set the compared versions to be the same' do
      page.within '.mr-version-compare-dropdown' do
N
Nur Rony 已提交
199
        expect(find('.dropdown-toggle')).to have_content 'version 2'
200 201 202 203
      end

      page.within '.mr-version-dropdown' do
        find('.btn-default').click
N
Nur Rony 已提交
204
        click_link 'version 1'
205 206 207 208 209 210 211 212 213
      end

      page.within '.mr-version-compare-dropdown' do
        expect(page).to have_content 'version 1'
      end

      expect(page).to have_content '0 changed files'
    end
  end
M
micael.bergeron 已提交
214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233

  describe 'scoped in a commit' do
    let(:params) { { commit_id: '570e7b2abdd848b95f2f578043fc23bd6f6fd24d' } }

    before do
      wait_for_requests
    end

    it 'should only show diffs from the commit' do
      diff_commit_ids = find_all('.diff-file [data-commit-id]').map {|diff| diff['data-commit-id']}

      expect(diff_commit_ids).not_to be_empty
      expect(diff_commit_ids).to all(eq(params[:commit_id]))
    end

    it_behaves_like 'allows commenting',
                    file_id: '2f6fcd96b88b36ce98c38da085c795a27d92a3dd',
                    line_code: '6_6',
                    comment: 'Typo, please fix.'
  end
234
end