Log domain name in mailer jobs

#186
This commit is contained in:
Artur Beljajev 2016-11-25 11:59:41 +02:00
parent 9ad84d78aa
commit 4f13258352
10 changed files with 17 additions and 11 deletions

View file

@ -11,7 +11,8 @@ class DomainDeleteConfirmEmailJob < Que::Job
private private
def log(domain) 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) logger.info(message)
end end

View file

@ -11,8 +11,8 @@ class DomainDeleteForcedEmailJob < Que::Job
private private
def log(domain) def log(domain)
message = "Send DomainDeleteMailer#forced email for domain ##{domain.id} to #{domain.primary_contact_emails message = "Send DomainDeleteMailer#forced email for domain #{domain.name} (##{domain.id})" \
.join(', ')}" " to #{domain.primary_contact_emails.join(', ')}"
logger.info(message) logger.info(message)
end end

View file

@ -13,7 +13,7 @@ class RegistrantChangeConfirmEmailJob < Que::Job
private private
def log(domain) 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) logger.info(message)
end end

View file

@ -10,7 +10,7 @@ class RegistrantChangeExpiredEmailJob < Que::Job
private private
def log(domain) 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) logger.info(message)
end end

View file

@ -12,7 +12,7 @@ class RegistrantChangeNoticeEmailJob < Que::Job
private private
def log(domain, new_registrant) 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) logger.info(message)
end end

View file

@ -9,6 +9,7 @@ RSpec.describe DomainDeleteConfirmEmailJob do
expect(Domain).to receive(:find).and_return(domain) expect(Domain).to receive(:find).and_return(domain)
allow(domain).to receive_messages( allow(domain).to receive_messages(
id: 1, id: 1,
name: 'test.com',
registrant_email: 'registrant@test.com', registrant_email: 'registrant@test.com',
registrar: 'registrar', registrar: 'registrar',
registrant: 'registrant') registrant: 'registrant')
@ -20,7 +21,7 @@ RSpec.describe DomainDeleteConfirmEmailJob do
end end
it 'creates log record' do 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(DomainDeleteMailer).to receive(:confirm).and_return(message)
allow(message).to receive(:deliver_now) allow(message).to receive(:deliver_now)

View file

@ -9,6 +9,7 @@ RSpec.describe DomainDeleteForcedEmailJob do
expect(Domain).to receive(:find).and_return(domain) expect(Domain).to receive(:find).and_return(domain)
allow(domain).to receive_messages( allow(domain).to receive_messages(
id: 1, id: 1,
name: 'test.com',
registrar: 'registrar', registrar: 'registrar',
registrant: 'registrant', registrant: 'registrant',
primary_contact_emails: %w(test@test.com test@test.com)) primary_contact_emails: %w(test@test.com test@test.com))
@ -20,7 +21,7 @@ RSpec.describe DomainDeleteForcedEmailJob do
end end
it 'creates log record' do 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(DomainDeleteMailer).to receive(:forced).and_return(message)
allow(message).to receive(:deliver_now) allow(message).to receive(:deliver_now)

View file

@ -10,6 +10,7 @@ RSpec.describe RegistrantChangeConfirmEmailJob do
expect(Registrant).to receive(:find).and_return('new registrant') expect(Registrant).to receive(:find).and_return('new registrant')
allow(domain).to receive_messages( allow(domain).to receive_messages(
id: 1, id: 1,
name: 'test.com',
registrant_email: 'registrant@test.com', registrant_email: 'registrant@test.com',
registrar: 'registrar', registrar: 'registrar',
registrant: 'registrant') registrant: 'registrant')
@ -22,7 +23,7 @@ RSpec.describe RegistrantChangeConfirmEmailJob do
end end
it 'creates log record' do 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(RegistrantChangeMailer).to receive(:confirm).and_return(message)
allow(message).to receive(:deliver_now) allow(message).to receive(:deliver_now)

View file

@ -4,6 +4,7 @@ RSpec.describe RegistrantChangeExpiredEmailJob do
describe '#run' do describe '#run' do
let(:domain) { instance_double(Domain, let(:domain) { instance_double(Domain,
id: 1, id: 1,
name: 'test.com',
new_registrant_email: 'new-registrant@test.com', new_registrant_email: 'new-registrant@test.com',
registrar: 'registrar', registrar: 'registrar',
registrant: 'registrant') registrant: 'registrant')
@ -20,7 +21,7 @@ RSpec.describe RegistrantChangeExpiredEmailJob do
end end
it 'creates log record' do 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(RegistrantChangeMailer).to receive(:expired).and_return(message)
allow(message).to receive(:deliver_now) allow(message).to receive(:deliver_now)

View file

@ -4,6 +4,7 @@ RSpec.describe RegistrantChangeNoticeEmailJob do
describe '#run' do describe '#run' do
let(:domain) { instance_double(Domain, let(:domain) { instance_double(Domain,
id: 1, id: 1,
name: 'test.com',
registrant_email: 'registrant@test.com', registrant_email: 'registrant@test.com',
registrar: 'registrar', registrar: 'registrar',
registrant: 'registrant') registrant: 'registrant')
@ -23,7 +24,7 @@ RSpec.describe RegistrantChangeNoticeEmailJob do
end end
it 'creates log record' do 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(RegistrantChangeMailer).to receive(:notice).and_return(message)
allow(message).to receive(:deliver_now) allow(message).to receive(:deliver_now)