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

Merge branch '107821878-emails' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2015-11-30 13:16:56 +02:00
commit 58db716af7
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/mailers/domain_mailer.rb
View file

@ -1,8 +1,9 @@
class DomainMailer < ApplicationMailer
include Que::Mailer
def pending_update_request_for_old_registrant(domain_id, should_deliver)
def pending_update_request_for_old_registrant(domain_id, old_registrant_id, should_deliver)
@domain = Domain.find_by(id: domain_id)
@old_registrant = Registrant.find(old_registrant_id)
return unless @domain
return if delivery_off?(@domain, should_deliver)
@ -16,8 +17,6 @@ class DomainMailer < ApplicationMailer
return
end
@old_registrant = Registrant.find(@domain.registrant_id_was)
confirm_path = "#{ENV['registrant_url']}/registrant/domain_update_confirms"
@verification_url = "#{confirm_path}/#{@domain.id}?token=#{@domain.registrant_verification_token}"

3
app/models/domain.rb
View file

@ -438,6 +438,7 @@ class Domain < ActiveRecord::Base
end
def pending_update!
old_registrar_id = registrar_id
return true if pending_update?
self.epp_pending_update = true # for epp
@ -449,7 +450,7 @@ class Domain < ActiveRecord::Base
new_registrant_email = registrant.email
new_registrant_name = registrant.name
DomainMailer.pending_update_request_for_old_registrant(id, deliver_emails).deliver
DomainMailer.pending_update_request_for_old_registrant(id, old_registrar_id, deliver_emails).deliver
DomainMailer.pending_update_notification_for_new_registrant(id, deliver_emails).deliver
reload # revert back to original

4
spec/mailers/domain_mailer_spec.rb
View file

@ -9,7 +9,7 @@ describe DomainMailer do
before :all do
@registrant = Fabricate(:registrant, email: 'test@example.com')
@domain = Fabricate(:domain, registrant: @registrant)
@mail = DomainMailer.pending_update_request_for_old_registrant(@domain.id, deliver_emails)
@mail = DomainMailer.pending_update_request_for_old_registrant(@domain.id, @registrant.id,deliver_emails)
end
it 'should not render email subject' do
@ -38,7 +38,7 @@ describe DomainMailer do
@domain.registrant_verification_token = '123'
@domain.registrant_verification_asked_at = Time.zone.now
@domain.registrant = @new_registrant
@mail = DomainMailer.pending_update_request_for_old_registrant(@domain.id, deliver_emails)
@mail = DomainMailer.pending_update_request_for_old_registrant(@domain.id, @registrant.id, deliver_emails)
end
it 'should render email subject' do