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
path: root/spec
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-02-25 18:47:35 +0300
committerLin Jen-Shin <godfat@godfat.org>2019-02-25 18:47:35 +0300
commit5a0629b483017146eb568b4c6f2ce8397ed1db53 (patch)
tree56e17d15bf2d1f6c8be2949b5578afa71ef683a2 /spec
parent4441def02383a085b96c0d45ba522b2a372c2275 (diff)
parentc85a768ca5d8c53b7770fdc4dc8f9eeef237b8c8 (diff)
Merge branch '58020-fix-merge-api-endpoint-param' into 'master'
Respect the `should_remove_source_branch` parameter to the merge API Closes #58020 See merge request gitlab-org/gitlab-ce!25525
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/merge_requests_spec.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index b8426126bc6..b4cd3130dc5 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -984,6 +984,21 @@ describe API::MergeRequests do
expect(squash_commit.message).to eq(merge_request.default_squash_commit_message)
end
end
+
+ describe "the should_remove_source_branch param" do
+ let(:source_repository) { merge_request.source_project.repository }
+ let(:source_branch) { merge_request.source_branch }
+
+ it 'removes the source branch when set' do
+ put(
+ api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user),
+ params: { should_remove_source_branch: true }
+ )
+
+ expect(response).to have_gitlab_http_status(200)
+ expect(source_repository.branch_exists?(source_branch)).to be_falsy
+ end
+ end
end
describe "PUT /projects/:id/merge_requests/:merge_request_iid" do