diff --git a/app/jobs/domain_delete_confirm_email_job.rb b/app/jobs/domain_delete_confirm_email_job.rb index 5c447a24f..65cf948f9 100644 --- a/app/jobs/domain_delete_confirm_email_job.rb +++ b/app/jobs/domain_delete_confirm_email_job.rb @@ -11,7 +11,8 @@ class DomainDeleteConfirmEmailJob < Que::Job private def log(domain) - message = "Send DomainDeleteMailer#confirm email for domain ##{domain.id} to #{domain.registrant_email}" + message = "Send DomainDeleteMailer#confirm email for domain #{domain.name} (##{domain.id})" \ + " to #{domain.registrant_email}" logger.info(message) end diff --git a/app/jobs/domain_delete_forced_email_job.rb b/app/jobs/domain_delete_forced_email_job.rb index ade3a43da..1ddd95bb9 100644 --- a/app/jobs/domain_delete_forced_email_job.rb +++ b/app/jobs/domain_delete_forced_email_job.rb @@ -11,8 +11,8 @@ class DomainDeleteForcedEmailJob < Que::Job private def log(domain) - message = "Send DomainDeleteMailer#forced email for domain ##{domain.id} to #{domain.primary_contact_emails - .join(', ')}" + message = "Send DomainDeleteMailer#forced email for domain #{domain.name} (##{domain.id})" \ + " to #{domain.primary_contact_emails.join(', ')}" logger.info(message) end diff --git a/app/jobs/registrant_change_confirm_email_job.rb b/app/jobs/registrant_change_confirm_email_job.rb index 4c91c48a4..7d2dd79ad 100644 --- a/app/jobs/registrant_change_confirm_email_job.rb +++ b/app/jobs/registrant_change_confirm_email_job.rb @@ -13,7 +13,7 @@ class RegistrantChangeConfirmEmailJob < Que::Job private def log(domain) - message = "Send RegistrantChangeMailer#confirm email for domain ##{domain.id} to #{domain.registrant_email}" + message = "Send RegistrantChangeMailer#confirm email for domain #{domain.name} (##{domain.id}) to #{domain.registrant_email}" logger.info(message) end diff --git a/app/jobs/registrant_change_expired_email_job.rb b/app/jobs/registrant_change_expired_email_job.rb index 8e7650501..3c1bc35e2 100644 --- a/app/jobs/registrant_change_expired_email_job.rb +++ b/app/jobs/registrant_change_expired_email_job.rb @@ -10,7 +10,7 @@ class RegistrantChangeExpiredEmailJob < Que::Job private def log(domain) - message = "Send RegistrantChangeMailer#expired email for domain ##{domain.id} to #{domain.new_registrant_email}" + message = "Send RegistrantChangeMailer#expired email for domain #{domain.name} (##{domain.id}) to #{domain.new_registrant_email}" logger.info(message) end diff --git a/app/jobs/registrant_change_notice_email_job.rb b/app/jobs/registrant_change_notice_email_job.rb index bb170dce1..a0bf26c52 100644 --- a/app/jobs/registrant_change_notice_email_job.rb +++ b/app/jobs/registrant_change_notice_email_job.rb @@ -12,7 +12,7 @@ class RegistrantChangeNoticeEmailJob < Que::Job private def log(domain, new_registrant) - message = "Send RegistrantChangeMailer#notice email for domain ##{domain.id} to #{new_registrant.email}" + message = "Send RegistrantChangeMailer#notice email for domain #{domain.name} (##{domain.id}) to #{new_registrant.email}" logger.info(message) end diff --git a/spec/jobs/domain_delete_confirm_email_job_spec.rb b/spec/jobs/domain_delete_confirm_email_job_spec.rb index 8cb895b3f..0b2a0a6b7 100644 --- a/spec/jobs/domain_delete_confirm_email_job_spec.rb +++ b/spec/jobs/domain_delete_confirm_email_job_spec.rb @@ -9,6 +9,7 @@ RSpec.describe DomainDeleteConfirmEmailJob do expect(Domain).to receive(:find).and_return(domain) allow(domain).to receive_messages( id: 1, + name: 'test.com', registrant_email: 'registrant@test.com', registrar: 'registrar', registrant: 'registrant') @@ -20,7 +21,7 @@ RSpec.describe DomainDeleteConfirmEmailJob do end it 'creates log record' do - log_message = 'Send DomainDeleteMailer#confirm email for domain #1 to registrant@test.com' + log_message = 'Send DomainDeleteMailer#confirm email for domain test.com (#1) to registrant@test.com' allow(DomainDeleteMailer).to receive(:confirm).and_return(message) allow(message).to receive(:deliver_now) diff --git a/spec/jobs/domain_delete_forced_email_job_spec.rb b/spec/jobs/domain_delete_forced_email_job_spec.rb index 452d0a659..05dab987b 100644 --- a/spec/jobs/domain_delete_forced_email_job_spec.rb +++ b/spec/jobs/domain_delete_forced_email_job_spec.rb @@ -9,6 +9,7 @@ RSpec.describe DomainDeleteForcedEmailJob do expect(Domain).to receive(:find).and_return(domain) allow(domain).to receive_messages( id: 1, + name: 'test.com', registrar: 'registrar', registrant: 'registrant', primary_contact_emails: %w(test@test.com test@test.com)) @@ -20,7 +21,7 @@ RSpec.describe DomainDeleteForcedEmailJob do end it 'creates log record' do - log_message = 'Send DomainDeleteMailer#forced email for domain #1 to test@test.com, test@test.com' + log_message = 'Send DomainDeleteMailer#forced email for domain test.com (#1) to test@test.com, test@test.com' allow(DomainDeleteMailer).to receive(:forced).and_return(message) allow(message).to receive(:deliver_now) diff --git a/spec/jobs/registrant_change_confirm_email_job_spec.rb b/spec/jobs/registrant_change_confirm_email_job_spec.rb index efa1b1e30..ea8eb1096 100644 --- a/spec/jobs/registrant_change_confirm_email_job_spec.rb +++ b/spec/jobs/registrant_change_confirm_email_job_spec.rb @@ -10,6 +10,7 @@ RSpec.describe RegistrantChangeConfirmEmailJob do expect(Registrant).to receive(:find).and_return('new registrant') allow(domain).to receive_messages( id: 1, + name: 'test.com', registrant_email: 'registrant@test.com', registrar: 'registrar', registrant: 'registrant') @@ -22,7 +23,7 @@ RSpec.describe RegistrantChangeConfirmEmailJob do end it 'creates log record' do - log_message = 'Send RegistrantChangeMailer#confirm email for domain #1 to registrant@test.com' + log_message = 'Send RegistrantChangeMailer#confirm email for domain test.com (#1) to registrant@test.com' allow(RegistrantChangeMailer).to receive(:confirm).and_return(message) allow(message).to receive(:deliver_now) diff --git a/spec/jobs/registrant_change_expired_email_job_spec.rb b/spec/jobs/registrant_change_expired_email_job_spec.rb index 43d08f50d..1486417ea 100644 --- a/spec/jobs/registrant_change_expired_email_job_spec.rb +++ b/spec/jobs/registrant_change_expired_email_job_spec.rb @@ -4,6 +4,7 @@ RSpec.describe RegistrantChangeExpiredEmailJob do describe '#run' do let(:domain) { instance_double(Domain, id: 1, + name: 'test.com', new_registrant_email: 'new-registrant@test.com', registrar: 'registrar', registrant: 'registrant') @@ -20,7 +21,7 @@ RSpec.describe RegistrantChangeExpiredEmailJob do end it 'creates log record' do - log_message = 'Send RegistrantChangeMailer#expired email for domain #1 to new-registrant@test.com' + log_message = 'Send RegistrantChangeMailer#expired email for domain test.com (#1) to new-registrant@test.com' allow(RegistrantChangeMailer).to receive(:expired).and_return(message) allow(message).to receive(:deliver_now) diff --git a/spec/jobs/registrant_change_notice_email_job_spec.rb b/spec/jobs/registrant_change_notice_email_job_spec.rb index 0d9e05a65..1eb1d6d94 100644 --- a/spec/jobs/registrant_change_notice_email_job_spec.rb +++ b/spec/jobs/registrant_change_notice_email_job_spec.rb @@ -4,6 +4,7 @@ RSpec.describe RegistrantChangeNoticeEmailJob do describe '#run' do let(:domain) { instance_double(Domain, id: 1, + name: 'test.com', registrant_email: 'registrant@test.com', registrar: 'registrar', registrant: 'registrant') @@ -23,7 +24,7 @@ RSpec.describe RegistrantChangeNoticeEmailJob do end it 'creates log record' do - log_message = 'Send RegistrantChangeMailer#notice email for domain #1 to new-registrant@test.com' + log_message = 'Send RegistrantChangeMailer#notice email for domain test.com (#1) to new-registrant@test.com' allow(RegistrantChangeMailer).to receive(:notice).and_return(message) allow(message).to receive(:deliver_now)