Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues-v2

# Conflicts:
#	db/schema.rb

2 files changed, 31 insertions, 3 deletions

diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index b60136064b7..80213d093f1 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -13,20 +13,21 @@ describe MergeRequests::MergeService do
 
   describe '#execute' do
     context 'MergeRequest#merge_jid' do
+      let(:service) do
+        described_class.new(project, user, commit_message: 'Awesome message')
+      end
+
       before do
         merge_request.update_column(:merge_jid, 'hash-123')
       end
 
       it 'is cleaned when no error is raised' do
-        service = described_class.new(project, user, commit_message: 'Awesome message')
-
         service.execute(merge_request)
 
         expect(merge_request.reload.merge_jid).to be_nil
       end
 
       it 'is cleaned when expected error is raised' do
-        service = described_class.new(project, user, commit_message: 'Awesome message')
         allow(service).to receive(:commit).and_raise(described_class::MergeError)
 
         service.execute(merge_request)
@@ -34,6 +35,22 @@ describe MergeRequests::MergeService do
         expect(merge_request.reload.merge_jid).to be_nil
       end
 
+      it 'is cleaned when merge request is not mergeable' do
+        allow(merge_request).to receive(:mergeable?).and_return(false)
+
+        service.execute(merge_request)
+
+        expect(merge_request.reload.merge_jid).to be_nil
+      end
+
+      it 'is cleaned when no source is found' do
+        allow(merge_request).to receive(:diff_head_sha).and_return(nil)
+
+        service.execute(merge_request)
+
+        expect(merge_request.reload.merge_jid).to be_nil
+      end
+
       it 'is not cleaned when unexpected error is raised' do
         service = described_class.new(project, user, commit_message: 'Awesome message')
         allow(service).to receive(:commit).and_raise(StandardError)
diff --git a/spec/services/merge_requests/post_merge_service_spec.rb b/spec/services/merge_requests/post_merge_service_spec.rb
index a37cdab8928..d2bd05d921f 100644
--- a/spec/services/merge_requests/post_merge_service_spec.rb
+++ b/spec/services/merge_requests/post_merge_service_spec.rb
@@ -11,5 +11,16 @@ describe MergeRequests::PostMergeService do
 
   describe '#execute' do
     it_behaves_like 'cache counters invalidator'
+
+    it 'refreshes the number of open merge requests for a valid MR', :use_clean_rails_memory_store_caching do
+      # Cache the counter before the MR changed state.
+      project.open_merge_requests_count
+      merge_request.update!(state: 'merged')
+
+      service = described_class.new(project, user, {})
+
+      expect { service.execute(merge_request) }
+        .to change { project.open_merge_requests_count }.from(1).to(0)
+    end
   end
 end