Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
-rw-r--r--spec/requests/api/merge_requests_spec.rb34
1 files changed, 34 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 14b22de9661..7a0077f853a 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -1654,6 +1654,12 @@ describe API::MergeRequests do
end
end
+ describe 'PUT /projects/:id/merge_reuests/:merge_request_iid' do
+ it_behaves_like 'issuable update endpoint' do
+ let(:entity) { merge_request }
+ end
+ end
+
describe "POST /projects/:id/merge_requests/:merge_request_iid/context_commits" do
let(:merge_request_iid) { merge_request.iid }
let(:authenticated_user) { user }
@@ -2023,6 +2029,34 @@ describe API::MergeRequests do
end
end
+ context "with a merge request that has force_remove_source_branch enabled" do
+ let(:source_repository) { merge_request.source_project.repository }
+ let(:source_branch) { merge_request.source_branch }
+
+ before do
+ merge_request.update(merge_params: { 'force_remove_source_branch' => true })
+ end
+
+ it 'removes the source branch' do
+ put(
+ api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
+ )
+
+ expect(response).to have_gitlab_http_status(:ok)
+ expect(source_repository.branch_exists?(source_branch)).to be_falsy
+ end
+
+ it 'does not remove the source branch' do
+ put(
+ api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user),
+ params: { should_remove_source_branch: false }
+ )
+
+ expect(response).to have_gitlab_http_status(:ok)
+ expect(source_repository.branch_exists?(source_branch)).to be_truthy
+ end
+ end
+
context "performing a ff-merge with squash" do
let(:merge_request) { create(:merge_request, :rebased, source_project: project, squash: true) }