Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into remove-comment-toggleremove-comment-toggle

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index ceb3f97280e..1b0396eb686 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -38,6 +38,21 @@ describe MergeRequests::MergeService, services: true do
       end
     end
 
+    context 'remove source branch by author' do
+      let(:service) do
+        merge_request.merge_params['force_remove_source_branch'] = '1'
+        merge_request.save!
+        MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message')
+      end
+
+      it 'removes the source branch' do
+        expect(DeleteBranchService).to receive(:new).
+          with(merge_request.source_project, merge_request.author).
+          and_call_original
+        service.execute(merge_request)
+      end
+    end
+
     context "error handling" do
       let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }