diff options
Diffstat (limited to 'spec/workers/jira_connect/sync_project_worker_spec.rb')
| -rw-r--r-- | spec/workers/jira_connect/sync_project_worker_spec.rb | 72 |
1 files changed, 61 insertions, 11 deletions
diff --git a/spec/workers/jira_connect/sync_project_worker_spec.rb b/spec/workers/jira_connect/sync_project_worker_spec.rb index afd56a3b5c1..7a23aabfd0f 100644 --- a/spec/workers/jira_connect/sync_project_worker_spec.rb +++ b/spec/workers/jira_connect/sync_project_worker_spec.rb @@ -5,17 +5,16 @@ require 'spec_helper' RSpec.describe JiraConnect::SyncProjectWorker, factory_default: :keep, feature_category: :integrations do include AfterNextHelpers - it_behaves_like 'worker with data consistency', - described_class, - data_consistency: :delayed + it_behaves_like 'worker with data consistency', described_class, data_consistency: :delayed describe '#perform' do - let_it_be(:project) { create_default(:project).freeze } + let_it_be(:project) { create_default(:project, :repository).freeze } let!(:mr_with_jira_title) { create(:merge_request, :unique_branches, title: 'TEST-123') } let!(:mr_with_jira_description) { create(:merge_request, :unique_branches, description: 'TEST-323') } let!(:mr_with_other_title) { create(:merge_request, :unique_branches) } let!(:jira_subscription) { create(:jira_connect_subscription, namespace: project.namespace) } + let(:jira_referencing_branch_name) { 'TEST-123_my-feature-branch' } let(:jira_connect_sync_service) { JiraConnect::SyncService.new(project) } let(:job_args) { [project.id, update_sequence_id] } @@ -27,6 +26,7 @@ RSpec.describe JiraConnect::SyncProjectWorker, factory_default: :keep, feature_c Atlassian::JiraConnect::Serializers::RepositoryEntity.represent( project, merge_requests: [mr_with_jira_description, mr_with_jira_title], + branches: [project.repository.find_branch(jira_referencing_branch_name)], update_sequence_id: update_sequence_id ) ] @@ -58,21 +58,71 @@ RSpec.describe JiraConnect::SyncProjectWorker, factory_default: :keep, feature_c expect { perform(project.id, update_sequence_id) }.not_to exceed_query_limit(control_count) end - it 'sends the request with custom update_sequence_id' do - allow_next(Atlassian::JiraConnect::Client).to receive(:post) - .with(request_path, request_body) + context 'with branches to sync' do + context 'on a single branch' do + it 'sends the request with custom update_sequence_id' do + project.repository.create_branch(jira_referencing_branch_name) - perform(project.id, update_sequence_id) + allow_next(Atlassian::JiraConnect::Client).to receive(:post) + .with(request_path, request_body) + + perform(project.id, update_sequence_id) + end + end + + context 'on multiple branches' do + after do + project.repository.rm_branch(project.owner, 'TEST-2_my-feature-branch') + project.repository.rm_branch(project.owner, 'TEST-3_my-feature-branch') + project.repository.rm_branch(project.owner, 'TEST-4_my-feature-branch') + end + + it 'does not requests a lot from Gitaly', :request_store do + # NOTE: Gitaly N+1 calls when processing stats and diffs on commits. + # This should be reduced as we work on reducing Gitaly calls. + # See https://gitlab.com/gitlab-org/gitlab/-/issues/354370 + described_class.new.perform(project.id, update_sequence_id) + + project.repository.create_branch('TEST-2_my-feature-branch') + project.repository.create_branch('TEST-3_my-feature-branch') + project.repository.create_branch('TEST-4_my-feature-branch') + + expect { described_class.new.perform(project.id, update_sequence_id) } + .to change { Gitlab::GitalyClient.get_request_count }.by(13) + end + end + end + + context 'when the number of items to sync is higher than the limit' do + let!(:most_recent_merge_request) { create(:merge_request, :unique_branches, description: 'TEST-323', title: 'TEST-123') } + + before do + stub_const("#{described_class}::MAX_RECORDS_LIMIT", 1) + + project.repository.create_branch('TEST-321_new-branch') + end + + it 'syncs only the most recent merge requests and branches within the limit' do + expect(jira_connect_sync_service).to receive(:execute) + .with( + merge_requests: [most_recent_merge_request], + branches: [have_attributes(name: jira_referencing_branch_name)], + update_sequence_id: update_sequence_id + ) + + perform(project.id, update_sequence_id) + end end - context 'when the number of merge requests to sync is higher than the limit' do + context 'when the feature flag is disabled' do let!(:most_recent_merge_request) { create(:merge_request, :unique_branches, description: 'TEST-323', title: 'TEST-123') } before do - stub_const("#{described_class}::MERGE_REQUEST_LIMIT", 1) + stub_feature_flags(jira_connect_sync_branches: false) + stub_const("#{described_class}::MAX_RECORDS_LIMIT", 1) end - it 'syncs only the most recent merge requests within the limit' do + it 'does not sync branches' do expect(jira_connect_sync_service).to receive(:execute) .with(merge_requests: [most_recent_merge_request], update_sequence_id: update_sequence_id) |