diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /spec/workers/merge_requests/update_head_pipeline_worker_spec.rb | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'spec/workers/merge_requests/update_head_pipeline_worker_spec.rb')
-rw-r--r-- | spec/workers/merge_requests/update_head_pipeline_worker_spec.rb | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/spec/workers/merge_requests/update_head_pipeline_worker_spec.rb b/spec/workers/merge_requests/update_head_pipeline_worker_spec.rb index 5e0b07067df..3574b8296a4 100644 --- a/spec/workers/merge_requests/update_head_pipeline_worker_spec.rb +++ b/spec/workers/merge_requests/update_head_pipeline_worker_spec.rb @@ -24,18 +24,6 @@ RSpec.describe MergeRequests::UpdateHeadPipelineWorker do create(:merge_request, source_branch: 'feature', target_branch: "v1.1.0", source_project: project) end - context 'when related merge request is already merged' do - let!(:merged_merge_request) do - create(:merge_request, source_branch: 'master', target_branch: "branch_2", source_project: project, state: 'merged') - end - - it 'does not schedule update head pipeline job' do - expect(UpdateHeadPipelineForMergeRequestWorker).not_to receive(:perform_async).with(merged_merge_request.id) - - subject - end - end - context 'when the head pipeline sha equals merge request sha' do let(:ref) { 'feature' } @@ -52,6 +40,22 @@ RSpec.describe MergeRequests::UpdateHeadPipelineWorker do expect(merge_request_1.reload.head_pipeline).to eq(pipeline) expect(merge_request_2.reload.head_pipeline).to eq(pipeline) end + + context 'when the merge request is not open' do + before do + merge_request_1.close! + end + + it 'only updates the open merge requests' do + merge_request_1 + merge_request_2 + + subject + + expect(merge_request_1.reload.head_pipeline).not_to eq(pipeline) + expect(merge_request_2.reload.head_pipeline).to eq(pipeline) + end + end end context 'when the head pipeline sha does not equal merge request sha' do |