From 75d2e28c2da347ddc48ab04791b36e53dd665373 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 9 Mar 2009 19:15:35 -0300 Subject: [PATCH] ActionItem927: don't use empty string in list of notification e-mails --- app/models/organization.rb | 2 +- test/unit/organization_test.rb | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/models/organization.rb b/app/models/organization.rb index 5170439..f160b0a 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -91,7 +91,7 @@ class Organization < Profile end def notification_emails - [contact_email].compact + admins.map(&:email) + [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email) end end diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb index b3a6e9c..d5a6ece 100644 --- a/test/unit/organization_test.rb +++ b/test/unit/organization_test.rb @@ -105,7 +105,7 @@ class OrganizationTest < Test::Unit::TestCase assert_equal ['org@email.com', 'admin1@email.com', 'admin2@email.com'], o.notification_emails end - should 'list only admins if contact_email is blank' do + should 'list only admins if contact_email is nil' do o = Organization.new(:contact_email => nil) admin1 = mock; admin1.stubs(:email).returns('admin1@email.com') admin2 = mock; admin2.stubs(:email).returns('admin2@email.com') @@ -114,6 +114,16 @@ class OrganizationTest < Test::Unit::TestCase assert_equal ['admin1@email.com', 'admin2@email.com'], o.notification_emails end + should 'list only admins if contact_email is a blank string' do + o = Organization.new(:contact_email => '') + admin1 = mock; admin1.stubs(:email).returns('admin1@email.com') + admin2 = mock; admin2.stubs(:email).returns('admin2@email.com') + o.stubs(:admins).returns([admin1, admin2]) + + assert_equal ['admin1@email.com', 'admin2@email.com'], o.notification_emails + end + + should 'list pending enterprise validations' do org = Organization.new assert_kind_of Array, org.pending_validations -- libgit2 0.21.2