Merge remote-tracking branch 'upstream/master' into 27377-preload-pipeline-entity27377-preload-pipeline-entity

* upstream/master: (2534 commits)
  Update VERSION to 9.3.0-pre
  Update CHANGELOG.md for 9.2.0
  removes unnecessary redundacy in usage ping doc
  Respect the typo as rubocop said
  Add a test to ensure this works on MySQL
  Change pipelines schedules help page path
  change domain to hostname in usage ping doc
  Fixes broken MySQL migration for retried
  Show password field mask while editing service settings
  Add notes for supported schedulers and cloud providers
  Move environment monitoring to environments doc
  Add docs for change of Cache/Artifact restore order"
  Avoid resource intensive login checks if password is not provided
  Change translation for 'coding' by 'desarrollo' for Spanish
  Add to docs: issues multiple assignees
  rename "Add emoji" and "Award emoji" to "Add reaction" where appropriate
  Add project and group notification settings info
  32570 Fix border-bottom for project activity tab
  Add users endpoint to frontend API class
  Rename users on mysql
  ...

1 files changed, 23 insertions, 21 deletions

diff --git a/spec/services/delete_merged_branches_service_spec.rb b/spec/services/delete_merged_branches_service_spec.rb
index a41a421fa6e..cae74df9c90 100644
--- a/spec/services/delete_merged_branches_service_spec.rb
+++ b/spec/services/delete_merged_branches_service_spec.rb
@@ -6,33 +6,22 @@ describe DeleteMergedBranchesService, services: true do
   let(:project) { create(:project, :repository) }
 
   context '#execute' do
-    context 'unprotected branches' do
-      before do
-        service.execute
-      end
+    it 'deletes a branch that was merged' do
+      service.execute
 
-      it 'deletes a branch that was merged' do
-        expect(project.repository.branch_names).not_to include('improve/awesome')
-      end
+      expect(project.repository.branch_names).not_to include('improve/awesome')
+    end
 
-      it 'keeps branch that is unmerged' do
-        expect(project.repository.branch_names).to include('feature')
-      end
+    it 'keeps branch that is unmerged' do
+      service.execute
 
-      it 'keeps "master"' do
-        expect(project.repository.branch_names).to include('master')
-      end
+      expect(project.repository.branch_names).to include('feature')
     end
 
-    context 'protected branches' do
-      before do
-        create(:protected_branch, name: 'improve/awesome', project: project)
-        service.execute
-      end
+    it 'keeps "master"' do
+      service.execute
 
-      it 'keeps protected branch' do
-        expect(project.repository.branch_names).to include('improve/awesome')
-      end
+      expect(project.repository.branch_names).to include('master')
     end
 
     context 'user without rights' do
@@ -42,6 +31,19 @@ describe DeleteMergedBranchesService, services: true do
         expect { described_class.new(project, user).execute }.to raise_error(Gitlab::Access::AccessDeniedError)
       end
     end
+
+    context 'open merge requests' do
+      it 'does not delete branches from open merge requests' do
+        fork_link = create(:forked_project_link, forked_from_project: project)
+        create(:merge_request, :reopened, source_project: project, target_project: project, source_branch: 'branch-merged', target_branch: 'master')
+        create(:merge_request, :opened, source_project: fork_link.forked_to_project, target_project: project, target_branch: 'improve/awesome', source_branch: 'master')
+
+        service.execute
+
+        expect(project.repository.branch_names).to include('branch-merged')
+        expect(project.repository.branch_names).to include('improve/awesome')
+      end
+    end
   end
 
   context '#async_execute' do