Fixed that reminders are sent for closed issues (#10006).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8690 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
f2a7f83c82
commit
94b621a99f
|
@ -341,7 +341,7 @@ class Mailer < ActionMailer::Base
|
|||
tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
|
||||
user_ids = options[:users]
|
||||
|
||||
scope = Issue.scoped(:conditions => ["#{Issue.table_name}.assigned_to_id IS NOT NULL" +
|
||||
scope = Issue.open.scoped(:conditions => ["#{Issue.table_name}.assigned_to_id IS NOT NULL" +
|
||||
" AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
|
||||
" AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date]
|
||||
)
|
||||
|
|
|
@ -439,6 +439,17 @@ class MailerTest < ActiveSupport::TestCase
|
|||
assert_equal '1 issue(s) due in the next 42 days', mail.subject
|
||||
end
|
||||
|
||||
def test_reminders_should_not_include_closed_issues
|
||||
Issue.generate!(:project_id => 1, :tracker_id => 1, :status_id => 5, :subject => 'Closed issue', :assigned_to_id => 3, :due_date => 5.days.from_now)
|
||||
ActionMailer::Base.deliveries.clear
|
||||
|
||||
Mailer.reminders(:days => 42)
|
||||
assert_equal 1, ActionMailer::Base.deliveries.size
|
||||
mail = ActionMailer::Base.deliveries.last
|
||||
assert mail.bcc.include?('dlopper@somenet.foo')
|
||||
assert !mail.body.include?('Closed issue')
|
||||
end
|
||||
|
||||
def test_reminders_for_users
|
||||
Mailer.reminders(:days => 42, :users => ['5'])
|
||||
assert_equal 0, ActionMailer::Base.deliveries.size # No mail for dlopper
|
||||
|
|
Loading…
Reference in New Issue