Download as
Browse Code »

Commit d2fad26e997dccf430f185237ec39d1580b43d3c

Authored by Victor Costa
1 parent e40daaa0
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Send activation code with delayed job

Showing 2 changed files with 5 additions and 1 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @d2fad26
... ... @@ -372,7 +372,7 @@ class User < ActiveRecord::Base
372 372  
373 373 def deliver_activation_code
374 374 return if person.is_template?
375   - UserMailer.activation_code(self).deliver unless self.activation_code.blank?
  375 + Delayed::Job.enqueue(UserMailer::Job.new(self, :activation_code)) unless self.activation_code.blank?
376 376 end
377 377  
378 378 def delay_activation_check
... ...
test/unit/user_test.rb
  Diff comments   View file @d2fad26
... ... @@ -501,6 +501,7 @@ class UserTest < ActiveSupport::TestCase
501 501 should 'deliver e-mail with activation code after creation' do
502 502 assert_difference 'ActionMailer::Base.deliveries.size', 1 do
503 503 new_user :email => 'pending@activation.com'
  504 + process_delayed_job_queue
504 505 end
505 506 assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
506 507 end
... ... @@ -629,6 +630,7 @@ class UserTest < ActiveSupport::TestCase
629 630 env.save
630 631  
631 632 user = new_user :email => 'pending@activation.com'
  633 + process_delayed_job_queue
632 634 assert_difference 'ActionMailer::Base.deliveries.size', 1 do
633 635 user.activate
634 636 process_delayed_job_queue
... ... @@ -649,6 +651,7 @@ class UserTest < ActiveSupport::TestCase
649 651 env.save
650 652  
651 653 user = new_user :email => 'pending@activation.com'
  654 + process_delayed_job_queue
652 655 assert_difference 'ActionMailer::Base.deliveries.size', 1 do
653 656 user.activate
654 657 process_delayed_job_queue
... ... @@ -668,6 +671,7 @@ class UserTest < ActiveSupport::TestCase
668 671 env.save
669 672  
670 673 user = new_user :name => 'John Doe', :email => 'pending@activation.com'
  674 + process_delayed_job_queue
671 675 assert_difference 'ActionMailer::Base.deliveries.size', 1 do
672 676 user.activate
673 677 process_delayed_job_queue
... ...