From 99eeeae89f20b81d523b07bf607123886319190a Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 14 May 2015 15:32:27 +0300
Subject: [PATCH] Updated domain registrant updater mailer spec

---
 app/mailers/domain_mailer.rb       | 10 +++++-----
 app/models/domain.rb               |  1 +
 spec/mailers/domain_mailer_spec.rb |  1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/mailers/domain_mailer.rb b/app/mailers/domain_mailer.rb
index 395537d8f..41a48ade7 100644
--- a/app/mailers/domain_mailer.rb
+++ b/app/mailers/domain_mailer.rb
@@ -1,17 +1,17 @@
 class DomainMailer < ApplicationMailer
   def registrant_updated(domain)
-    return if Rails.env.production? ? false : !TEST_EMAILS.include?(domain.registrant_email)
+    @domain = domain
+    return if Rails.env.production? ? false : !TEST_EMAILS.include?(@domain.registrant_email)
     # turn on delivery on specific request only, thus rake tasks does not deliver anything
-    return if domain.deliver_emails != true
-    if domain.registrant_verification_token.blank?
+    return if @domain.deliver_emails != true
+    if @domain.registrant_verification_token.blank?
       logger.warn "EMAIL DID NOT DELIVERED: registrant_verification_token is missing for #{@domain.name}"
       return 
     end
 
-    @old_registrant = Registrant.find(domain.registrant_id_was)
+    @old_registrant = Registrant.find(@domain.registrant_id_was)
     @verification_url = "#{ENV['registrant_url']}/etc/"
 
-    @domain = domain
     mail(to: @old_registrant.email, 
          subject: "#{I18n.t(:domain_registrant_update_subject, name: @domain.name)} [#{@domain.name}]")
   end
diff --git a/app/models/domain.rb b/app/models/domain.rb
index f1af1213f..181ec9cee 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -63,6 +63,7 @@ class Domain < ActiveRecord::Base
       domain_statuses.build(value: DomainStatus::PENDING_UPDATE) 
       DomainMailer.registrant_updated(self).deliver_now
     end
+    true
   end
 
   before_save :touch_always_version
diff --git a/spec/mailers/domain_mailer_spec.rb b/spec/mailers/domain_mailer_spec.rb
index ac83b0732..062314f85 100644
--- a/spec/mailers/domain_mailer_spec.rb
+++ b/spec/mailers/domain_mailer_spec.rb
@@ -31,6 +31,7 @@ describe DomainMailer do
       @new_registrant = Fabricate(:registrant, email: 'test@example.org')
       @domain = Fabricate(:domain, registrant: @registrant)
       @domain.deliver_emails = true
+      @domain.registrant_verification_token = '123'
       @domain.registrant = @new_registrant
       @mail = DomainMailer.registrant_updated(@domain)
     end