From 6e72bb03b38d395cf70138f80508c8034cc02840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Tue, 20 Oct 2020 15:48:35 +0300 Subject: [PATCH] DomainCron: Don't send force delete mail if template empty --- app/models/concerns/job/force_delete_notify.rb | 2 +- test/models/domain_cron_test.rb | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/job/force_delete_notify.rb b/app/models/concerns/job/force_delete_notify.rb index 658c7a315..bc291354e 100644 --- a/app/models/concerns/job/force_delete_notify.rb +++ b/app/models/concerns/job/force_delete_notify.rb @@ -15,7 +15,7 @@ module Concerns domain.registrar.notifications.create!(text: I18n.t('grace_period_started_domain', domain_name: domain.name, date: domain.force_delete_start)) - send_mail(domain) + send_mail(domain) if domain.template_name.present? domain.update(contact_notification_sent_date: Time.zone.today) end diff --git a/test/models/domain_cron_test.rb b/test/models/domain_cron_test.rb index 3bf36b9e2..0224b1a61 100644 --- a/test/models/domain_cron_test.rb +++ b/test/models/domain_cron_test.rb @@ -39,6 +39,21 @@ class DomainCronTest < ActiveSupport::TestCase assert_emails 1 end + def does_not_deliver_forced_email_if_template_empty + Setting.redemption_grace_period = 30 + + @domain.update(valid_to: Time.zone.parse('2012-08-05')) + assert_not @domain.force_delete_scheduled? + travel_to Time.zone.parse('2010-07-05') + @domain.schedule_force_delete(type: :soft) + @domain.reload + @domain.update(template_name: nil) + travel_to Time.zone.parse('2010-08-06') + DomainCron.start_client_hold + + assert_emails 0 + end + def test_does_not_sets_hold_if_already_set Setting.redemption_grace_period = 30