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) }
|
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
|
|
|
|
|
2015-12-04 14:31:01 -05:00
|
|
|
describe '#new' do
|
|
|
|
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
|
|
|
|
|
2012-11-24 18:04:13 -05:00
|
|
|
describe "#show" do
|
2013-04-07 16:58:25 -04:00
|
|
|
shared_examples "export merge as" do |format|
|
2012-11-24 18:04:13 -05:00
|
|
|
it "should 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
|
|
|
|
|
|
|
|
it "should generate 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
|
|
|
|
|
|
|
|
it "should render 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
|
|
|
|
|
|
|
|
it "should 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
|
2013-04-07 16:58:25 -04:00
|
|
|
include_examples "export merge as", :diff
|
2012-11-24 18:04:13 -05:00
|
|
|
let(:format) { :diff }
|
|
|
|
|
|
|
|
it "should really only be a git diff" 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.body).to start_with("diff --git")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "as patch" do
|
2013-04-07 16:58:25 -04:00
|
|
|
include_examples "export merge as", :patch
|
2012-11-24 18:04:13 -05:00
|
|
|
let(:format) { :patch }
|
|
|
|
|
|
|
|
it "should really be a git email patch with commit" 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
|
|
|
|
2014-08-06 02:07:11 -04:00
|
|
|
expect(response.body[0..100]).to start_with("From #{merge_request.commits.last.id}")
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it "should contain git diffs" 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.body).to match(/^diff --git/)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2015-04-13 01:27:45 -04:00
|
|
|
|
2016-03-21 09:12:52 -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
|
|
|
|
it 'should list those merge requests' do
|
|
|
|
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
|
|
|
|
|
|
|
|
it 'should list those merge requests' do
|
|
|
|
get_merge_requests
|
|
|
|
|
|
|
|
expect(assigns(:merge_requests)).to include(merge_request)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-11 15:21:32 -04:00
|
|
|
describe 'PUT #update' do
|
|
|
|
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
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-01 08:25:44 -04:00
|
|
|
describe 'POST #merge' do
|
|
|
|
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
|
|
|
|
post :merge, base_params.merge(sha: merge_request.source_sha)
|
|
|
|
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
|
|
|
|
post :merge, base_params.merge(sha: merge_request.source_sha, merge_when_build_succeeds: '1')
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
|
|
|
create(:ci_empty_commit, project: project, sha: merge_request.source_sha, ref: merge_request.source_branch)
|
|
|
|
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
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-03-21 09:12:52 -04:00
|
|
|
describe "DELETE #destroy" do
|
|
|
|
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-03-21 09:12:52 -04:00
|
|
|
expect(response.status).to eq(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-03-21 09:12:52 -04:00
|
|
|
expect(response.status).to eq(302)
|
|
|
|
expect(controller).to set_flash[:notice].to(/The merge request was successfully deleted\./).now
|
2016-02-26 03:55:43 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-06-17 16:12:28 -04:00
|
|
|
describe 'GET diffs' do
|
|
|
|
def go(format: 'html')
|
2015-06-23 01:24:39 -04:00
|
|
|
get :diffs,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
|
|
|
format: format
|
2015-04-13 01:27:45 -04:00
|
|
|
end
|
|
|
|
|
2015-06-17 16:12:28 -04:00
|
|
|
context 'as html' do
|
|
|
|
it 'renders the diff template' do
|
|
|
|
go
|
|
|
|
|
|
|
|
expect(response).to render_template('diffs')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as json' do
|
|
|
|
it 'renders the diffs template to a string' do
|
|
|
|
go format: 'json'
|
|
|
|
|
|
|
|
expect(response).to render_template('projects/merge_requests/show/_diffs')
|
|
|
|
expect(JSON.parse(response.body)).to have_key('html')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with forked projects with submodules' do
|
|
|
|
render_views
|
|
|
|
|
|
|
|
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) }
|
|
|
|
|
|
|
|
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
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'renders' do
|
|
|
|
go format: 'json'
|
|
|
|
|
|
|
|
expect(response).to be_success
|
|
|
|
expect(response.body).to have_content('Subproject commit')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-10-21 20:55:35 -04:00
|
|
|
describe 'GET diffs with ignore_whitespace_change' do
|
|
|
|
def go(format: 'html')
|
|
|
|
get :diffs,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: merge_request.iid,
|
|
|
|
format: format,
|
|
|
|
w: 1
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as html' do
|
|
|
|
it 'renders the diff template' do
|
|
|
|
go
|
|
|
|
|
|
|
|
expect(response).to render_template('diffs')
|
|
|
|
end
|
|
|
|
end
|
2016-02-05 06:34:51 -05:00
|
|
|
|
2015-10-21 20:55:35 -04:00
|
|
|
context 'as json' do
|
|
|
|
it 'renders the diffs template to a string' do
|
|
|
|
go format: 'json'
|
|
|
|
|
|
|
|
expect(response).to render_template('projects/merge_requests/show/_diffs')
|
|
|
|
expect(JSON.parse(response.body)).to have_key('html')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-02-05 06:34:51 -05:00
|
|
|
describe 'GET diffs with view' do
|
2016-02-05 16:03:20 -05: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)
|
|
|
|
end
|
|
|
|
|
2016-02-05 06:34:51 -05:00
|
|
|
it 'saves the preferred diff view in a cookie' do
|
2016-02-05 16:03:20 -05:00
|
|
|
go view: 'parallel'
|
2016-02-05 06:34:51 -05:00
|
|
|
|
|
|
|
expect(response.cookies['diff_view']).to eq('parallel')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-06-17 16:12:28 -04:00
|
|
|
describe 'GET commits' do
|
|
|
|
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
|
2012-11-24 18:04:13 -05:00
|
|
|
end
|