From 0116531786704f9ccf6f4402bf1c108a4d05e072 Mon Sep 17 00:00:00 2001
From: Alex Sherman <yul.golem@gmail.com>
Date: Thu, 5 Nov 2020 12:45:59 +0500
Subject: [PATCH] Fix existing tests

---
 app/controllers/admin/domains_controller.rb | 5 -----
 app/mailers/domain_delete_mailer.rb         | 4 ----
 app/models/concerns/domain/force_delete.rb  | 8 +++++++-
 test/mailers/domain_delete_mailer_test.rb   | 7 +------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb
index 2b94607c5..4a8e5961e 100644
--- a/app/controllers/admin/domains_controller.rb
+++ b/app/controllers/admin/domains_controller.rb
@@ -2,7 +2,6 @@ module Admin
   class DomainsController < BaseController
     before_action :set_domain, only: %i[show edit update keep]
     authorize_resource
-    helper_method :force_delete_templates
 
     def index
       params[:q] ||= {}
@@ -105,9 +104,5 @@ module Admin
 
       params[:q][:valid_to_lteq] = ca_cache
     end
-
-    def force_delete_templates
-      DomainDeleteMailer.force_delete_templates
-    end
   end
 end
diff --git a/app/mailers/domain_delete_mailer.rb b/app/mailers/domain_delete_mailer.rb
index 1f08204bf..dbacab68d 100644
--- a/app/mailers/domain_delete_mailer.rb
+++ b/app/mailers/domain_delete_mailer.rb
@@ -1,8 +1,4 @@
 class DomainDeleteMailer < ApplicationMailer
-  def self.force_delete_templates
-    %w[private_person legal_person]
-  end
-
   def confirmation_request(domain:, registrar:, registrant:)
     @domain = DomainPresenter.new(domain: domain, view: view_context)
     @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb
index 78248db80..729a7515b 100644
--- a/app/models/concerns/domain/force_delete.rb
+++ b/app/models/concerns/domain/force_delete.rb
@@ -20,7 +20,13 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
   end
 
   def notification_template
-    registrant.org? ? 'legal_person' : 'private_person'
+    if contact_emails_verification_failed.present?
+      'invalid_email'
+    elsif  registrant.org?
+      'legal_person'
+    else
+      'private_person'
+    end
   end
 
   def force_delete_scheduled?
diff --git a/test/mailers/domain_delete_mailer_test.rb b/test/mailers/domain_delete_mailer_test.rb
index b65ba5d2e..8e568846c 100644
--- a/test/mailers/domain_delete_mailer_test.rb
+++ b/test/mailers/domain_delete_mailer_test.rb
@@ -5,10 +5,6 @@ class DomainDeleteMailerTest < ActionMailer::TestCase
     @domain = domains(:shop)
   end
 
-  def test_force_delete_templates
-    assert_equal %w[private_person legal_person], DomainDeleteMailer.force_delete_templates
-  end
-
   def test_delivers_confirmation_request_email
     assert_equal 'shop.test', @domain.name
     assert_equal 'john@inbox.test', @domain.registrant.email
@@ -68,8 +64,7 @@ class DomainDeleteMailerTest < ActionMailer::TestCase
     email = DomainDeleteMailer.forced(domain: @domain,
                                       registrar: @domain.registrar,
                                       registrant: @domain.registrant,
-                                      template_name: DomainDeleteMailer.force_delete_templates
-                                                       .first).deliver_now
+                                      template_name: @domain.notification_template).deliver_now
 
     assert_emails 1
     assert_equal ['legal@registry.test'], email.from