Merge branch '107821878-emails' into staging

app/models/contact.rb

@@ -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).deliver
+      ContactMailer.email_updated(e, id, deliver_emails).deliver
     end
   end
 

app/models/domain.rb

@@ -241,7 +241,7 @@ class Domain < ActiveRecord::Base
           DomainMailer.pending_update_expired_notification_for_new_registrant(id).deliver
         end
         if domain.pending_delete? || domain.pending_delete_confirmation?
-          DomainMailer.pending_delete_expired_notification(id).deliver
+          DomainMailer.pending_delete_expired_notification(id, deliver_emails).deliver
         end
         domain.clean_pendings!
         unless Rails.env.test?
@@ -449,8 +449,8 @@ class Domain < ActiveRecord::Base
     new_registrant_email = registrant.email
     new_registrant_name  = registrant.name
 
-    DomainMailer.pending_update_request_for_old_registrant(id).deliver
-    DomainMailer.pending_update_notification_for_new_registrant(id).deliver
+    DomainMailer.pending_update_request_for_old_registrant(id, deliver_emails).deliver
+    DomainMailer.pending_update_notification_for_new_registrant(id, deliver_emails).deliver
 
     reload # revert back to original
 
@@ -510,7 +510,7 @@ class Domain < ActiveRecord::Base
     pending_delete_confirmation!
     save(validate: false) # should check if this did succeed
 
-    DomainMailer.pending_deleted(id).deliver
+    DomainMailer.pending_deleted(id, deliver_emails).deliver
   end
 
   def cancel_pending_delete
@@ -646,7 +646,7 @@ class Domain < ActiveRecord::Base
       registrar.messages.create!(
         body: I18n.t('force_delete_set_on_domain', domain: name)
       )
-      DomainMailer.force_delete(id).deliver
+      DomainMailer.force_delete(id, deliver_emails).deliver
       return true
     end
     false

app/models/epp/domain.rb

@@ -500,7 +500,7 @@ class Epp::Domain < Domain
   # rubocop: enable Metrics/CyclomaticComplexity
 
   def apply_pending_update!
-    old_registrant_email = DomainMailer.registrant_updated_notification_for_old_registrant(id)
+    old_registrant_email = DomainMailer.registrant_updated_notification_for_old_registrant(id, deliver_emails)
     preclean_pendings
     user  = ApiUser.find(pending_json['current_user_id'])
     frame = Nokogiri::XML(pending_json['frame'])
@@ -510,7 +510,7 @@ class Epp::Domain < Domain
     return unless update(frame, user, false)
     clean_pendings!
     self.deliver_emails = true # turn on email delivery
-    DomainMailer.registrant_updated_notification_for_new_registrant(id).deliver
+    DomainMailer.registrant_updated_notification_for_new_registrant(id, deliver_emails).deliver
     old_registrant_email.deliver
     true
   end
@@ -519,9 +519,10 @@ class Epp::Domain < Domain
     preclean_pendings
     statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
     statuses.delete(DomainStatus::PENDING_DELETE)
-    DomainMailer.delete_confirmation(id).deliver
-    clean_pendings!
-    set_pending_delete!
+    DomainMailer.delete_confirmation(id, deliver_emails).deliver
+
+    # TODO: confirm that this actually makes sense
+    clean_pendings! if valid? && set_pending_delete!
     true
   end