246 lines
8.1 KiB
Ruby
246 lines
8.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'spec_helper'
|
|
|
|
RSpec.describe 'Merge request > User sees versions', :js, feature_category: :code_review_workflow do
|
|
include MergeRequestDiffHelpers
|
|
|
|
let(:merge_request) do
|
|
create(:merge_request).tap do |mr|
|
|
mr.merge_request_diff.destroy!
|
|
end
|
|
end
|
|
|
|
let(:project) { merge_request.source_project }
|
|
let(:user) { project.creator }
|
|
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') }
|
|
let!(:params) { {} }
|
|
|
|
before do
|
|
project.add_maintainer(user)
|
|
sign_in(user)
|
|
visit diffs_project_merge_request_path(project, merge_request, params)
|
|
end
|
|
|
|
shared_examples 'allows commenting' do |file_name:, line_text:, comment:|
|
|
it do
|
|
page.within find_by_scrolling('.diff-file', text: file_name) do
|
|
line_code_element = page.find('.diff-grid-row', text: line_text)
|
|
|
|
# scrolling to element's bottom is required in order for .hover action to work
|
|
# otherwise, the element could be hidden underneath a sticky header
|
|
scroll_to_elements_bottom(line_code_element)
|
|
line_code_element.hover
|
|
page.find("[data-testid='left-comment-button']", visible: true).click
|
|
|
|
expect(page).to have_selector("form", count: 1)
|
|
|
|
fill_in("note[note]", with: comment)
|
|
click_button('Add comment now')
|
|
|
|
wait_for_requests
|
|
|
|
expect(page).to have_content(comment)
|
|
end
|
|
end
|
|
end
|
|
|
|
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 files'
|
|
end
|
|
|
|
it_behaves_like 'allows commenting',
|
|
file_name: '.gitmodules',
|
|
line_text: '[submodule "six"]',
|
|
comment: 'Typo, please fix.'
|
|
end
|
|
|
|
describe 'switch between versions' do
|
|
before do
|
|
page.within '.mr-version-dropdown' do
|
|
find('.btn-default').click
|
|
click_link 'version 1'
|
|
end
|
|
|
|
# Wait for the page to load
|
|
page.within '.mr-version-dropdown' do
|
|
expect(page).to have_content 'version 1'
|
|
end
|
|
end
|
|
|
|
it 'shows the commit SHAs for every version in the dropdown' do
|
|
page.within '.mr-version-dropdown' do
|
|
find('.gl-dropdown-toggle').click
|
|
end
|
|
|
|
page.within '.mr-version-dropdown' do
|
|
shas = merge_request.merge_request_diffs.map { |diff| Commit.truncate_sha(diff.head_commit_sha) }
|
|
shas.each { |sha| expect(page).to have_content(sha) }
|
|
end
|
|
end
|
|
|
|
it 'shows comments that were last relevant at that version' do
|
|
expect(page).to have_content '5 files'
|
|
|
|
position = build(:text_diff_position, :added,
|
|
file: ".gitmodules",
|
|
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!
|
|
|
|
refresh
|
|
wait_for_requests
|
|
|
|
expect(page).to have_css(".diffs .notes[data-discussion-id='#{outdated_diff_note.discussion_id}']")
|
|
end
|
|
|
|
it_behaves_like 'allows commenting',
|
|
file_name: '.gitmodules',
|
|
line_text: 'path = six',
|
|
comment: 'Typo, please fix.'
|
|
end
|
|
|
|
describe 'compare with older version' do
|
|
before do
|
|
page.within '.mr-version-compare-dropdown' do
|
|
find('.btn-default').click
|
|
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'
|
|
end
|
|
end
|
|
|
|
it 'has a path with comparison context and shows comments that were last relevant at that version' do
|
|
expect(page).to have_current_path diffs_project_merge_request_path(
|
|
project,
|
|
merge_request.iid,
|
|
diff_id: merge_request_diff3.id,
|
|
start_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
|
|
)
|
|
expect(page).to have_content '4 files'
|
|
|
|
additions_content = page.find('.diff-stats.is-compare-versions-header .diff-stats-group [data-testid="js-file-addition-line"]').text
|
|
deletions_content = page.find('.diff-stats.is-compare-versions-header .diff-stats-group [data-testid="js-file-deletion-line"]').text
|
|
|
|
expect(additions_content).to eq '15'
|
|
expect(deletions_content).to eq '6'
|
|
|
|
position = build(:text_diff_position,
|
|
file: ".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)
|
|
outdated_diff_note.position = outdated_diff_note.original_position
|
|
outdated_diff_note.save!
|
|
|
|
refresh
|
|
wait_for_requests
|
|
|
|
expect(page).to have_css(".diffs .notes[data-discussion-id='#{outdated_diff_note.discussion_id}']")
|
|
end
|
|
|
|
it 'show diff between new and old version' do
|
|
additions_content = page.find('.diff-stats.is-compare-versions-header .diff-stats-group [data-testid="js-file-addition-line"]').text
|
|
deletions_content = page.find('.diff-stats.is-compare-versions-header .diff-stats-group [data-testid="js-file-deletion-line"]').text
|
|
|
|
expect(page).to have_content '4 files'
|
|
expect(additions_content).to eq '15'
|
|
expect(deletions_content).to eq '6'
|
|
end
|
|
|
|
it 'returns 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 files'
|
|
end
|
|
|
|
it_behaves_like 'allows commenting',
|
|
file_name: '.gitmodules',
|
|
line_text: '[submodule "gitlab-shell"]',
|
|
comment: 'Typo, please fix.'
|
|
end
|
|
|
|
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 'has 0 chages between versions' do
|
|
page.within '.mr-version-compare-dropdown' do
|
|
expect(find('.gl-dropdown-toggle')).to have_content 'version 1'
|
|
end
|
|
|
|
page.within '.mr-version-dropdown' do
|
|
find('.btn-default').click
|
|
click_link 'version 1'
|
|
end
|
|
expect(page).to have_content 'No changes between version 1 and version 1'
|
|
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 'sets the compared versions to be the same' do
|
|
page.within '.mr-version-compare-dropdown' do
|
|
expect(find('.gl-dropdown-toggle')).to have_content 'version 2'
|
|
end
|
|
|
|
page.within '.mr-version-dropdown' do
|
|
find('.btn-default').click
|
|
click_link 'version 1'
|
|
end
|
|
|
|
page.within '.mr-version-compare-dropdown' do
|
|
expect(page).to have_content 'version 1'
|
|
end
|
|
|
|
expect(page).to have_content 'No changes between version 1 and version 1'
|
|
end
|
|
end
|
|
|
|
describe 'scoped in a commit' do
|
|
let(:params) { { commit_id: '570e7b2abdd848b95f2f578043fc23bd6f6fd24d' } }
|
|
|
|
before do
|
|
wait_for_requests
|
|
end
|
|
|
|
it 'only shows 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_name: 'files/ruby/popen.rb',
|
|
line_text: 'RuntimeError',
|
|
comment: 'Typo, please fix.'
|
|
end
|
|
end
|