Checks whether there is target email before sending notification

If ActionMailer tries to send a mail without recipient, the smtp will throw an syntax error. This checks whether there is a target and that given target has an email for notification before calling the TaskMailer to deliver the message. Also fixes the tests that crashed because of this new restriction and creates a test to this restriction. (ActionItem2370)

Checks whether there is target email before sending notification
If ActionMailer tries to send a mail without recipient, the smtp will throw an syntax error. This checks whether there is a target and that given target has an email for notification before calling the TaskMailer to deliver the message. Also fixes the tests that crashed because of this new restriction and creates a test to this restriction. (ActionItem2370)
Larissa Reis
1 parent 93103d85
Showing 4 changed files with 27 additions and 7 deletions Show diff stats
app/models/task.rb
test/unit/add_member_test.rb
test/unit/approve_article_test.rb
test/unit/task_test.rb
@@ -4,7 +4,7 @@
 #
 # The specific types of tasks <em>must</em> override the #perform method, so
 # the actual action associated to the type of task can be performed. See the
-# documentation of the #perform method for details. 
+# documentation of the #perform method for details.
 #
 # This class has a +data+ field of type <tt>text</tt>, where you can store any
 # type of data (as serialized Ruby objects) you need for your subclass (which
@@ -64,7 +64,8 @@ class Task &lt; ActiveRecord::Base
       begin
         target_msg = task.target_notification_message
-        TaskMailer.deliver_target_notification(task, target_msg) if target_msg
+        target_emails = task.target && task.target.notification_emails || []
+        TaskMailer.deliver_target_notification(task, target_msg) if target_msg && !target_emails.empty?
       rescue NotImplementedError => ex
         RAILS_DEFAULT_LOGGER.info ex.to_s
       end
@@ -192,7 +193,7 @@ class Task &lt; ActiveRecord::Base
   # The message that will be sent to the *target* of the task when it is
   # created. The indent of this message is to notify the target about the
-  # request that was just created for him/her. 
+  # request that was just created for him/her.
   #
   # The implementation in this class returns +nil+, what makes the notification
   # not to be sent. If you want to send a notification to the target upon task
@@ -225,7 +226,8 @@ class Task &lt; ActiveRecord::Base
     begin
       target_msg = target_notification_message
-      TaskMailer.deliver_target_notification(self, target_msg) if target_msg
+      target_emails = self.target && self.target.notification_emails || []
+      TaskMailer.deliver_target_notification(self, target_msg) if target_msg && !target_emails.empty?
     rescue NotImplementedError => ex
       RAILS_DEFAULT_LOGGER.info ex.to_s
     end
@@ -253,7 +255,7 @@ class Task &lt; ActiveRecord::Base
   # sends notification e-mail about a task, if the task has a requestor.
   #
-  # If 
+  # If
   def send_notification(action)
     if sends_email?
       if self.requestor
@@ -54,6 +54,7 @@ class AddMemberTest &lt; ActiveSupport::TestCase
   should 'send e-mails' do
     community.update_attribute(:closed, true)
+    community.stubs(:notification_emails).returns(["adm@example.com"])
     TaskMailer.expects(:deliver_target_notification).at_least_once
@@ -82,6 +82,7 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
   should 'notify target if group is moderated' do
     community.moderated_articles = true
     community.save
+    community.stubs(:notification_emails).returns(['adm@example.com'])
     a = ApproveArticle.create!(:name => '', :article => article, :target => community, :requestor => profile)
     assert !ActionMailer::Base.deliveries.empty?
@@ -128,7 +128,7 @@ class TaskTest &lt; ActiveSupport::TestCase
     task = Task.new
     task.requestor = sample_user
     task.save!
-    
+
     task.cancel
     assert_nil Task.find_by_code(task.code)
@@ -160,6 +160,9 @@ class TaskTest &lt; ActiveSupport::TestCase
   should 'send notification to target just after task creation' do
     task = Task.new
+    target = Profile.new
+    target.stubs(:notification_emails).returns(['adm@example.com'])
+    task.target = target
     task.stubs(:target_notification_message).returns('some non nil message to be sent to target')
     TaskMailer.expects(:deliver_target_notification).once
     task.save!
@@ -204,7 +207,7 @@ class TaskTest &lt; ActiveSupport::TestCase
       user.destroy
     end
   end
-  
+
   should 'not deliver notification message to target' do
     task = Task.new
     assert_raise NotImplementedError do
@@ -228,6 +231,16 @@ class TaskTest &lt; ActiveSupport::TestCase
     task.save!
   end
+  should 'not notify target if notification emails is empty' do
+    task = Task.new
+    target = Profile.new
+    target.stubs(:notification_emails).returns([])
+    task.target = target
+    task.stubs(:target_notification_message).returns('some non nil message to be sent to target')
+    TaskMailer.expects(:deliver_target_notification).never
+    task.save!
+  end
+
   should 'the environment method be defined' do
     task = Task.new
     assert task.method_exists?('environment')
@@ -266,6 +279,9 @@ class TaskTest &lt; ActiveSupport::TestCase
   should 'send notification message to target just after task activation' do
     task = Task.new(:status => Task::Status::HIDDEN)
+    target = Profile.new
+    target.stubs(:notification_emails).returns(['target@example.com'])
+    task.target = target
     task.save!
     task.stubs(:target_notification_message).returns('some non nil message to be sent to target')
     TaskMailer.expects(:deliver_target_notification).once
	@@ -54,6 +54,7 @@ class AddMemberTest < ActiveSupport::TestCase		@@ -54,6 +54,7 @@ class AddMemberTest < ActiveSupport::TestCase
54		54
55	should 'send e-mails' do	55	should 'send e-mails' do
56	community.update_attribute(:closed, true)	56	community.update_attribute(:closed, true)
		57	+ community.stubs(:notification_emails).returns(["adm@example.com"])
57		58
58	TaskMailer.expects(:deliver_target_notification).at_least_once	59	TaskMailer.expects(:deliver_target_notification).at_least_once
59		60
	@@ -82,6 +82,7 @@ class ApproveArticleTest < ActiveSupport::TestCase		@@ -82,6 +82,7 @@ class ApproveArticleTest < ActiveSupport::TestCase
82	should 'notify target if group is moderated' do	82	should 'notify target if group is moderated' do
83	community.moderated_articles = true	83	community.moderated_articles = true
84	community.save	84	community.save
		85	+ community.stubs(:notification_emails).returns(['adm@example.com'])
85		86
86	a = ApproveArticle.create!(:name => '', :article => article, :target => community, :requestor => profile)	87	a = ApproveArticle.create!(:name => '', :article => article, :target => community, :requestor => profile)
87	assert !ActionMailer::Base.deliveries.empty?	88	assert !ActionMailer::Base.deliveries.empty?