diff options
author | Felipe Artur <felipefac@gmail.com> | 2017-12-11 19:00:11 -0200 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2017-12-13 13:36:52 -0200 |
commit | 504f77b43a92362b07899e946855dc689b45b3ae (patch) | |
tree | ad394ad0c53b3b3283a375a16e8097b543543f72 /spec/workers/stuck_merge_jobs_worker_spec.rb | |
parent | 0cdc840b7fd710e58130a06e94d508c7c8cb133b (diff) | |
download | gitlab-ce-504f77b43a92362b07899e946855dc689b45b3ae.tar.gz |
Prevent worker that updates merge requests head pipeline from failing jobs
Diffstat (limited to 'spec/workers/stuck_merge_jobs_worker_spec.rb')
-rw-r--r-- | spec/workers/stuck_merge_jobs_worker_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/workers/stuck_merge_jobs_worker_spec.rb b/spec/workers/stuck_merge_jobs_worker_spec.rb index f8b55e873df..c2c2a5f9121 100644 --- a/spec/workers/stuck_merge_jobs_worker_spec.rb +++ b/spec/workers/stuck_merge_jobs_worker_spec.rb @@ -14,7 +14,6 @@ describe StuckMergeJobsWorker do mr_with_sha.reload mr_without_sha.reload - expect(mr_with_sha).to be_merged expect(mr_without_sha).to be_opened expect(mr_with_sha.merge_jid).to be_present @@ -24,10 +23,13 @@ describe StuckMergeJobsWorker do it 'updates merge request to opened when locked but has not been merged' do allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return(%w(123)) merge_request = create(:merge_request, :locked, merge_jid: '123', state: :locked) + pipeline = create(:ci_empty_pipeline, project: merge_request.project, ref: merge_request.source_branch, sha: merge_request.source_branch_sha) worker.perform - expect(merge_request.reload).to be_opened + merge_request.reload + expect(merge_request).to be_opened + expect(merge_request.head_pipeline).to eq(pipeline) end it 'logs updated stuck merge job ids' do |