Merge pull request #1242 from internetee/improve-tests

Inherit from `ActionMailer::TestCase`
internetee · Jun 25, 2019 · 25638da · 25638da
2 parents 2ee61cf + a51f991
commit 25638da
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/test/mailers/contact_mailer_test.rb b/test/mailers/contact_mailer_test.rb
@@ -1,11 +1,8 @@
 require 'test_helper'
 
-class ContactMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
+class ContactMailerTest < ActionMailer::TestCase
   setup do
     @contact = contacts(:john)
-    ActionMailer::Base.deliveries.clear
   end
 
   def test_delivers_email_changed_email

diff --git a/test/mailers/domain_delete_mailer_test.rb b/test/mailers/domain_delete_mailer_test.rb
@@ -1,11 +1,8 @@
 require 'test_helper'
 
-class DomainDeleteMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
+class DomainDeleteMailerTest < ActionMailer::TestCase
   setup do
     @domain = domains(:shop)
-    ActionMailer::Base.deliveries.clear
   end
 
   def test_force_delete_templates

diff --git a/test/mailers/domain_expire_mailer_test.rb b/test/mailers/domain_expire_mailer_test.rb
@@ -1,12 +1,6 @@
 require 'test_helper'
 
-class DomainExpireMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
-  setup do
-    ActionMailer::Base.deliveries.clear
-  end
-
+class DomainExpireMailerTest < ActionMailer::TestCase
   def test_delivers_domain_expiration_email
     domain = domains(:shop)
     assert_equal 'shop.test', domain.name

diff --git a/test/mailers/invoice_mailer_test.rb b/test/mailers/invoice_mailer_test.rb
@@ -1,11 +1,8 @@
 require 'test_helper'
 
-class InvoiceMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
+class InvoiceMailerTest < ActionMailer::TestCase
   setup do
     @invoice = invoices(:one)
-    ActionMailer::Base.deliveries.clear
   end
 
   def test_delivers_invoice_email

diff --git a/test/mailers/registrant_change_mailer_test.rb b/test/mailers/registrant_change_mailer_test.rb
@@ -1,11 +1,8 @@
 require 'test_helper'
 
-class RegistrantChangeMailerTest < ActiveSupport::TestCase
-  include ActionMailer::TestHelper
-
+class RegistrantChangeMailerTest < ActionMailer::TestCase
   setup do
     @domain = domains(:shop)
-    ActionMailer::Base.deliveries.clear
   end
 
   def test_delivers_confirmation_request_email