diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-04 14:26:15 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-04 14:26:15 +0300 |
commit | f7e7e40daf335570747b6f8893a63f1e9c91657a (patch) | |
tree | b303136ba22c9b539d2f8437b7bf09a4aa03f21d /spec | |
parent | 75ac425c94d1763088040ff526b590f5ffe03f85 (diff) | |
parent | e0f106ae97334d622c6eb7580e72e17181fddd6e (diff) |
Merge branch 'tc-no-delete-protected-merged-branches' into 'master'
DeleteMergedBranchesService should not delete protected branches
Closes #34553
See merge request !12624
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/delete_merged_branches_service_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/services/delete_merged_branches_service_spec.rb b/spec/services/delete_merged_branches_service_spec.rb index cae74df9c90..fe21ca0b3cb 100644 --- a/spec/services/delete_merged_branches_service_spec.rb +++ b/spec/services/delete_merged_branches_service_spec.rb @@ -24,6 +24,14 @@ describe DeleteMergedBranchesService, services: true do expect(project.repository.branch_names).to include('master') end + it 'keeps protected branches' do + create(:protected_branch, project: project, name: 'improve/awesome') + + service.execute + + expect(project.repository.branch_names).to include('improve/awesome') + end + context 'user without rights' do let(:user) { create(:user) } |