Track enqueued and ongoing MRs

1 files changed, 19 insertions, 20 deletions

diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 2d10c6ef1da..de2f6c2139d 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -931,6 +931,23 @@ describe MergeRequest do
     end
   end
 
+  describe '#async_merge' do
+    it 'enqueues MergeWorker job and updates merge_jid' do
+      merge_request = create(:merge_request)
+      user_id = double(:user_id)
+      params = double(:params)
+      merge_jid = 'hash-123'
+
+      expect(MergeWorker).to receive(:perform_async).with(merge_request.id, user_id, params) do
+        merge_jid
+      end
+
+      merge_request.async_merge(user_id, params)
+
+      expect(merge_request.reload.merge_jid).to eq(merge_jid)
+    end
+  end
+
   describe '#check_if_can_be_merged' do
     let(:project) { create(:project, only_allow_merge_if_pipeline_succeeds: true) }
 
@@ -1370,29 +1387,11 @@ describe MergeRequest do
   end
 
   describe '#merge_ongoing?' do
-    it 'returns true when merge process is ongoing for merge_jid' do
-      merge_request = create(:merge_request, merge_jid: 'foo')
-
-      allow(Gitlab::SidekiqStatus).to receive(:num_running).with(['foo']).and_return(1)
+    it 'returns true when merge_id is present and MR is not merged' do
+      merge_request = build_stubbed(:merge_request, state: :open, merge_jid: 'foo')
 
       expect(merge_request.merge_ongoing?).to be(true)
     end
-
-    it 'returns false when no merge process running for merge_jid' do
-      merge_request = build(:merge_request, merge_jid: 'foo')
-
-      allow(Gitlab::SidekiqStatus).to receive(:num_running).with(['foo']).and_return(0)
-
-      expect(merge_request.merge_ongoing?).to be(false)
-    end
-
-    it 'returns false when merge_jid is nil' do
-      merge_request = build(:merge_request, merge_jid: nil)
-
-      expect(Gitlab::SidekiqStatus).not_to receive(:num_running)
-
-      expect(merge_request.merge_ongoing?).to be(false)
-    end
   end
 
   describe "#closed_without_fork?" do