107821878-que_mailer

This commit is contained in:
Stas 2015-11-17 16:56:53 +02:00
parent 2dddace1b8
commit 90ad9ff887
3 changed files with 5 additions and 6 deletions

View file

@ -1,8 +1,7 @@
class ContactMailer < ApplicationMailer
include Que::Mailer
def email_updated(email_id, contact_id)
email = Email.find_by(id: email_id)
def email_updated(email, contact_id)
@contact = Contact.find_by(id: contact_id)
return unless email || @contact
return if delivery_off?(contact)

View file

@ -50,7 +50,7 @@ class Contact < ActiveRecord::Base
emails << domains.map(&:registrant_email) if domains.present?
emails = emails.flatten.uniq
emails.each do |e|
ContactMailer.email_updated(e.id, id).deliver
ContactMailer.email_updated(e, id).deliver
end
end

View file

@ -8,7 +8,7 @@ describe ContactMailer do
describe 'email changed notification when delivery turned off' do
before :all do
@contact = Fabricate(:contact, email: 'test@example.ee')
@mail = ContactMailer.email_updated('test@example.com', @contact)
@mail = ContactMailer.email_updated('test@example.com', @contact.id)
end
it 'should not render email subject' do
@ -34,7 +34,7 @@ describe ContactMailer do
@contact = @domain.registrant
@contact.reload # until figured out why registrant_domains not loaded
@contact.deliver_emails = true
@mail = ContactMailer.email_updated('info@example.org', @contact)
@mail = ContactMailer.email_updated('info@example.org', @contact.id)
end
it 'should render email subject' do
@ -60,7 +60,7 @@ describe ContactMailer do
@contact = @domain.registrant
@contact.reload # until figured out why registrant_domains not loaded
@contact.deliver_emails = true
@mail = ContactMailer.email_updated('info@ääöü.org', @contact)
@mail = ContactMailer.email_updated('info@ääöü.org', @contact.id)
end
it 'should render email subject' do