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

Story#107821878 - manage old registrar

Browse source
This commit is contained in:
Vladimir Krylov 2015-11-30 13:12:51 +02:00
parent af023edf3a
commit f9b2d2a202
3 changed files with 5 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 class DomainMailer < ApplicationMailer
include Que::Mailer 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) @domain = Domain.find_by(id: domain_id)
@old_registrant = Registrant.find(old_registrant_id)
return unless @domain return unless @domain
return if delivery_off?(@domain, should_deliver) return if delivery_off?(@domain, should_deliver)
@ -16,8 +17,6 @@ class DomainMailer < ApplicationMailer
return return
end end
@old_registrant = Registrant.find(@domain.registrant_id_was)
confirm_path = "#{ENV['registrant_url']}/registrant/domain_update_confirms" confirm_path = "#{ENV['registrant_url']}/registrant/domain_update_confirms"
@verification_url = "#{confirm_path}/#{@domain.id}?token=#{@domain.registrant_verification_token}" @verification_url = "#{confirm_path}/#{@domain.id}?token=#{@domain.registrant_verification_token}"

2
app/models/domain.rb
View file

@ -428,7 +428,7 @@ class Domain < ActiveRecord::Base
new_registrant_email = registrant.email new_registrant_email = registrant.email
new_registrant_name = registrant.name new_registrant_name = registrant.name
DomainMailer.pending_update_request_for_old_registrant(id, deliver_emails).deliver DomainMailer.pending_update_request_for_old_registrant(id, registrant_id_was, deliver_emails).deliver
DomainMailer.pending_update_notification_for_new_registrant(id, deliver_emails).deliver DomainMailer.pending_update_notification_for_new_registrant(id, deliver_emails).deliver
reload # revert back to original reload # revert back to original

4
spec/mailers/domain_mailer_spec.rb
View file

@ -9,7 +9,7 @@ describe DomainMailer do
before :all do before :all do
@registrant = Fabricate(:registrant, email: 'test@example.com') @registrant = Fabricate(:registrant, email: 'test@example.com')
@domain = Fabricate(:domain, registrant: @registrant) @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 end
it 'should not render email subject' do it 'should not render email subject' do
@ -38,7 +38,7 @@ describe DomainMailer do
@domain.registrant_verification_token = '123' @domain.registrant_verification_token = '123'
@domain.registrant_verification_asked_at = Time.zone.now @domain.registrant_verification_asked_at = Time.zone.now
@domain.registrant = @new_registrant @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 end
it 'should render email subject' do it 'should render email subject' do