140 lines
4.4 KiB
Ruby
140 lines
4.4 KiB
Ruby
require 'rails_helper'
|
|
|
|
describe 'Merge request > User sees diff', :js do
|
|
include ProjectForksHelper
|
|
include RepoHelpers
|
|
|
|
let(:project) { create(:project, :public, :repository) }
|
|
let(:merge_request) { create(:merge_request, source_project: project) }
|
|
|
|
context 'when linking to note' do
|
|
describe 'with unresolved note' do
|
|
let(:note) { create :diff_note_on_merge_request, project: project, noteable: merge_request }
|
|
let(:fragment) { "#note_#{note.id}" }
|
|
|
|
before do
|
|
visit "#{diffs_project_merge_request_path(project, merge_request)}#{fragment}"
|
|
end
|
|
|
|
it 'shows expanded note' do
|
|
expect(page).to have_selector(fragment, visible: true)
|
|
end
|
|
end
|
|
|
|
describe 'with resolved note' do
|
|
let(:note) { create :diff_note_on_merge_request, :resolved, project: project, noteable: merge_request }
|
|
let(:fragment) { "#note_#{note.id}" }
|
|
|
|
before do
|
|
visit "#{diffs_project_merge_request_path(project, merge_request)}#{fragment}"
|
|
end
|
|
|
|
it 'shows expanded note' do
|
|
expect(page).to have_selector(fragment, visible: true)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when merge request has overflow' do
|
|
it 'displays warning' do
|
|
allow(Commit).to receive(:max_diff_options).and_return(max_files: 3)
|
|
allow_any_instance_of(DiffHelper).to receive(:render_overflow_warning?).and_return(true)
|
|
|
|
visit diffs_project_merge_request_path(project, merge_request)
|
|
|
|
page.within('.alert') do
|
|
expect(page).to have_text("Too many changes to show. Plain diff Email patch To preserve
|
|
performance only 3 of 3+ files are displayed.")
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when editing file' do
|
|
let(:author_user) { create(:user) }
|
|
let(:user) { create(:user) }
|
|
let(:forked_project) { fork_project(project, author_user, repository: true) }
|
|
let(:merge_request) { create(:merge_request_with_diffs, source_project: forked_project, target_project: project, author: author_user) }
|
|
let(:changelog_id) { Digest::SHA1.hexdigest("CHANGELOG") }
|
|
|
|
before do
|
|
forked_project.repository.after_import
|
|
end
|
|
|
|
context 'as author' do
|
|
it 'shows direct edit link' do
|
|
sign_in(author_user)
|
|
visit diffs_project_merge_request_path(project, merge_request)
|
|
|
|
# Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax
|
|
expect(page).to have_selector("[id=\"#{changelog_id}\"] a.js-edit-blob")
|
|
end
|
|
end
|
|
|
|
context 'as user who needs to fork' do
|
|
it 'shows fork/cancel confirmation' do
|
|
sign_in(user)
|
|
visit diffs_project_merge_request_path(project, merge_request)
|
|
|
|
# Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax
|
|
find("[id=\"#{changelog_id}\"] .js-edit-blob").click
|
|
|
|
expect(page).to have_selector('.js-fork-suggestion-button', count: 1)
|
|
expect(page).to have_selector('.js-cancel-fork-suggestion-button', count: 1)
|
|
end
|
|
end
|
|
|
|
context 'when file contains html' do
|
|
let(:current_user) { project.owner }
|
|
let(:branch_name) {"test_branch"}
|
|
|
|
def create_file(branch_name, file_name, content)
|
|
Files::CreateService.new(
|
|
project,
|
|
current_user,
|
|
start_branch: branch_name,
|
|
branch_name: branch_name,
|
|
commit_message: "Create file",
|
|
file_path: file_name,
|
|
file_content: content
|
|
).execute
|
|
|
|
project.commit(branch_name)
|
|
end
|
|
|
|
it 'escapes any HTML special characters in the diff chunk header' do
|
|
file_content =
|
|
<<~CONTENT
|
|
function foo<input> {
|
|
let a = 1;
|
|
let b = 2;
|
|
let c = 3;
|
|
let d = 3;
|
|
}
|
|
CONTENT
|
|
|
|
new_file_content =
|
|
<<~CONTENT
|
|
function foo<input> {
|
|
let a = 1;
|
|
let b = 2;
|
|
let c = 3;
|
|
let x = 3;
|
|
}
|
|
CONTENT
|
|
|
|
file_name = 'xss_file.rs'
|
|
|
|
create_file('master', file_name, file_content)
|
|
merge_request = create(:merge_request, source_project: project)
|
|
create_file(merge_request.source_branch, file_name, new_file_content)
|
|
|
|
project.commit(merge_request.source_branch)
|
|
|
|
visit diffs_project_merge_request_path(project, merge_request)
|
|
|
|
expect(page).to have_text("function foo<input> {")
|
|
expect(page).to have_css(".line[lang='rust'] .k")
|
|
end
|
|
end
|
|
end
|
|
end
|