diff test/unit/journal_observer_test.rb @ 523:0b6c82dead28 luisf

Merge from branch "cannam"

--- a/test/unit/journal_observer_test.rb	Mon Mar 28 18:17:06 2011 +0100
+++ b/test/unit/journal_observer_test.rb	Mon Jul 25 14:23:37 2011 +0100
@@ -1,21 +1,21 @@
-# redMine - project management software
-# Copyright (C) 2006-2009  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class JournalObserverTest < ActiveSupport::TestCase
   fixtures :issues, :issue_statuses, :journals, :journal_details
@@ -36,6 +36,17 @@
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
 
+  def test_create_should_not_send_email_notification_with_notify_set_to_false
+    Setting.notified_events = ['issue_updated']
+    issue = Issue.find(:first)
+    user = User.find(:first)
+    journal = issue.init_journal(user, issue)
+    journal.notify = false
+
+    assert journal.save
+    assert_equal 0, ActionMailer::Base.deliveries.size
+  end
+
   def test_create_should_not_send_email_notification_without_issue_updated
     Setting.notified_events = []
     issue = Issue.find(:first)
@@ -64,7 +75,7 @@
     user = User.find(:first)
     journal = issue.init_journal(user, issue)
     journal.notes = 'This update has a note'
-    
+
     assert journal.save
     assert_equal 0, ActionMailer::Base.deliveries.size
   end
@@ -87,7 +98,7 @@
     user = User.find(:first)
     issue.init_journal(user, issue)
     issue.status = IssueStatus.last
-    
+
     assert issue.save
     assert_equal 0, ActionMailer::Base.deliveries.size
   end
@@ -110,9 +121,8 @@
     user = User.find(:first)
     issue.init_journal(user, issue)
     issue.priority = IssuePriority.last
-    
+
     assert issue.save
     assert_equal 0, ActionMailer::Base.deliveries.size
   end
-
 end