| @@ -341,7 +341,7 class Mailer < ActionMailer::Base | |||||
| 341 | tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil |
|
341 | tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil | |
| 342 | user_ids = options[:users] |
|
342 | user_ids = options[:users] | |
| 343 |
|
343 | |||
| 344 | scope = Issue.scoped(:conditions => ["#{Issue.table_name}.assigned_to_id IS NOT NULL" + |
|
344 | scope = Issue.open.scoped(:conditions => ["#{Issue.table_name}.assigned_to_id IS NOT NULL" + | |
| 345 | " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" + |
|
345 | " AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" + | |
| 346 | " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date] |
|
346 | " AND #{Issue.table_name}.due_date <= ?", days.day.from_now.to_date] | |
| 347 | ) |
|
347 | ) | |
| @@ -439,6 +439,17 class MailerTest < ActiveSupport::TestCase | |||||
| 439 | assert_equal '1 issue(s) due in the next 42 days', mail.subject |
|
439 | assert_equal '1 issue(s) due in the next 42 days', mail.subject | |
| 440 | end |
|
440 | end | |
| 441 |
|
441 | |||
|
|
442 | def test_reminders_should_not_include_closed_issues | |||
|
|
443 | Issue.generate!(:project_id => 1, :tracker_id => 1, :status_id => 5, :subject => 'Closed issue', :assigned_to_id => 3, :due_date => 5.days.from_now) | |||
|
|
444 | ActionMailer::Base.deliveries.clear | |||
|
|
445 | ||||
|
|
446 | Mailer.reminders(:days => 42) | |||
|
|
447 | assert_equal 1, ActionMailer::Base.deliveries.size | |||
|
|
448 | mail = ActionMailer::Base.deliveries.last | |||
|
|
449 | assert mail.bcc.include?('dlopper@somenet.foo') | |||
|
|
450 | assert !mail.body.include?('Closed issue') | |||
|
|
451 | end | |||
|
|
452 | ||||
| 442 | def test_reminders_for_users |
|
453 | def test_reminders_for_users | |
| 443 | Mailer.reminders(:days => 42, :users => ['5']) |
|
454 | Mailer.reminders(:days => 42, :users => ['5']) | |
| 444 | assert_equal 0, ActionMailer::Base.deliveries.size # No mail for dlopper |
|
455 | assert_equal 0, ActionMailer::Base.deliveries.size # No mail for dlopper | |
General Comments 0
You need to be logged in to leave comments.
Login now