Download as
Browse Code »

Commit 75d2e28c2da347ddc48ab04791b36e53dd665373

Authored by Antonio Terceiro
1 parent 6446d98e
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem927: don't use empty string in list of notification e-mails

Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
app/models/organization.rb
  Diff comments   View file @75d2e28
@@ -91,7 +91,7 @@ class Organization < Profile @@ -91,7 +91,7 @@ class Organization < Profile
91 end 91 end
92 92
93 def notification_emails 93 def notification_emails
94 - [contact_email].compact + admins.map(&:email) 94 + [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
95 end 95 end
96 96
97 end 97 end
test/unit/organization_test.rb
  Diff comments   View file @75d2e28
@@ -105,7 +105,7 @@ class OrganizationTest < Test::Unit::TestCase @@ -105,7 +105,7 @@ class OrganizationTest < Test::Unit::TestCase
105 assert_equal ['org@email.com', 'admin1@email.com', 'admin2@email.com'], o.notification_emails 105 assert_equal ['org@email.com', 'admin1@email.com', 'admin2@email.com'], o.notification_emails
106 end 106 end
107 107
108 - should 'list only admins if contact_email is blank' do 108 + should 'list only admins if contact_email is nil' do
109 o = Organization.new(:contact_email => nil) 109 o = Organization.new(:contact_email => nil)
110 admin1 = mock; admin1.stubs(:email).returns('admin1@email.com') 110 admin1 = mock; admin1.stubs(:email).returns('admin1@email.com')
111 admin2 = mock; admin2.stubs(:email).returns('admin2@email.com') 111 admin2 = mock; admin2.stubs(:email).returns('admin2@email.com')
@@ -114,6 +114,16 @@ class OrganizationTest < Test::Unit::TestCase @@ -114,6 +114,16 @@ class OrganizationTest < Test::Unit::TestCase
114 assert_equal ['admin1@email.com', 'admin2@email.com'], o.notification_emails 114 assert_equal ['admin1@email.com', 'admin2@email.com'], o.notification_emails
115 end 115 end
116 116
  117 + should 'list only admins if contact_email is a blank string' do
  118 + o = Organization.new(:contact_email => '')
  119 + admin1 = mock; admin1.stubs(:email).returns('admin1@email.com')
  120 + admin2 = mock; admin2.stubs(:email).returns('admin2@email.com')
  121 + o.stubs(:admins).returns([admin1, admin2])
  122 +
  123 + assert_equal ['admin1@email.com', 'admin2@email.com'], o.notification_emails
  124 + end
  125 +
  126 +
117 should 'list pending enterprise validations' do 127 should 'list pending enterprise validations' do
118 org = Organization.new 128 org = Organization.new
119 assert_kind_of Array, org.pending_validations 129 assert_kind_of Array, org.pending_validations