diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 12:06:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 12:06:03 +0300 |
| commit | b3e4ec8e8adf4fe96c982124e91b6a05021a9cda (patch) | |
| tree | 5fda0011a7cc7de000186e465e61f893d478a1c8 /spec/workers/stuck_merge_jobs_worker_spec.rb | |
| parent | 90cdc9391171e1be29b2b57a2e2aad0c02c2a7a9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/stuck_merge_jobs_worker_spec.rb')
| -rw-r--r-- | spec/workers/stuck_merge_jobs_worker_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/workers/stuck_merge_jobs_worker_spec.rb b/spec/workers/stuck_merge_jobs_worker_spec.rb index 09efed6d2cf..8ceaf1fc555 100644 --- a/spec/workers/stuck_merge_jobs_worker_spec.rb +++ b/spec/workers/stuck_merge_jobs_worker_spec.rb @@ -22,7 +22,7 @@ describe StuckMergeJobsWorker do expect(mr_without_sha.merge_jid).to be_nil end - it 'updates merge request to opened when locked but has not been merged' do + it 'updates merge request to opened when locked but has not been merged', :sidekiq_might_not_need_inline 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) |