Download as
Browse Code »

Commit fe9d073ff274d57c4eec66c894250c1bd284a125

Authored by Daniela Feitosa
2 parents dd08c013 d3fc2e6b
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

Merge commit 'refs/merge-requests/205' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/205
Showing 2 changed files with 29 additions and 8 deletions   Show diff stats
app/models/mailing.rb
  Diff comments   View file @fe9d073
@@ -9,7 +9,11 @@ class Mailing < ActiveRecord::Base @@ -9,7 +9,11 @@ class Mailing < ActiveRecord::Base
9 xss_terminate :only => [ :subject, :body ], :with => 'white_list', :on => 'validation' 9 xss_terminate :only => [ :subject, :body ], :with => 'white_list', :on => 'validation'
10 10
11 after_create do |mailing| 11 after_create do |mailing|
12 - Delayed::Job.enqueue MailingJob.new(mailing.id) 12 + mailing.schedule
  13 + end
  14 +
  15 + def schedule
  16 + Delayed::Job.enqueue MailingJob.new(self.id)
13 end 17 end
14 18
15 def generate_from 19 def generate_from
@@ -30,8 +34,14 @@ class Mailing < ActiveRecord::Base @@ -30,8 +34,14 @@ class Mailing < ActiveRecord::Base
30 34
31 def deliver 35 def deliver
32 each_recipient do |recipient| 36 each_recipient do |recipient|
33 - Mailing::Sender.deliver_mail(self, recipient.email)  
34 - self.mailing_sents.create(:person => recipient) 37 + begin
  38 + Mailing::Sender.deliver_mail(self, recipient.email)
  39 + self.mailing_sents.create(:person => recipient)
  40 + rescue Exception
  41 + # FIXME should not discard errors silently. An idea is to collect all
  42 + # errors and generate a task (notification) for the +source+
  43 + # (environment/organization) listing these errors.
  44 + end
35 end 45 end
36 end 46 end
37 47
test/unit/mailing_test.rb
  Diff comments   View file @fe9d073
@@ -93,10 +93,21 @@ class MailingTest < ActiveSupport::TestCase @@ -93,10 +93,21 @@ class MailingTest < ActiveSupport::TestCase
93 assert_equal '', mailing.url 93 assert_equal '', mailing.url
94 end 94 end
95 95
96 - should 'deliver mailing to each recipient after create' do  
97 - person = Person['user_one']  
98 - mailing = Mailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :person => person)  
99 - process_delayed_job_queue  
100 - assert_equal [], ActionMailer::Base.deliveries 96 + should 'process the entire batch even if individual emails crash' do
  97 + mailing = Mailing.new(:source => environment, :person => Person['user_one'], :body => 'test', :subject => 'test')
  98 + def mailing.each_recipient
  99 + user_one = Person['user_one']
  100 + user_two = Person['user_two']
  101 + user_one.stubs(:email).raises(RuntimeError.new)
  102 + [user_one, user_two].each do |p|
  103 + yield p
  104 + end
  105 + end
  106 + mailing.stubs(:schedule)
  107 + mailing.save!
  108 + mailing.deliver
  109 +
  110 + assert_equal 1, ActionMailer::Base.deliveries.size
101 end 111 end
  112 +
102 end 113 end