Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-08-02 18:13:27 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-08-02 19:40:10 +0300
commitf097e4dbcd26a0d122776b72ca4370890a0a3f76 (patch)
treed8529785410ea37dc0e546966373ddf522ead26c /spec/spec_helper.rb
parent8ec089f3324ca6e181b575560c636c93bde6b52d (diff)
Don't send rejection mails for all auto-generated mails
Also make it easier to have mailer helper
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 609998d6e9c..06769b241ad 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -49,7 +49,7 @@ RSpec.configure do |config|
config.include SearchHelpers, type: :feature
config.include WaitForRequests, :js
config.include StubConfiguration
- config.include EmailHelpers, type: :mailer
+ config.include EmailHelpers, :mailer, type: :mailer
config.include TestEnv
config.include ActiveJob::TestHelper
config.include ActiveSupport::Testing::TimeHelpers
@@ -93,6 +93,10 @@ RSpec.configure do |config|
RequestStore.clear!
end
+ config.before(:example, :mailer) do
+ reset_delivered_emails!
+ end
+
if ENV['CI']
config.around(:each) do |ex|
ex.run_with_retry retry: 2