Merge pull request #1166 from internetee/refactor-domain-mailer

Refactor domain mailer

test/integration/registrant_area/domain_delete_confirmations.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class RegistrantAreaDomainDeleteConfirmationIntegrationTest < ActionDispatch::IntegrationTest
+  include ActionMailer::TestHelper
+
+  setup do
+    @domain = domains(:shop)
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_notifies_registrant_by_email_when_accepted
+    @domain.update!(registrant_verification_asked_at: Time.zone.now,
+                    registrant_verification_token: 'test',
+                    statuses: [DomainStatus::PENDING_DELETE_CONFIRMATION])
+
+    patch registrant_domain_delete_confirm_path(@domain, token: 'test', confirmed: true)
+
+    assert_emails 1
+  end
+
+  def test_notifies_registrant_by_email_when_rejected
+    @domain.update!(registrant_verification_asked_at: Time.zone.now,
+                    registrant_verification_token: 'test',
+                    statuses: [DomainStatus::PENDING_DELETE_CONFIRMATION])
+
+    patch registrant_domain_delete_confirm_path(@domain, token: 'test', rejected: true)
+
+    assert_emails 1
+  end
+end

test/mailers/domain_delete_mailer_test.rb

@@ -12,13 +12,13 @@ class DomainDeleteMailerTest < ActiveSupport::TestCase
     assert_equal %w[private_person legal_person], DomainDeleteMailer.force_delete_templates
   end
 
-  def test_delivers_domain_delete_confirmation_email
+  def test_delivers_confirmation_request_email
     assert_equal 'shop.test', @domain.name
     assert_equal 'john@inbox.test', @domain.registrant.email
 
-    email = DomainDeleteMailer.confirmation(domain: @domain,
-                                            registrar: @domain.registrar,
-                                            registrant: @domain.registrant).deliver_now
+    email = DomainDeleteMailer.confirmation_request(domain: @domain,
+                                                    registrar: @domain.registrar,
+                                                    registrant: @domain.registrant).deliver_now
 
     assert_emails 1
     assert_equal ['john@inbox.test'], email.to
@@ -26,6 +26,42 @@ class DomainDeleteMailerTest < ActiveSupport::TestCase
                  ' / Application for approval for deletion of shop.test', email.subject
   end
 
+  def test_delivers_accepted_email
+    assert_equal 'shop.test', @domain.name
+    assert_equal 'john@inbox.test', @domain.registrant.email
+
+    email = DomainDeleteMailer.accepted(@domain).deliver_now
+
+    assert_emails 1
+    assert_equal ['john@inbox.test'], email.to
+    assert_equal 'Domeeni shop.test kustutatud' \
+                 ' / shop.test deleted', email.subject
+  end
+
+  def test_delivers_rejected_email
+    assert_equal 'shop.test', @domain.name
+    assert_equal 'john@inbox.test', @domain.registrant.email
+
+    email = DomainDeleteMailer.rejected(@domain).deliver_now
+
+    assert_emails 1
+    assert_equal ['john@inbox.test'], email.to
+    assert_equal 'Domeeni shop.test kustutamise taotlus tagasi lükatud' \
+                 ' / shop.test deletion declined', email.subject
+  end
+
+  def test_delivers_expired_email
+    assert_equal 'shop.test', @domain.name
+    assert_equal 'john@inbox.test', @domain.registrant.email
+
+    email = DomainDeleteMailer.expired(@domain).deliver_now
+
+    assert_emails 1
+    assert_equal ['john@inbox.test'], email.to
+    assert_equal 'Domeeni shop.test kustutamise taotlus on tühistatud' \
+                 ' / shop.test deletion cancelled', email.subject
+  end
+
   def test_delivers_domain_force_delete_email
     assert_equal 'shop.test', @domain.name
     assert_equal 'john@inbox.test', @domain.registrant.email

test/mailers/previews/domain_delete_mailer_preview.rb

@@ -2,10 +2,9 @@ class DomainDeleteMailerPreview < ActionMailer::Preview
   def self.define_forced_templates
     DomainDeleteMailer.force_delete_templates.each do |template_name|
       define_method "forced_#{template_name}".to_sym do
-        domain = Domain.first
-        DomainDeleteMailer.forced(domain: domain,
-                                  registrar: domain.registrar,
-                                  registrant: domain.registrant,
+        DomainDeleteMailer.forced(domain: @domain,
+                                  registrar: @domain.registrar,
+                                  registrant: @domain.registrant,
                                   template_name: template_name)
       end
     end
@@ -13,10 +12,26 @@ class DomainDeleteMailerPreview < ActionMailer::Preview
 
   define_forced_templates
 
-  def confirmation
-    domain = Domain.first
-    DomainDeleteMailer.confirmation(domain: domain,
-                                    registrar: domain.registrar,
-                                    registrant: domain.registrant)
+  def initialize
+    @domain = Domain.first
+    super
+  end
+
+  def confirmation_request
+    DomainDeleteMailer.confirmation_request(domain: @domain,
+                                            registrar: @domain.registrar,
+                                            registrant: @domain.registrant)
+  end
+
+  def accepted
+    DomainDeleteMailer.accepted(@domain)
+  end
+
+  def rejected
+    DomainDeleteMailer.rejected(@domain)
+  end
+
+  def expired
+    DomainDeleteMailer.expired(@domain)
   end
 end

test/models/domain_cron_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class DomainCronTest < ActiveSupport::TestCase
+  include ActionMailer::TestHelper
+
+  setup do
+    @domain = domains(:shop)
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_clean_expired_pendings_notifies_registrant_by_email
+    Setting.expire_pending_confirmation = 0
+    @domain.update!(registrant_verification_asked_at: Time.zone.now,
+                    registrant_verification_token: 'test',
+                    statuses: [DomainStatus::PENDING_DELETE_CONFIRMATION])
+
+    DomainCron.clean_expired_pendings
+
+    assert_emails 1
+  end
+end