Download as
Browse Code »

Commit 75d2e28c2da347ddc48ab04791b36e53dd665373

Authored by Antonio Terceiro
1 parent 6446d98e
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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 91 end
92 92  
93 93 def notification_emails
94   - [contact_email].compact + admins.map(&:email)
  94 + [contact_email.blank? ? nil : contact_email].compact + admins.map(&:email)
95 95 end
96 96  
97 97 end
... ...
test/unit/organization_test.rb
  Diff comments   View file @75d2e28
... ... @@ -105,7 +105,7 @@ class OrganizationTest < Test::Unit::TestCase
105 105 assert_equal ['org@email.com', 'admin1@email.com', 'admin2@email.com'], o.notification_emails
106 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 109 o = Organization.new(:contact_email => nil)
110 110 admin1 = mock; admin1.stubs(:email).returns('admin1@email.com')
111 111 admin2 = mock; admin2.stubs(:email).returns('admin2@email.com')
... ... @@ -114,6 +114,16 @@ class OrganizationTest < Test::Unit::TestCase
114 114 assert_equal ['admin1@email.com', 'admin2@email.com'], o.notification_emails
115 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 127 should 'list pending enterprise validations' do
118 128 org = Organization.new
119 129 assert_kind_of Array, org.pending_validations
... ...