From d2fad26e997dccf430f185237ec39d1580b43d3c Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Mon, 13 Jul 2015 12:41:00 -0300 Subject: [PATCH] Send activation code with delayed job --- app/models/user.rb | 2 +- test/unit/user_test.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 4b28f12..2d55381 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -372,7 +372,7 @@ class User < ActiveRecord::Base def deliver_activation_code return if person.is_template? - UserMailer.activation_code(self).deliver unless self.activation_code.blank? + Delayed::Job.enqueue(UserMailer::Job.new(self, :activation_code)) unless self.activation_code.blank? end def delay_activation_check diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 4551feb..ad9bd14 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -501,6 +501,7 @@ class UserTest < ActiveSupport::TestCase should 'deliver e-mail with activation code after creation' do assert_difference 'ActionMailer::Base.deliveries.size', 1 do new_user :email => 'pending@activation.com' + process_delayed_job_queue end assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s end @@ -629,6 +630,7 @@ class UserTest < ActiveSupport::TestCase env.save user = new_user :email => 'pending@activation.com' + process_delayed_job_queue assert_difference 'ActionMailer::Base.deliveries.size', 1 do user.activate process_delayed_job_queue @@ -649,6 +651,7 @@ class UserTest < ActiveSupport::TestCase env.save user = new_user :email => 'pending@activation.com' + process_delayed_job_queue assert_difference 'ActionMailer::Base.deliveries.size', 1 do user.activate process_delayed_job_queue @@ -668,6 +671,7 @@ class UserTest < ActiveSupport::TestCase env.save user = new_user :name => 'John Doe', :email => 'pending@activation.com' + process_delayed_job_queue assert_difference 'ActionMailer::Base.deliveries.size', 1 do user.activate process_delayed_job_queue -- libgit2 0.21.2