Merged r11839 from trunk (#14020).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11997 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-07-11 18:33:07 +00:00
parent 7375dff6d6
commit 3d9f274140
8 changed files with 25 additions and 12 deletions
+3 -3
View File
@@ -215,14 +215,14 @@ class MailerTest < ActiveSupport::TestCase
# Remove members except news author
news.project.memberships.each {|m| m.destroy unless m.user == user}
user.pref[:no_self_notified] = false
user.pref.no_self_notified = false
user.pref.save
User.current = user
Mailer.news_added(news.reload).deliver
assert_equal 1, last_email.bcc.size
# nobody to notify
user.pref[:no_self_notified] = true
user.pref.no_self_notified = true
user.pref.save
User.current = user
ActionMailer::Base.deliveries.clear
@@ -296,7 +296,7 @@ class MailerTest < ActiveSupport::TestCase
issue = Issue.find(1)
user = User.find(9)
# minimal email notification options
user.pref[:no_self_notified] = '1'
user.pref.no_self_notified = '1'
user.pref.save
user.mail_notification = false
user.save