Download as
Browse Code »

Commit 7af9fa59a99bdc295bdc95029decdcb12e44104f

Authored by Daniela Feitosa
1 parent ae3e67e3
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

Revert "Revert "Do not send email to template users"" 

This reverts commit b8920a1e95ef9e9d54527de691fbeb1b1921a27f.

Conflicts:

	app/models/user.rb
Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @7af9fa5
@@ -328,7 +328,7 @@ class User < ActiveRecord::Base @@ -328,7 +328,7 @@ class User < ActiveRecord::Base
328 end 328 end
329 329
330 def deliver_activation_code 330 def deliver_activation_code
331 - return if person.identifier =~ /person_template/ 331 + return if person.is_template?
332 User::Mailer.deliver_activation_code(self) unless self.activation_code.blank? 332 User::Mailer.deliver_activation_code(self) unless self.activation_code.blank?
333 end 333 end
334 334
test/unit/user_test.rb
  Diff comments   View file @7af9fa5
@@ -447,6 +447,13 @@ class UserTest < ActiveSupport::TestCase @@ -447,6 +447,13 @@ class UserTest < ActiveSupport::TestCase
447 assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s 447 assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
448 end 448 end
449 449
  450 + should 'not try to deliver email to template users' do
  451 + Person.any_instance.stubs(:is_template?).returns(true)
  452 + assert_no_difference ActionMailer::Base.deliveries, :size do
  453 + new_user
  454 + end
  455 + end
  456 +
450 should 'not mass assign activated at' do 457 should 'not mass assign activated at' do
451 user = User.new :activated_at => 5.days.ago 458 user = User.new :activated_at => 5.days.ago
452 assert_nil user.activated_at 459 assert_nil user.activated_at