Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 31 insertions, 2 deletions

diff --git a/spec/workers/jira_connect/sync_merge_request_worker_spec.rb b/spec/workers/jira_connect/sync_merge_request_worker_spec.rb
index 764201e750a..b3c0db4f260 100644
--- a/spec/workers/jira_connect/sync_merge_request_worker_spec.rb
+++ b/spec/workers/jira_connect/sync_merge_request_worker_spec.rb
@@ -4,14 +4,18 @@ require 'spec_helper'
 
 RSpec.describe JiraConnect::SyncMergeRequestWorker do
   describe '#perform' do
-    let(:merge_request) { create(:merge_request) }
+    let_it_be(:group) { create(:group) }
+    let_it_be(:project) { create(:project, :repository, group: group) }
+    let_it_be(:subscription) { create(:jira_connect_subscription, installation: create(:jira_connect_installation), namespace: group) }
+    let_it_be(:merge_request) { create(:merge_request, source_project: project) }
+
     let(:merge_request_id) { merge_request.id }
 
     subject { described_class.new.perform(merge_request_id) }
 
     it 'calls JiraConnect::SyncService#execute' do
       expect_next_instance_of(JiraConnect::SyncService) do |service|
-        expect(service).to receive(:execute).with(merge_requests: [merge_request])
+        expect(service).to receive(:execute).with(merge_requests: [merge_request], update_sequence_id: nil)
       end
 
       subject
@@ -26,5 +30,30 @@ RSpec.describe JiraConnect::SyncMergeRequestWorker do
         subject
       end
     end
+
+    context 'with update_sequence_id' do
+      let(:update_sequence_id) { 1 }
+      let(:request_url) { 'https://sample.atlassian.net/rest/devinfo/0.10/bulk' }
+      let(:request_body) do
+        {
+          repositories: [
+            Atlassian::JiraConnect::Serializers::RepositoryEntity.represent(
+              project,
+              merge_requests: [merge_request],
+              update_sequence_id: update_sequence_id
+            )
+          ]
+        }.to_json
+      end
+
+      subject { described_class.new.perform(merge_request_id, update_sequence_id) }
+
+      it 'sends the request with custom update_sequence_id' do
+        expect(Atlassian::JiraConnect::Client).to receive(:post)
+          .with(URI(request_url), headers: anything, body: request_body)
+
+        subject
+      end
+    end
   end
 end