Download as
Browse Code »

Commit 521420587c18163c55c790a2f5241489260cea38

Authored by Antonio Terceiro
1 parent 88006cbf
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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