Download as
Browse Code »

Commit 521420587c18163c55c790a2f5241489260cea38

Authored by Antonio Terceiro
1 parent 88006cbf
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

Do not send email to template users 

ActionItem2456
Showing 2 changed files with 8 additions and 0 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @5214205
@@ -291,6 +291,7 @@ class User < ActiveRecord::Base @@ -291,6 +291,7 @@ class User < ActiveRecord::Base
291 end 291 end
292 292
293 def deliver_activation_code 293 def deliver_activation_code
  294 + return if person.is_template?
294 User::Mailer.deliver_activation_code(self) unless self.activation_code.blank? 295 User::Mailer.deliver_activation_code(self) unless self.activation_code.blank?
295 end 296 end
296 297
test/unit/user_test.rb
  Diff comments   View file @5214205
@@ -430,6 +430,13 @@ class UserTest < ActiveSupport::TestCase @@ -430,6 +430,13 @@ class UserTest < ActiveSupport::TestCase
430 assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s 430 assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
431 end 431 end
432 432
  433 + should 'not try to deliver email to template users' do
  434 + Person.any_instance.stubs(:is_template?).returns(true)
  435 + assert_no_difference ActionMailer::Base.deliveries, :size do
  436 + new_user
  437 + end
  438 + end
  439 +
433 should 'not mass assign activated at' do 440 should 'not mass assign activated at' do
434 user = User.new :activated_at => 5.days.ago 441 user = User.new :activated_at => 5.days.ago
435 assert_nil user.activated_at 442 assert_nil user.activated_at