diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-17 12:13:30 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-17 12:13:30 +0000 |
commit | 1972a51d40cb3be70fa0e8de3d6b4b48add5cb80 (patch) | |
tree | 25b584ecf6cdcc0541946a812842753d80df6bce /spec/workers | |
parent | 0a6f65ec4bf528236fd43ed1162bbb3297ed6337 (diff) | |
download | gitlab-ce-1972a51d40cb3be70fa0e8de3d6b4b48add5cb80.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/jira_connect/sync_merge_request_worker_spec.rb | 28 |
1 files changed, 24 insertions, 4 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 bbedbf6a53b..459cabb5f20 100644 --- a/spec/workers/jira_connect/sync_merge_request_worker_spec.rb +++ b/spec/workers/jira_connect/sync_merge_request_worker_spec.rb @@ -37,6 +37,23 @@ RSpec.describe JiraConnect::SyncMergeRequestWorker, feature_category: :integrati end end + shared_examples 'does not send any branch data' do + it 'calls JiraConnect::SyncService correctly with nil branches' do + expect_next(JiraConnect::SyncService).to receive(:execute) + .with(merge_requests: [merge_request], branches: nil, update_sequence_id: update_sequence_id) + + perform + end + end + + context 'when the merge request is closed' do + before do + merge_request.close! + end + + it_behaves_like 'does not send any branch data' + end + context 'when source branch cannot be found' do before do allow_next_found_instance_of(MergeRequest) do |mr| @@ -44,12 +61,15 @@ RSpec.describe JiraConnect::SyncMergeRequestWorker, feature_category: :integrati end end - it 'calls JiraConnect::SyncService will an empty branch' do - expect_next(JiraConnect::SyncService).to receive(:execute) - .with(merge_requests: [merge_request], branches: [], update_sequence_id: update_sequence_id) + it_behaves_like 'does not send any branch data' + end - perform + context 'when flag is disabled' do + before do + stub_feature_flags(jira_include_keys_from_associated_mr_for_branch: false) end + + it_behaves_like 'does not send any branch data' end end end |