2012-11-24 18:04:13 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2013-06-23 13:25:06 -04:00
|
|
|
describe Projects::MergeRequestsController do
|
2014-01-22 14:03:52 -05:00
|
|
|
let(:project) { create(:project) }
|
2012-11-24 18:04:13 -05:00
|
|
|
let(:user) { create(:user) }
|
2014-08-06 02:07:11 -04:00
|
|
|
let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
|
2016-07-27 12:54:04 -04:00
|
|
|
let(:merge_request_with_conflicts) do
|
2016-08-05 07:15:06 -04:00
|
|
|
create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start', source_project: project) do |mr|
|
2016-07-27 12:54:04 -04:00
|
|
|
mr.mark_as_unmergeable
|
|
|
|
end
|
|
|
|
end
|
2012-11-24 18:04:13 -05:00
|
|
|
|
|
|
|
before do
|
|
|
|
sign_in(user)
|
2013-01-04 11:50:31 -05:00
|
|
|
project.team << [user, :master]
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|
|
|
|
|
2016-07-08 13:11:47 -04:00
|
|
|
describe 'GET new' do
|
2015-12-04 14:31:01 -05:00
|
|
|
context 'merge request that removes a submodule' do
|
|
|
|
render_views
|
|
|
|
|
|
|
|
let(:fork_project) { create(:forked_project_with_submodules) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
fork_project.team << [user, :master]
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'renders it' do
|
|
|
|
get :new,
|
|
|
|
namespace_id: fork_project.namespace.to_param,
|
|
|
|
project_id: fork_project.to_param,
|
|
|
|
merge_request: {
|
|
|
|
source_branch: 'remove-submodule',
|
|
|
|
target_branch: 'master'
|
|
|
|
}
|
|
|
|
|
|
|
|
expect(response).to be_success
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-08 13:11:47 -04:00
|
|
|
describe "GET show" do
|
2013-04-07 16:58:25 -04:00
|
|
|
shared_examples "export merge as" do |format|
|
2016-07-25 14:16:19 -04:00
|
|
|
it "does generally work" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
|
|
|
format: format)
|
2012-11-24 18:04:13 -05:00
|
|
|
|
|
|
|
expect(response).to be_success
|
|
|
|
end
|
|
|
|
|
2016-07-25 14:16:19 -04:00
|
|
|
it "generates it" do
|
2015-02-12 13:17:35 -05:00
|
|
|
expect_any_instance_of(MergeRequest).to receive(:"to_#{format}")
|
2012-11-24 18:04:13 -05:00
|
|
|
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
|
|
|
format: format)
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|
|
|
|
|
2016-07-25 14:16:19 -04:00
|
|
|
it "renders it" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
|
|
|
format: format)
|
2012-11-24 18:04:13 -05:00
|
|
|
|
2016-05-30 09:07:18 -04:00
|
|
|
expect(response.body).to eq(merge_request.send(:"to_#{format}").to_s)
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|
|
|
|
|
2016-07-25 14:16:19 -04:00
|
|
|
it "does not escape Html" do
|
2015-02-12 13:32:58 -05:00
|
|
|
allow_any_instance_of(MergeRequest).to receive(:"to_#{format}").
|
|
|
|
and_return('HTML entities &<>" ')
|
2012-11-24 18:04:13 -05:00
|
|
|
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
|
|
|
format: format)
|
2012-11-24 18:04:13 -05:00
|
|
|
|
2015-06-17 21:30:58 -04:00
|
|
|
expect(response.body).not_to include('&')
|
|
|
|
expect(response.body).not_to include('>')
|
|
|
|
expect(response.body).not_to include('<')
|
|
|
|
expect(response.body).not_to include('"')
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "as diff" do
|
2016-05-12 14:50:49 -04:00
|
|
|
it "triggers workhorse to serve the request" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
2016-05-12 14:50:49 -04:00
|
|
|
format: :diff)
|
2012-11-24 18:04:13 -05:00
|
|
|
|
2016-06-08 08:30:15 -04:00
|
|
|
expect(response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-diff:")
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "as patch" do
|
2016-06-10 08:57:50 -04:00
|
|
|
it 'triggers workhorse to serve the request' do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
2016-06-10 08:57:50 -04:00
|
|
|
format: :patch)
|
2012-11-24 18:04:13 -05:00
|
|
|
|
2016-07-03 17:01:13 -04:00
|
|
|
expect(response.headers[Gitlab::Workhorse::SEND_DATA_HEADER]).to start_with("git-format-patch:")
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2015-04-13 01:27:45 -04:00
|
|
|
|
2016-07-08 13:11:47 -04:00
|
|
|
describe 'GET index' do
|
2016-02-17 21:15:13 -05:00
|
|
|
def get_merge_requests
|
|
|
|
get :index,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
state: 'opened'
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when filtering by opened state' do
|
|
|
|
context 'with opened merge requests' do
|
2016-07-25 14:16:19 -04:00
|
|
|
it 'lists those merge requests' do
|
2016-02-17 21:15:13 -05:00
|
|
|
get_merge_requests
|
|
|
|
|
|
|
|
expect(assigns(:merge_requests)).to include(merge_request)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with reopened merge requests' do
|
|
|
|
before do
|
|
|
|
merge_request.close!
|
|
|
|
merge_request.reopen!
|
|
|
|
end
|
|
|
|
|
2016-07-25 14:16:19 -04:00
|
|
|
it 'lists those merge requests' do
|
2016-02-17 21:15:13 -05:00
|
|
|
get_merge_requests
|
|
|
|
|
|
|
|
expect(assigns(:merge_requests)).to include(merge_request)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-08 13:11:47 -04:00
|
|
|
describe 'PUT update' do
|
2016-04-11 15:21:32 -04:00
|
|
|
context 'there is no source project' do
|
2016-04-12 14:39:33 -04:00
|
|
|
let(:project) { create(:project) }
|
|
|
|
let(:fork_project) { create(:forked_project_with_submodules) }
|
|
|
|
let(:merge_request) { create(:merge_request, source_project: fork_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) }
|
2016-04-11 15:21:32 -04:00
|
|
|
|
|
|
|
before do
|
|
|
|
fork_project.build_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id)
|
|
|
|
fork_project.save
|
|
|
|
merge_request.reload
|
2016-04-12 14:39:33 -04:00
|
|
|
fork_project.destroy
|
2016-04-11 15:21:32 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'closes MR without errors' do
|
|
|
|
post :update,
|
|
|
|
namespace_id: project.namespace.path,
|
|
|
|
project_id: project.path,
|
|
|
|
id: merge_request.iid,
|
|
|
|
merge_request: {
|
|
|
|
state_event: 'close'
|
|
|
|
}
|
|
|
|
|
|
|
|
expect(response).to redirect_to([merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request])
|
|
|
|
expect(merge_request.reload.closed?).to be_truthy
|
|
|
|
end
|
2016-07-26 07:57:43 -04:00
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
it 'allows editing of a closed merge request' do
|
2016-07-26 07:57:43 -04:00
|
|
|
merge_request.close!
|
|
|
|
|
|
|
|
put :update,
|
|
|
|
namespace_id: project.namespace.path,
|
|
|
|
project_id: project.path,
|
|
|
|
id: merge_request.iid,
|
|
|
|
merge_request: {
|
|
|
|
title: 'New title'
|
|
|
|
}
|
|
|
|
|
|
|
|
expect(response).to redirect_to([merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request])
|
|
|
|
expect(merge_request.reload.title).to eq 'New title'
|
|
|
|
end
|
|
|
|
|
2016-08-10 09:36:30 -04:00
|
|
|
it 'does not allow to update target branch closed merge request' do
|
2016-07-26 07:57:43 -04:00
|
|
|
merge_request.close!
|
|
|
|
|
|
|
|
put :update,
|
|
|
|
namespace_id: project.namespace.path,
|
|
|
|
project_id: project.path,
|
|
|
|
id: merge_request.iid,
|
|
|
|
merge_request: {
|
|
|
|
target_branch: 'new_branch'
|
|
|
|
}
|
|
|
|
|
|
|
|
expect { merge_request.reload.target_branch }.not_to change { merge_request.target_branch }
|
|
|
|
end
|
2016-04-11 15:21:32 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-08 13:11:47 -04:00
|
|
|
describe 'POST merge' do
|
2016-06-01 08:25:44 -04:00
|
|
|
let(:base_params) do
|
|
|
|
{
|
|
|
|
namespace_id: project.namespace.path,
|
|
|
|
project_id: project.path,
|
|
|
|
id: merge_request.iid,
|
|
|
|
format: 'raw'
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the user does not have access' do
|
|
|
|
before do
|
|
|
|
project.team.truncate
|
|
|
|
project.team << [user, :reporter]
|
|
|
|
post :merge, base_params
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns not found' do
|
|
|
|
expect(response).to be_not_found
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the merge request is not mergeable' do
|
|
|
|
before do
|
|
|
|
merge_request.update_attributes(title: "WIP: #{merge_request.title}")
|
|
|
|
|
|
|
|
post :merge, base_params
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns :failed' do
|
|
|
|
expect(assigns(:status)).to eq(:failed)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the sha parameter does not match the source SHA' do
|
|
|
|
before { post :merge, base_params.merge(sha: 'foo') }
|
|
|
|
|
|
|
|
it 'returns :sha_mismatch' do
|
|
|
|
expect(assigns(:status)).to eq(:sha_mismatch)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the sha parameter matches the source SHA' do
|
|
|
|
def merge_with_sha
|
2016-06-20 12:48:04 -04:00
|
|
|
post :merge, base_params.merge(sha: merge_request.diff_head_sha)
|
2016-06-01 08:25:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns :success' do
|
|
|
|
merge_with_sha
|
|
|
|
|
|
|
|
expect(assigns(:status)).to eq(:success)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'starts the merge immediately' do
|
|
|
|
expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, anything)
|
|
|
|
|
|
|
|
merge_with_sha
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when merge_when_build_succeeds is passed' do
|
|
|
|
def merge_when_build_succeeds
|
2016-06-20 12:48:04 -04:00
|
|
|
post :merge, base_params.merge(sha: merge_request.diff_head_sha, merge_when_build_succeeds: '1')
|
2016-06-01 08:25:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
2016-06-20 12:48:04 -04:00
|
|
|
create(:ci_empty_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch)
|
2016-06-01 08:25:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns :merge_when_build_succeeds' do
|
|
|
|
merge_when_build_succeeds
|
|
|
|
|
|
|
|
expect(assigns(:status)).to eq(:merge_when_build_succeeds)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'sets the MR to merge when the build succeeds' do
|
|
|
|
service = double(:merge_when_build_succeeds_service)
|
|
|
|
|
|
|
|
expect(MergeRequests::MergeWhenBuildSucceedsService).to receive(:new).with(project, anything, anything).and_return(service)
|
|
|
|
expect(service).to receive(:execute).with(merge_request)
|
|
|
|
|
|
|
|
merge_when_build_succeeds
|
|
|
|
end
|
2016-06-24 12:13:56 -04:00
|
|
|
|
|
|
|
context 'when project.only_allow_merge_if_build_succeeds? is true' do
|
|
|
|
before do
|
|
|
|
project.update_column(:only_allow_merge_if_build_succeeds, true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns :merge_when_build_succeeds' do
|
|
|
|
merge_when_build_succeeds
|
|
|
|
|
|
|
|
expect(assigns(:status)).to eq(:merge_when_build_succeeds)
|
|
|
|
end
|
|
|
|
end
|
2016-06-01 08:25:44 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-08 13:11:47 -04:00
|
|
|
describe "DELETE destroy" do
|
2016-03-21 09:12:52 -04:00
|
|
|
it "denies access to users unless they're admin or project owner" do
|
2016-02-26 03:55:43 -05:00
|
|
|
delete :destroy, namespace_id: project.namespace.path, project_id: project.path, id: merge_request.iid
|
|
|
|
|
2016-06-27 14:10:42 -04:00
|
|
|
expect(response).to have_http_status(404)
|
2016-02-26 03:55:43 -05:00
|
|
|
end
|
|
|
|
|
2016-03-21 09:12:52 -04:00
|
|
|
context "when the user is owner" do
|
|
|
|
let(:owner) { create(:user) }
|
|
|
|
let(:namespace) { create(:namespace, owner: owner) }
|
|
|
|
let(:project) { create(:project, namespace: namespace) }
|
|
|
|
|
|
|
|
before { sign_in owner }
|
2016-02-26 03:55:43 -05:00
|
|
|
|
2016-03-21 09:12:52 -04:00
|
|
|
it "deletes the merge request" do
|
2016-02-26 03:55:43 -05:00
|
|
|
delete :destroy, namespace_id: project.namespace.path, project_id: project.path, id: merge_request.iid
|
|
|
|
|
2016-06-27 14:10:42 -04:00
|
|
|
expect(response).to have_http_status(302)
|
2016-03-21 09:12:52 -04:00
|
|
|
expect(controller).to set_flash[:notice].to(/The merge request was successfully deleted\./).now
|
2016-02-26 03:55:43 -05:00
|
|
|
end
|
2016-09-01 18:12:05 -04:00
|
|
|
|
|
|
|
it 'delegates the update of the todos count cache to TodoService' do
|
|
|
|
expect_any_instance_of(TodoService).to receive(:destroy_merge_request).with(merge_request, owner).once
|
|
|
|
|
|
|
|
delete :destroy, namespace_id: project.namespace.path, project_id: project.path, id: merge_request.iid
|
|
|
|
end
|
2016-02-26 03:55:43 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-08 13:11:47 -04:00
|
|
|
describe 'GET diffs' do
|
2016-06-28 12:25:32 -04:00
|
|
|
def go(extra_params = {})
|
|
|
|
params = {
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid
|
|
|
|
}
|
|
|
|
|
|
|
|
get :diffs, params.merge(extra_params)
|
2015-04-13 01:27:45 -04:00
|
|
|
end
|
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
context 'with default params' do
|
|
|
|
context 'as html' do
|
|
|
|
before { go(format: 'html') }
|
2015-06-17 16:12:28 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
it 'renders the diff template' do
|
|
|
|
expect(response).to render_template('diffs')
|
|
|
|
end
|
2015-06-17 16:12:28 -04:00
|
|
|
end
|
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
context 'as json' do
|
|
|
|
before { go(format: 'json') }
|
2015-06-17 16:12:28 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
it 'renders the diffs template to a string' do
|
|
|
|
expect(response).to render_template('projects/merge_requests/show/_diffs')
|
|
|
|
expect(JSON.parse(response.body)).to have_key('html')
|
|
|
|
end
|
2015-06-17 16:12:28 -04:00
|
|
|
end
|
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
context 'with forked projects with submodules' do
|
|
|
|
render_views
|
2015-06-17 16:12:28 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
let(:project) { create(:project) }
|
|
|
|
let(:fork_project) { create(:forked_project_with_submodules) }
|
|
|
|
let(:merge_request) { create(:merge_request_with_diffs, source_project: fork_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) }
|
2015-06-17 16:12:28 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
before do
|
|
|
|
fork_project.build_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id)
|
|
|
|
fork_project.save
|
|
|
|
merge_request.reload
|
|
|
|
go(format: 'json')
|
|
|
|
end
|
2015-06-17 16:12:28 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
it 'renders' do
|
|
|
|
expect(response).to be_success
|
|
|
|
expect(response.body).to have_content('Subproject commit')
|
|
|
|
end
|
2015-06-17 16:12:28 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
context 'with ignore_whitespace_change' do
|
|
|
|
context 'as html' do
|
|
|
|
before { go(format: 'html', w: 1) }
|
2015-10-21 20:55:35 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
it 'renders the diff template' do
|
|
|
|
expect(response).to render_template('diffs')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as json' do
|
|
|
|
before { go(format: 'json', w: 1) }
|
2015-10-21 20:55:35 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
it 'renders the diffs template to a string' do
|
|
|
|
expect(response).to render_template('projects/merge_requests/show/_diffs')
|
|
|
|
expect(JSON.parse(response.body)).to have_key('html')
|
|
|
|
end
|
2015-10-21 20:55:35 -04:00
|
|
|
end
|
|
|
|
end
|
2016-02-05 06:34:51 -05:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
context 'with view' do
|
|
|
|
before { go(view: 'parallel') }
|
2015-10-21 20:55:35 -04:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
it 'saves the preferred diff view in a cookie' do
|
|
|
|
expect(response.cookies['diff_view']).to eq('parallel')
|
2015-10-21 20:55:35 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-08 13:11:47 -04:00
|
|
|
describe 'GET diff_for_path' do
|
2016-06-28 12:25:32 -04:00
|
|
|
def diff_for_path(extra_params = {})
|
2016-02-05 16:03:20 -05:00
|
|
|
params = {
|
|
|
|
namespace_id: project.namespace.to_param,
|
2016-06-28 12:25:32 -04:00
|
|
|
project_id: project.to_param
|
2016-02-05 16:03:20 -05:00
|
|
|
}
|
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
get :diff_for_path, params.merge(extra_params)
|
2016-02-05 16:03:20 -05:00
|
|
|
end
|
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
context 'when an ID param is passed' do
|
|
|
|
let(:existing_path) { 'files/ruby/popen.rb' }
|
2016-02-05 06:34:51 -05:00
|
|
|
|
2016-06-28 12:25:32 -04:00
|
|
|
context 'when the merge request exists' do
|
|
|
|
context 'when the user can view the merge request' do
|
|
|
|
context 'when the path exists in the diff' do
|
|
|
|
it 'enables diff notes' do
|
2016-07-08 17:50:06 -04:00
|
|
|
diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
|
2016-06-28 12:25:32 -04:00
|
|
|
|
|
|
|
expect(assigns(:diff_notes_disabled)).to be_falsey
|
|
|
|
expect(assigns(:comments_target)).to eq(noteable_type: 'MergeRequest',
|
|
|
|
noteable_id: merge_request.id)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'only renders the diffs for the path given' do
|
2016-07-26 03:21:42 -04:00
|
|
|
expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
|
|
|
|
expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
|
|
|
|
meth.call(diffs)
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
|
2016-07-08 17:50:06 -04:00
|
|
|
diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the path does not exist in the diff' do
|
2016-07-08 17:50:06 -04:00
|
|
|
before { diff_for_path(id: merge_request.iid, old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb') }
|
2016-06-28 12:25:32 -04:00
|
|
|
|
|
|
|
it 'returns a 404' do
|
|
|
|
expect(response).to have_http_status(404)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the user cannot view the merge request' do
|
|
|
|
before do
|
|
|
|
project.team.truncate
|
2016-07-08 17:50:06 -04:00
|
|
|
diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns a 404' do
|
|
|
|
expect(response).to have_http_status(404)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the merge request does not exist' do
|
2016-07-08 17:50:06 -04:00
|
|
|
before { diff_for_path(id: merge_request.iid.succ, old_path: existing_path, new_path: existing_path) }
|
2016-06-28 12:25:32 -04:00
|
|
|
|
|
|
|
it 'returns a 404' do
|
|
|
|
expect(response).to have_http_status(404)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the merge request belongs to a different project' do
|
|
|
|
let(:other_project) { create(:empty_project) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
other_project.team << [user, :master]
|
2016-07-08 17:50:06 -04:00
|
|
|
diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path, project_id: other_project.to_param)
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns a 404' do
|
|
|
|
expect(response).to have_http_status(404)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when source and target params are passed' do
|
|
|
|
let(:existing_path) { 'files/ruby/feature.rb' }
|
|
|
|
|
|
|
|
context 'when both branches are in the same project' do
|
|
|
|
it 'disables diff notes' do
|
2016-07-08 17:50:06 -04:00
|
|
|
diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
|
2016-06-28 12:25:32 -04:00
|
|
|
|
|
|
|
expect(assigns(:diff_notes_disabled)).to be_truthy
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'only renders the diffs for the path given' do
|
2016-07-26 03:21:42 -04:00
|
|
|
expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
|
|
|
|
expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
|
|
|
|
meth.call(diffs)
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
|
2016-07-08 17:50:06 -04:00
|
|
|
diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the source branch is in a different project to the target' do
|
|
|
|
let(:other_project) { create(:project) }
|
|
|
|
|
|
|
|
before { other_project.team << [user, :master] }
|
|
|
|
|
|
|
|
context 'when the path exists in the diff' do
|
|
|
|
it 'disables diff notes' do
|
2016-07-08 17:50:06 -04:00
|
|
|
diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
|
2016-06-28 12:25:32 -04:00
|
|
|
|
|
|
|
expect(assigns(:diff_notes_disabled)).to be_truthy
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'only renders the diffs for the path given' do
|
2016-07-26 03:21:42 -04:00
|
|
|
expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
|
|
|
|
expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
|
|
|
|
meth.call(diffs)
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
|
2016-07-08 17:50:06 -04:00
|
|
|
diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
|
2016-06-28 12:25:32 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the path does not exist in the diff' do
|
2016-07-08 17:50:06 -04:00
|
|
|
before { diff_for_path(old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb', merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' }) }
|
2016-06-28 12:25:32 -04:00
|
|
|
|
|
|
|
it 'returns a 404' do
|
|
|
|
expect(response).to have_http_status(404)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-02-05 06:34:51 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-08 17:50:06 -04:00
|
|
|
describe 'GET commits' do
|
2015-06-17 16:12:28 -04:00
|
|
|
def go(format: 'html')
|
2015-06-23 01:24:39 -04:00
|
|
|
get :commits,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
|
|
|
format: format
|
2015-06-17 16:12:28 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'as html' do
|
|
|
|
it 'renders the show template' do
|
|
|
|
go
|
|
|
|
|
|
|
|
expect(response).to render_template('show')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as json' do
|
|
|
|
it 'renders the commits template to a string' do
|
|
|
|
go format: 'json'
|
|
|
|
|
|
|
|
expect(response).to render_template('projects/merge_requests/show/_commits')
|
|
|
|
expect(JSON.parse(response.body)).to have_key('html')
|
|
|
|
end
|
2015-04-13 01:27:45 -04:00
|
|
|
end
|
|
|
|
end
|
2016-07-27 07:42:18 -04:00
|
|
|
|
|
|
|
describe 'GET conflicts' do
|
2016-07-29 09:51:11 -04:00
|
|
|
let(:json_response) { JSON.parse(response.body) }
|
|
|
|
|
|
|
|
context 'when the conflicts cannot be resolved in the UI' do
|
2016-07-27 07:42:18 -04:00
|
|
|
before do
|
2016-07-29 09:51:11 -04:00
|
|
|
allow_any_instance_of(Gitlab::Conflict::Parser).
|
|
|
|
to receive(:parse).and_raise(Gitlab::Conflict::Parser::UnexpectedDelimiter)
|
|
|
|
|
2016-07-27 07:42:18 -04:00
|
|
|
get :conflicts,
|
|
|
|
namespace_id: merge_request_with_conflicts.project.namespace.to_param,
|
|
|
|
project_id: merge_request_with_conflicts.project.to_param,
|
|
|
|
id: merge_request_with_conflicts.iid,
|
|
|
|
format: 'json'
|
|
|
|
end
|
|
|
|
|
2016-07-29 09:51:11 -04:00
|
|
|
it 'returns a 200 status code' do
|
|
|
|
expect(response).to have_http_status(:ok)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns JSON with a message' do
|
2016-08-02 08:56:50 -04:00
|
|
|
expect(json_response.keys).to contain_exactly('message', 'type')
|
2016-07-29 09:51:11 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with valid conflicts' do
|
|
|
|
before do
|
|
|
|
get :conflicts,
|
|
|
|
namespace_id: merge_request_with_conflicts.project.namespace.to_param,
|
|
|
|
project_id: merge_request_with_conflicts.project.to_param,
|
|
|
|
id: merge_request_with_conflicts.iid,
|
|
|
|
format: 'json'
|
|
|
|
end
|
2016-07-27 07:42:18 -04:00
|
|
|
|
|
|
|
it 'includes meta info about the MR' do
|
|
|
|
expect(json_response['commit_message']).to include('Merge branch')
|
|
|
|
expect(json_response['commit_sha']).to match(/\h{40}/)
|
|
|
|
expect(json_response['source_branch']).to eq(merge_request_with_conflicts.source_branch)
|
|
|
|
expect(json_response['target_branch']).to eq(merge_request_with_conflicts.target_branch)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'includes each file that has conflicts' do
|
|
|
|
filenames = json_response['files'].map { |file| file['new_path'] }
|
|
|
|
|
|
|
|
expect(filenames).to contain_exactly('files/ruby/popen.rb', 'files/ruby/regex.rb')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'splits files into sections with lines' do
|
|
|
|
json_response['files'].each do |file|
|
|
|
|
file['sections'].each do |section|
|
|
|
|
expect(section).to include('conflict', 'lines')
|
|
|
|
|
|
|
|
section['lines'].each do |line|
|
|
|
|
if section['conflict']
|
|
|
|
expect(line['type']).to be_in(['old', 'new'])
|
|
|
|
expect(line.values_at('old_line', 'new_line')).to contain_exactly(nil, a_kind_of(Integer))
|
|
|
|
else
|
|
|
|
if line['type'].nil?
|
|
|
|
expect(line['old_line']).not_to eq(nil)
|
|
|
|
expect(line['new_line']).not_to eq(nil)
|
|
|
|
else
|
|
|
|
expect(line['type']).to eq('match')
|
|
|
|
expect(line['old_line']).to eq(nil)
|
|
|
|
expect(line['new_line']).to eq(nil)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has unique section IDs across files' do
|
|
|
|
section_ids = json_response['files'].flat_map do |file|
|
|
|
|
file['sections'].map { |section| section['id'] }.compact
|
|
|
|
end
|
|
|
|
|
|
|
|
expect(section_ids.uniq).to eq(section_ids)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-07-27 12:54:04 -04:00
|
|
|
|
2016-09-08 05:18:41 -04:00
|
|
|
context 'POST remove_wip' do
|
|
|
|
it 'removes the wip status' do
|
|
|
|
merge_request.title = merge_request.wip_title
|
|
|
|
merge_request.save
|
|
|
|
|
|
|
|
post :remove_wip,
|
|
|
|
namespace_id: merge_request.project.namespace.to_param,
|
|
|
|
project_id: merge_request.project.to_param,
|
|
|
|
id: merge_request.iid
|
|
|
|
|
|
|
|
expect(merge_request.reload.title).to eq(merge_request.wipless_title)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-27 12:54:04 -04:00
|
|
|
context 'POST resolve_conflicts' do
|
2016-07-29 09:51:11 -04:00
|
|
|
let(:json_response) { JSON.parse(response.body) }
|
|
|
|
let!(:original_head_sha) { merge_request_with_conflicts.diff_head_sha }
|
|
|
|
|
2016-08-02 08:56:50 -04:00
|
|
|
def resolve_conflicts(sections)
|
2016-07-27 12:54:04 -04:00
|
|
|
post :resolve_conflicts,
|
|
|
|
namespace_id: merge_request_with_conflicts.project.namespace.to_param,
|
|
|
|
project_id: merge_request_with_conflicts.project.to_param,
|
|
|
|
id: merge_request_with_conflicts.iid,
|
|
|
|
format: 'json',
|
2016-08-02 08:56:50 -04:00
|
|
|
sections: sections,
|
|
|
|
commit_message: 'Commit message'
|
2016-07-27 12:54:04 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'with valid params' do
|
|
|
|
before do
|
2016-08-05 07:15:06 -04:00
|
|
|
resolve_conflicts('2f6fcd96b88b36ce98c38da085c795a27d92a3dd_14_14' => 'head',
|
2016-08-02 08:56:50 -04:00
|
|
|
'6eb14e00385d2fb284765eb1cd8d420d33d63fc9_9_9' => 'head',
|
|
|
|
'6eb14e00385d2fb284765eb1cd8d420d33d63fc9_21_21' => 'origin',
|
|
|
|
'6eb14e00385d2fb284765eb1cd8d420d33d63fc9_49_49' => 'origin')
|
2016-07-27 12:54:04 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a new commit on the branch' do
|
2016-07-29 09:51:11 -04:00
|
|
|
expect(original_head_sha).not_to eq(merge_request_with_conflicts.source_branch_head.sha)
|
2016-08-02 08:56:50 -04:00
|
|
|
expect(merge_request_with_conflicts.source_branch_head.message).to include('Commit message')
|
2016-07-27 12:54:04 -04:00
|
|
|
end
|
|
|
|
|
2016-08-05 07:15:06 -04:00
|
|
|
it 'returns an OK response' do
|
2016-08-02 08:56:50 -04:00
|
|
|
expect(response).to have_http_status(:ok)
|
2016-07-27 12:54:04 -04:00
|
|
|
end
|
|
|
|
end
|
2016-07-29 09:51:11 -04:00
|
|
|
|
|
|
|
context 'when sections are missing' do
|
|
|
|
before do
|
2016-08-05 07:15:06 -04:00
|
|
|
resolve_conflicts('2f6fcd96b88b36ce98c38da085c795a27d92a3dd_14_14' => 'head')
|
2016-07-29 09:51:11 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns a 400 error' do
|
|
|
|
expect(response).to have_http_status(:bad_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'has a message with the name of the first missing section' do
|
|
|
|
expect(json_response['message']).to include('6eb14e00385d2fb284765eb1cd8d420d33d63fc9_9_9')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a new commit' do
|
|
|
|
expect(original_head_sha).to eq(merge_request_with_conflicts.source_branch_head.sha)
|
|
|
|
end
|
|
|
|
end
|
2016-07-27 12:54:04 -04:00
|
|
|
end
|
2016-08-08 18:30:01 -04:00
|
|
|
|
|
|
|
describe 'POST assign_related_issues' do
|
|
|
|
let(:issue1) { create(:issue, project: project) }
|
|
|
|
let(:issue2) { create(:issue, project: project) }
|
|
|
|
|
|
|
|
def post_assign_issues
|
|
|
|
merge_request.update!(description: "Closes #{issue1.to_reference} and #{issue2.to_reference}",
|
|
|
|
author: user,
|
|
|
|
source_branch: 'feature',
|
|
|
|
target_branch: 'master')
|
|
|
|
|
|
|
|
post :assign_related_issues,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows a flash message on success' do
|
|
|
|
post_assign_issues
|
|
|
|
|
|
|
|
expect(flash[:notice]).to eq '2 issues have been assigned to you'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'correctly pluralizes flash message on success' do
|
|
|
|
issue2.update!(assignee: user)
|
|
|
|
|
|
|
|
post_assign_issues
|
|
|
|
|
|
|
|
expect(flash[:notice]).to eq '1 issue has been assigned to you'
|
|
|
|
end
|
2016-10-07 12:16:42 -04:00
|
|
|
|
|
|
|
it 'calls MergeRequests::AssignIssuesService' do
|
|
|
|
expect(MergeRequests::AssignIssuesService).to receive(:new).
|
|
|
|
with(project, user, merge_request: merge_request).
|
2016-10-10 11:19:46 -04:00
|
|
|
and_return(double(execute: { count: 1 }))
|
2016-10-07 12:16:42 -04:00
|
|
|
|
|
|
|
post_assign_issues
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is skipped when not signed in' do
|
|
|
|
project.update!(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
|
|
|
|
sign_out(:user)
|
|
|
|
|
|
|
|
expect(MergeRequests::AssignIssuesService).not_to receive(:new)
|
|
|
|
|
|
|
|
post_assign_issues
|
|
|
|
end
|
2016-08-08 18:30:01 -04:00
|
|
|
end
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|