diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-27 22:11:21 +0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-27 22:33:48 +0200 |
| commit | a6c52c4e593850eb270e5bfbd021cdfb56e6eed6 (patch) | |
| tree | 78a94e69c450dc157176102f119e1396a6523a18 /spec/workers | |
| parent | dfd6c3f824ada5558546b809fd32468325788b94 (diff) | |
| download | gitlab-ce-a6c52c4e593850eb270e5bfbd021cdfb56e6eed6.tar.gz | |
Make merge_jid handling less stateful in MergeService
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/stuck_merge_jobs_worker_spec.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/workers/stuck_merge_jobs_worker_spec.rb b/spec/workers/stuck_merge_jobs_worker_spec.rb index a5ad78393c9..f8b55e873df 100644 --- a/spec/workers/stuck_merge_jobs_worker_spec.rb +++ b/spec/workers/stuck_merge_jobs_worker_spec.rb @@ -12,8 +12,13 @@ describe StuckMergeJobsWorker do worker.perform - expect(mr_with_sha.reload).to be_merged - expect(mr_without_sha.reload).to be_opened + 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 + expect(mr_without_sha.merge_jid).to be_nil end it 'updates merge request to opened when locked but has not been merged' do |