From bb5f79d43e0bb20bacd5ecd8b66832d9857bd079 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 3 Aug 2017 00:43:51 +0800 Subject: Don't include EmailHelpers manually, pick with rspec `:mailer` is needed to pick it easily, while `type: :mailer` is needed for picking it automatically for tests located in spec/mailers/*_spec.rb It's a bit complicated in spec/services/notification_service_spec.rb but we'll leave it alone for now. --- spec/support/notify_shared_examples.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'spec/support/notify_shared_examples.rb') diff --git a/spec/support/notify_shared_examples.rb b/spec/support/notify_shared_examples.rb index d6117d604f2..136f92c6419 100644 --- a/spec/support/notify_shared_examples.rb +++ b/spec/support/notify_shared_examples.rb @@ -7,7 +7,6 @@ shared_context 'gitlab email notification' do let(:new_user_address) { 'newguy@example.com' } before do - reset_delivered_emails! email = recipient.emails.create(email: "notifications@example.com") recipient.update_attribute(:notification_email, email.email) stub_incoming_email_setting(enabled: true, address: "reply+%{key}@#{Gitlab.config.gitlab.host}") -- cgit v1.2.1