Commit dd30815abb85728a3d5fba33451a49e0d7acaa77
1 parent
48167ee1
Exists in
web_steps_improvements
and in
9 other branches
process delayed job queue before check for mail delivery
Showing
1 changed file
with
4 additions
and
0 deletions
Show diff stats
test/unit/user_test.rb
@@ -509,6 +509,7 @@ class UserTest < ActiveSupport::TestCase | @@ -509,6 +509,7 @@ class UserTest < ActiveSupport::TestCase | ||
509 | should 'deliver e-mail with activation code after creation' do | 509 | should 'deliver e-mail with activation code after creation' do |
510 | assert_difference 'ActionMailer::Base.deliveries.size', 1 do | 510 | assert_difference 'ActionMailer::Base.deliveries.size', 1 do |
511 | new_user :email => 'pending@activation.com' | 511 | new_user :email => 'pending@activation.com' |
512 | + process_delayed_job_queue | ||
512 | end | 513 | end |
513 | assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s | 514 | assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s |
514 | end | 515 | end |
@@ -639,6 +640,7 @@ class UserTest < ActiveSupport::TestCase | @@ -639,6 +640,7 @@ class UserTest < ActiveSupport::TestCase | ||
639 | env.save | 640 | env.save |
640 | 641 | ||
641 | user = new_user :email => 'pending@activation.com' | 642 | user = new_user :email => 'pending@activation.com' |
643 | + process_delayed_job_queue | ||
642 | assert_difference 'ActionMailer::Base.deliveries.size', 1 do | 644 | assert_difference 'ActionMailer::Base.deliveries.size', 1 do |
643 | user.activate | 645 | user.activate |
644 | process_delayed_job_queue | 646 | process_delayed_job_queue |
@@ -659,6 +661,7 @@ class UserTest < ActiveSupport::TestCase | @@ -659,6 +661,7 @@ class UserTest < ActiveSupport::TestCase | ||
659 | env.save | 661 | env.save |
660 | 662 | ||
661 | user = new_user :email => 'pending@activation.com' | 663 | user = new_user :email => 'pending@activation.com' |
664 | + process_delayed_job_queue | ||
662 | assert_difference 'ActionMailer::Base.deliveries.size', 1 do | 665 | assert_difference 'ActionMailer::Base.deliveries.size', 1 do |
663 | user.activate | 666 | user.activate |
664 | process_delayed_job_queue | 667 | process_delayed_job_queue |
@@ -678,6 +681,7 @@ class UserTest < ActiveSupport::TestCase | @@ -678,6 +681,7 @@ class UserTest < ActiveSupport::TestCase | ||
678 | env.save | 681 | env.save |
679 | 682 | ||
680 | user = new_user :name => 'John Doe', :email => 'pending@activation.com' | 683 | user = new_user :name => 'John Doe', :email => 'pending@activation.com' |
684 | + process_delayed_job_queue | ||
681 | assert_difference 'ActionMailer::Base.deliveries.size', 1 do | 685 | assert_difference 'ActionMailer::Base.deliveries.size', 1 do |
682 | user.activate | 686 | user.activate |
683 | process_delayed_job_queue | 687 | process_delayed_job_queue |