Merge branch 'stable'

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