diff options
| -rw-r--r-- | app/models/journal_observer.rb | 7 | ||||
| -rw-r--r-- | lib/redmine/notifiable.rb | 3 | ||||
| -rw-r--r-- | test/unit/journal_observer_test.rb | 118 | ||||
| -rw-r--r-- | test/unit/lib/redmine/notifiable_test.rb | 4 | ||||
| -rw-r--r-- | test/unit/mail_handler_test.rb | 1 | ||||
| -rw-r--r-- | test/unit/repository_test.rb | 1 |
6 files changed, 131 insertions, 3 deletions
diff --git a/app/models/journal_observer.rb b/app/models/journal_observer.rb index 5604e064e..db7115cdb 100644 --- a/app/models/journal_observer.rb +++ b/app/models/journal_observer.rb @@ -17,6 +17,11 @@ class JournalObserver < ActiveRecord::Observer def after_create(journal) - Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated') + if Setting.notified_events.include?('issue_updated') || + (Setting.notified_events.include?('issue_note_added') && journal.notes.present?) || + (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) || + (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?) + Mailer.deliver_issue_edit(journal) + end end end diff --git a/lib/redmine/notifiable.rb b/lib/redmine/notifiable.rb index fa192ab25..84f3ccd6c 100644 --- a/lib/redmine/notifiable.rb +++ b/lib/redmine/notifiable.rb @@ -3,6 +3,9 @@ module Redmine CoreNotifications = [ 'issue_added', 'issue_updated', + 'issue_note_added', + 'issue_status_updated', + 'issue_priority_updated', 'news_added', 'document_added', 'file_added', diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb new file mode 100644 index 000000000..1b1c1cc3f --- /dev/null +++ b/test/unit/journal_observer_test.rb @@ -0,0 +1,118 @@ +# redMine - project management software +# Copyright (C) 2006-2009 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' + +class JournalObserverTest < ActiveSupport::TestCase + fixtures :issues, :issue_statuses, :journals, :journal_details + + def setup + ActionMailer::Base.deliveries.clear + @journal = Journal.find 1 + end + + # context: issue_updated notified_events + def test_create_should_send_email_notification_with_issue_updated + Setting.notified_events = ['issue_updated'] + issue = Issue.find(:first) + user = User.find(:first) + journal = issue.init_journal(user, issue) + + assert journal.save + assert_equal 1, ActionMailer::Base.deliveries.size + end + + def test_create_should_not_send_email_notification_without_issue_updated + Setting.notified_events = [] + issue = Issue.find(:first) + user = User.find(:first) + journal = issue.init_journal(user, issue) + + assert journal.save + assert_equal 0, ActionMailer::Base.deliveries.size + end + + # context: issue_note_added notified_events + def test_create_should_send_email_notification_with_issue_note_added + Setting.notified_events = ['issue_note_added'] + issue = Issue.find(:first) + user = User.find(:first) + journal = issue.init_journal(user, issue) + journal.notes = 'This update has a note' + + assert journal.save + assert_equal 1, ActionMailer::Base.deliveries.size + end + + def test_create_should_not_send_email_notification_without_issue_note_added + Setting.notified_events = [] + issue = Issue.find(:first) + 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 + + # context: issue_status_updated notified_events + def test_create_should_send_email_notification_with_issue_status_updated + Setting.notified_events = ['issue_status_updated'] + issue = Issue.find(:first) + user = User.find(:first) + issue.init_journal(user, issue) + issue.status = IssueStatus.last + + assert issue.save + assert_equal 1, ActionMailer::Base.deliveries.size + end + + def test_create_should_not_send_email_notification_without_issue_status_updated + Setting.notified_events = [] + issue = Issue.find(:first) + user = User.find(:first) + issue.init_journal(user, issue) + issue.status = IssueStatus.last + + assert issue.save + assert_equal 0, ActionMailer::Base.deliveries.size + end + + # context: issue_priority_updated notified_events + def test_create_should_send_email_notification_with_issue_priority_updated + Setting.notified_events = ['issue_priority_updated'] + issue = Issue.find(:first) + user = User.find(:first) + issue.init_journal(user, issue) + issue.priority = IssuePriority.last + + assert issue.save + assert_equal 1, ActionMailer::Base.deliveries.size + end + + def test_create_should_not_send_email_notification_without_issue_priority_updated + Setting.notified_events = [] + issue = Issue.find(:first) + 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 diff --git a/test/unit/lib/redmine/notifiable_test.rb b/test/unit/lib/redmine/notifiable_test.rb index e0f16b462..acfe6be5f 100644 --- a/test/unit/lib/redmine/notifiable_test.rb +++ b/test/unit/lib/redmine/notifiable_test.rb @@ -22,10 +22,10 @@ class Redmine::NotifiableTest < ActiveSupport::TestCase end def test_included_core_notifications - assert_equal 8, Redmine::Notifiable::CoreNotifications.length + assert_equal 11, Redmine::Notifiable::CoreNotifications.length Redmine::Notifiable::CoreNotifications.length - %w(issue_added issue_updated news_added document_added file_added message_posted wiki_content_added wiki_content_updated).each do |notifiable| + %w(issue_added issue_updated issue_note_added issue_status_updated issue_priority_updated news_added document_added file_added message_posted wiki_content_added wiki_content_updated).each do |notifiable| assert Redmine::Notifiable::CoreNotifications.include?(notifiable), "missing #{notifiable}" end end diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index ab366f1e0..9af7affb4 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -240,6 +240,7 @@ class MailHandlerTest < ActiveSupport::TestCase end def test_add_issue_should_send_email_notification + Setting.notified_events = ['issue_added'] ActionMailer::Base.deliveries.clear # This email contains: 'Project: onlinestore' issue = submit_email('ticket_on_given_project.eml') diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index 6512c067a..5299dc9d9 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -67,6 +67,7 @@ class RepositoryTest < ActiveSupport::TestCase def test_scan_changesets_for_issue_ids Setting.default_language = 'en' + Setting.notified_events = ['issue_added','issue_updated'] # choosing a status to apply to fix issues Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id |