From faeba294e907bb66a0b7774dabbbe6ce0eff81f5 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 25 Sep 2014 21:58:34 -0300 Subject: [PATCH] Environment: use contact_email for notifications --- app/models/environment.rb | 2 +- test/unit/environment_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/environment.rb b/app/models/environment.rb index 861a932..5653263 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -804,7 +804,7 @@ class Environment < ActiveRecord::Base end def notification_emails - [noreply_email.blank? ? nil : noreply_email].compact + admins.map(&:email) + [contact_email].select(&:present?) + admins.map(&:email) end after_create :create_templates diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb index ee63009..23eae6f 100644 --- a/test/unit/environment_test.rb +++ b/test/unit/environment_test.rb @@ -195,6 +195,12 @@ class EnvironmentTest < ActiveSupport::TestCase assert !env.errors[:contact_email.to_s].present? end + should 'notify contact email' do + env = Environment.new(:contact_email => 'foo@bar.com') + env.stubs(:admins).returns([]) + assert_equal ['foo@bar.com'], env.notification_emails + end + should 'provide a default hostname' do env = fast_create(Environment) env.domains << create(Domain, :name => 'example.com', :is_default => true) -- libgit2 0.21.2