zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 11:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix email subject

Browse source
This commit is contained in:
Alex Sherman 2020-11-05 11:22:25 +05:00
parent c3f63ed43a
commit 344da76dc6
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/mailers/domain_expire_mailer.rb
View file

@ -17,7 +17,7 @@ class DomainExpireMailer < ApplicationMailer
logger.info("Send DomainExpireMailer##{method_name} email for #{domain.name} (##{domain.id})" \ logger.info("Send DomainExpireMailer##{method_name} email for #{domain.name} (##{domain.id})" \
" to #{recipient(domain).join(', ')}") " to #{recipient(domain).join(', ')}")
mail(to: recipient(domain), subject: subject) mail(to: recipient(domain), subject: subject(method_name))
end end
def init(domain, registrar) def init(domain, registrar)
@ -29,8 +29,8 @@ class DomainExpireMailer < ApplicationMailer
filter_invalid_emails(emails: domain.primary_contact_emails, domain: @domain) filter_invalid_emails(emails: domain.primary_contact_emails, domain: @domain)
end end
def subject def subject(method_name)
default_i18n_subject(domain_name: @domain.name) I18n.t("domain_expire_mailer.#{method_name}.subject", domain_name: @domain.name)
end end
def domain_presenter(domain:) def domain_presenter(domain:)

5
config/locales/mailers/domain_expire.en.yml
View file

@ -5,3 +5,8 @@ en:
Domeen %{domain_name} on aegunud Domeen %{domain_name} on aegunud
/ Domain %{domain_name} has expired / Domain %{domain_name} has expired
/ Срок действия домена %{domain_name} истек / Срок действия домена %{domain_name} истек
expired_soft:
subject: >-
Domeen %{domain_name} on aegunud ning suunatud kustutusmenetlusse
/ Domain %{domain_name} has expired and directed into deletion process
/ Срок действия домена %{domain_name} истек

8
test/mailers/domain_expire_mailer_test.rb
View file

@ -8,16 +8,18 @@ class DomainExpireMailerTest < ActionMailer::TestCase
email = DomainExpireMailer.expired(domain: domain, registrar: domain.registrar).deliver_now email = DomainExpireMailer.expired(domain: domain, registrar: domain.registrar).deliver_now
assert_emails 1 assert_emails 1
assert_equal 'Domeen shop.test on aegunud / Domain shop.test has expired' \ assert_equal I18n.t("domain_expire_mailer.expired.subject", domain_name: domain.name),
' / Срок действия домена shop.test истек', email.subject email.subject
end end
def test_delivers_domain_expiration_soft_email def test_delivers_domain_expiration_soft_email
domain = domains(:shop) domain = domains(:shop)
assert_equal 'shop.test', domain.name assert_equal 'shop.test', domain.name
DomainExpireMailer.expired_soft(domain: domain, registrar: domain.registrar).deliver_now email = DomainExpireMailer.expired_soft(domain: domain, registrar: domain.registrar).deliver_now
assert_emails 1 assert_emails 1
assert_equal I18n.t("domain_expire_mailer.expired_soft.subject", domain_name: domain.name),
email.subject
end end
end end