summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-11-30 16:29:27 +0800
committerRobert Speicher <rspeicher@gmail.com>2016-12-01 12:17:33 +0800
commit819f459b69935f75cbe423884149564cf6cea001 (patch)
tree7aec3caf9fd6ddcfe66bee0a8d21abbab3a6e64b /spec/workers
parent7633e4ae3f99aa109788b90a722a2404f6e3536d (diff)
downloadgitlab-ce-819f459b69935f75cbe423884149564cf6cea001.tar.gz
Only include EmailHelpers in mailer specs and specs using themrs-include-emailhelpers
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/build_email_worker_spec.rb1
-rw-r--r--spec/workers/emails_on_push_worker_spec.rb1
-rw-r--r--spec/workers/pipeline_notification_worker_spec.rb2
3 files changed, 4 insertions, 0 deletions
diff --git a/spec/workers/build_email_worker_spec.rb b/spec/workers/build_email_worker_spec.rb
index a1aa336361a..542e674c150 100644
--- a/spec/workers/build_email_worker_spec.rb
+++ b/spec/workers/build_email_worker_spec.rb
@@ -1,6 +1,7 @@
require 'spec_helper'
describe BuildEmailWorker do
+ include EmailHelpers
include RepoHelpers
let(:build) { create(:ci_build) }
diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb
index fc652f6f4c3..f27e413f7b8 100644
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
describe EmailsOnPushWorker do
include RepoHelpers
+ include EmailHelpers
include EmailSpec::Matchers
let(:project) { create(:project) }
diff --git a/spec/workers/pipeline_notification_worker_spec.rb b/spec/workers/pipeline_notification_worker_spec.rb
index d487a719680..739f9b63967 100644
--- a/spec/workers/pipeline_notification_worker_spec.rb
+++ b/spec/workers/pipeline_notification_worker_spec.rb
@@ -1,6 +1,8 @@
require 'spec_helper'
describe PipelineNotificationWorker do
+ include EmailHelpers
+
let(:pipeline) do
create(:ci_pipeline,
project: project,