summaryrefslogtreecommitdiff
path: root/spec/models/ci/pipeline_spec.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-09-28 17:22:06 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-10-17 07:25:20 +0000
commiteeeb96c9d0cab9c5da850809a9614e2a01fdb7d2 (patch)
tree76749cd11b4c9b18fdfa67d7fb5509e671ed9c57 /spec/models/ci/pipeline_spec.rb
parent9622ef64e41058b8dec97c98f568d8fdea95fd61 (diff)
downloadgitlab-ce-eeeb96c9d0cab9c5da850809a9614e2a01fdb7d2.tar.gz
Change service to be a worker, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_16118195
Diffstat (limited to 'spec/models/ci/pipeline_spec.rb')
-rw-r--r--spec/models/ci/pipeline_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 787042cf055..6ea712ae1b3 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -537,8 +537,10 @@ describe Ci::Pipeline, models: true do
before do
reset_delivered_emails!
- pipeline.enqueue
- pipeline.run
+ perform_enqueued_jobs do
+ pipeline.enqueue
+ pipeline.run
+ end
end
shared_examples 'sending a notification' do