diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-04-11 16:21:32 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-04-11 19:00:59 -0300 |
| commit | 476cf23fc37d6db8d3fb412ce0b646f228d9aac4 (patch) | |
| tree | 54cc01cab5b3aee83b07f24310199319db72f598 /spec/controllers | |
| parent | 4d04e91814fefe24c186250b7962a7c9aa918d1f (diff) | |
| download | gitlab-ce-476cf23fc37d6db8d3fb412ce0b646f228d9aac4.tar.gz | |
Allow to close invalid merge request
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 75e6b6f45a7..0f2cd34132a 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -157,6 +157,35 @@ describe Projects::MergeRequestsController do end end + describe 'PUT #update' do + context 'there is no source project' do + 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 'closes MR without errors' do + fork_project.destroy + + 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 + describe "DELETE #destroy" do it "denies access to users unless they're admin or project owner" do delete :destroy, namespace_id: project.namespace.path, project_id: project.path, id: merge_request.iid |
