Use deliver_later for all email sending

.rubocop_todo.yml

@@ -32,7 +32,7 @@ Lint/HandleExceptions:
 
 # Offense count: 692
 Metrics/AbcSize:
-  Max: 280
+  Max: 283
 
 # Offense count: 40
 # Configuration parameters: CountComments, ExcludedMethods.
@@ -48,7 +48,7 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1795
+  Max: 1801
 
 # Offense count: 72
 Metrics/CyclomaticComplexity:

app/controllers/changeset_controller.rb

@@ -332,7 +332,7 @@ class ChangesetController < ApplicationController
 
     # Notify current subscribers of the new comment
     changeset.subscribers.visible.each do |user|
-      Notifier.changeset_comment_notification(comment, user).deliver_now if current_user != user
+      Notifier.changeset_comment_notification(comment, user).deliver_later if current_user != user
     end
 
     # Add the commenter to the subscribers if necessary

app/controllers/diary_entry_controller.rb

@@ -65,7 +65,7 @@ class DiaryEntryController < ApplicationController
 
       # Notify current subscribers of the new comment
       @entry.subscribers.visible.each do |user|
-        Notifier.diary_comment_notification(@diary_comment, user).deliver_now if current_user != user
+        Notifier.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user
       end
 
       # Add the commenter to the subscribers if necessary

app/controllers/messages_controller.rb

@@ -29,7 +29,7 @@ class MessagesController < ApplicationController
       render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"
-      Notifier.message_notification(@message).deliver_now
+      Notifier.message_notification(@message).deliver_later
       redirect_to :action => :inbox
     else
       render :action => "new"

app/controllers/notes_controller.rb

@@ -387,7 +387,7 @@ class NotesController < ApplicationController
     comment = note.comments.create!(attributes)
 
     note.comments.map(&:author).uniq.each do |user|
-      Notifier.note_comment_notification(comment, user).deliver_now if notify && user && user != current_user && user.visible?
+      Notifier.note_comment_notification(comment, user).deliver_later if notify && user && user != current_user && user.visible?
     end
   end
 end

app/controllers/users_controller.rb

@@ -107,7 +107,7 @@ class UsersController < ApplicationController
             successful_login(current_user)
           else
             session[:token] = current_user.tokens.create.token
-            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_now
+            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later
             redirect_to :action => "confirm", :display_name => current_user.display_name
           end
         else
@@ -158,7 +158,7 @@ class UsersController < ApplicationController
 
       if user
         token = user.tokens.create
-        Notifier.lost_password(user, token).deliver_now
+        Notifier.lost_password(user, token).deliver_later
         flash[:notice] = t "users.lost_password.notice email on way"
         redirect_to :action => "login"
       else
@@ -339,7 +339,7 @@ class UsersController < ApplicationController
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
     else
-      Notifier.signup_confirm(user, user.tokens.create).deliver_now
+      Notifier.signup_confirm(user, user.tokens.create).deliver_later
       flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe
     end
 
@@ -432,7 +432,7 @@ class UsersController < ApplicationController
           flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif friend.save
           flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name
-          Notifier.friend_notification(friend).deliver_now
+          Notifier.friend_notification(friend).deliver_later
         else
           friend.add_error(t("users.make_friend.failed", :name => @new_friend.display_name))
         end
@@ -735,7 +735,7 @@ class UsersController < ApplicationController
           flash.now[:notice] = t "users.account.flash update success confirm needed"
 
           begin
-            Notifier.email_confirm(user, user.tokens.create).deliver_now
+            Notifier.email_confirm(user, user.tokens.create).deliver_later
           rescue StandardError
             # Ignore errors sending email
           end

config/environments/test.rb

@@ -46,4 +46,7 @@ Rails.application.configure do
 
   # Raises error for missing translations
   config.action_view.raise_on_missing_translations = true
+
+  # Use the test adapter for ActiveJob during testing
+  config.active_job.queue_adapter = :test
 end

test/controllers/changeset_controller_test.rb

@@ -2153,9 +2153,11 @@ CHANGESET
 
     assert_difference "ChangesetComment.count", 1 do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
+        perform_enqueued_jobs do
           post :comment, :params => { :id => private_user_closed_changeset.id, :text => "This is a comment" }
         end
       end
+    end
     assert_response :success
 
     changeset = create(:changeset, :closed, :user => private_user)
@@ -2166,9 +2168,11 @@ CHANGESET
 
     assert_difference "ChangesetComment.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 1 do
+        perform_enqueued_jobs do
           post :comment, :params => { :id => changeset.id, :text => "This is a comment" }
         end
       end
+    end
     assert_response :success
 
     email = ActionMailer::Base.deliveries.first
@@ -2182,9 +2186,11 @@ CHANGESET
 
     assert_difference "ChangesetComment.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 2 do
+        perform_enqueued_jobs do
           post :comment, :params => { :id => changeset.id, :text => "This is a comment" }
         end
       end
+    end
     assert_response :success
 
     email = ActionMailer::Base.deliveries.find { |e| e.to.first == private_user.email }

test/controllers/diary_entry_controller_test.rb

@@ -390,12 +390,14 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       assert_no_difference "DiaryComment.count" do
         assert_no_difference "entry.subscribers.count" do
+          perform_enqueued_jobs do
             post :comment,
                  :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } },
                  :session => { :user => other_user }
           end
         end
       end
+    end
     assert_response :success
     assert_template :show
 
@@ -403,12 +405,14 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do
       assert_difference "DiaryComment.count", 1 do
         assert_difference "entry.subscribers.count", 1 do
+          perform_enqueued_jobs do
             post :comment,
                  :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } },
                  :session => { :user => other_user }
           end
         end
       end
+    end
     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
@@ -450,11 +454,13 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Try creating a spammy comment
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "DiaryComment.count", 1 do
+        perform_enqueued_jobs do
           post :comment,
                :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } },
                :session => { :user => other_user }
         end
       end
+    end
     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first

test/controllers/messages_controller_test.rb

@@ -83,11 +83,13 @@ class MessagesControllerTest < ActionController::TestCase
     # Check that we can't send a message from a GET request
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
+        perform_enqueued_jobs do
           get :new,
               :params => { :display_name => recipient_user.display_name,
                            :message => { :title => "Test Message", :body => "Test message body" } }
         end
       end
+    end
     assert_response :success
     assert_template "new"
     assert_select "title", "Send message | OpenStreetMap"
@@ -112,11 +114,13 @@ class MessagesControllerTest < ActionController::TestCase
     # Check that the subject is preserved over errors
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
+        perform_enqueued_jobs do
           post :new,
                :params => { :display_name => recipient_user.display_name,
                             :message => { :title => "Test Message", :body => "" } }
         end
       end
+    end
     assert_response :success
     assert_template "new"
     assert_select "title", "Send message | OpenStreetMap"
@@ -141,11 +145,13 @@ class MessagesControllerTest < ActionController::TestCase
     # Check that the body text is preserved over errors
     assert_difference "ActionMailer::Base.deliveries.size", 0 do
       assert_difference "Message.count", 0 do
+        perform_enqueued_jobs do
           post :new,
                :params => { :display_name => recipient_user.display_name,
                             :message => { :title => "", :body => "Test message body" } }
         end
       end
+    end
     assert_response :success
     assert_template "new"
     assert_select "title", "Send message | OpenStreetMap"
@@ -170,11 +176,13 @@ class MessagesControllerTest < ActionController::TestCase
     # Check that sending a message works
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "Message.count", 1 do
+        perform_enqueued_jobs do
           post :create,
                :params => { :display_name => recipient_user.display_name,
                             :message => { :title => "Test Message", :body => "Test message body" } }
         end
       end
+    end
     assert_redirected_to inbox_messages_path
     assert_equal "Message sent", flash[:notice]
     e = ActionMailer::Base.deliveries.first
@@ -211,6 +219,7 @@ class MessagesControllerTest < ActionController::TestCase
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       assert_no_difference "Message.count" do
         with_message_limit(0) do
+          perform_enqueued_jobs do
             post :create,
                  :params => { :display_name => recipient_user.display_name,
                               :message => { :title => "Test Message", :body => "Test message body" } }
@@ -221,6 +230,7 @@ class MessagesControllerTest < ActionController::TestCase
         end
       end
     end
+  end
 
   ##
   # test the reply action

test/controllers/notes_controller_test.rb

@@ -228,9 +228,11 @@ class NotesControllerTest < ActionController::TestCase
     open_note_with_comment = create(:note_with_comments)
     assert_difference "NoteComment.count", 1 do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
+        perform_enqueued_jobs do
           post :comment, :params => { :id => open_note_with_comment.id, :text => "This is an additional comment", :format => "json" }
         end
       end
+    end
     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js
@@ -265,9 +267,11 @@ class NotesControllerTest < ActionController::TestCase
     end
     assert_difference "NoteComment.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 2 do
+        perform_enqueued_jobs do
           post :comment, :params => { :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json" }
         end
       end
+    end
     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js
@@ -307,9 +311,11 @@ class NotesControllerTest < ActionController::TestCase
 
     assert_difference "NoteComment.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 2 do
+        perform_enqueued_jobs do
           post :comment, :params => { :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json" }
         end
       end
+    end
     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js

test/controllers/users_controller_test.rb

@@ -237,9 +237,11 @@ class UsersControllerTest < ActionController::TestCase
 
     assert_difference "User.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 1 do
+        perform_enqueued_jobs do
           post :save, :session => { :new_user => user }
         end
       end
+    end
 
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
@@ -259,9 +261,11 @@ class UsersControllerTest < ActionController::TestCase
 
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
+        perform_enqueued_jobs do
           post :save, :session => { :new_user => user }
         end
       end
+    end
 
     assert_response :success
     assert_template "new"
@@ -274,9 +278,11 @@ class UsersControllerTest < ActionController::TestCase
 
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
+        perform_enqueued_jobs do
           post :save, :session => { :new_user => user }
         end
       end
+    end
 
     assert_response :success
     assert_template "new"
@@ -289,9 +295,11 @@ class UsersControllerTest < ActionController::TestCase
 
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
+        perform_enqueued_jobs do
           post :save, :session => { :new_user => user }
         end
       end
+    end
 
     assert_response :success
     assert_template "new"
@@ -304,9 +312,11 @@ class UsersControllerTest < ActionController::TestCase
 
     assert_no_difference "User.count" do
       assert_no_difference "ActionMailer::Base.deliveries.size" do
+        perform_enqueued_jobs do
           post :save, :session => { :new_user => user }
         end
       end
+    end
 
     assert_response :success
     assert_template "new"
@@ -318,10 +328,12 @@ class UsersControllerTest < ActionController::TestCase
 
     assert_difference "User.count", 1 do
       assert_difference "ActionMailer::Base.deliveries.size", 1 do
+        perform_enqueued_jobs do
           post :save, :session => { :new_user => user,
                                     :referer => "/edit?editor=id#map=1/2/3" }
         end
       end
+    end
 
     assert_equal welcome_path(:editor => "id", :zoom => 1, :lat => 2, :lon => 3),
                  user.tokens.order("id DESC").first.referer
@@ -489,8 +501,10 @@ class UsersControllerTest < ActionController::TestCase
     session[:token] = user.tokens.create.token
 
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      perform_enqueued_jobs do
         get :confirm_resend, :params => { :display_name => user.display_name }
       end
+    end
 
     assert_response :redirect
     assert_redirected_to login_path
@@ -506,8 +520,10 @@ class UsersControllerTest < ActionController::TestCase
   def test_confirm_resend_no_token
     user = create(:user, :pending)
     assert_no_difference "ActionMailer::Base.deliveries.size" do
+      perform_enqueued_jobs do
         get :confirm_resend, :params => { :display_name => user.display_name }
       end
+    end
 
     assert_response :redirect
     assert_redirected_to login_path
@@ -516,8 +532,10 @@ class UsersControllerTest < ActionController::TestCase
 
   def test_confirm_resend_unknown_user
     assert_no_difference "ActionMailer::Base.deliveries.size" do
+      perform_enqueued_jobs do
         get :confirm_resend, :params => { :display_name => "No Such User" }
       end
+    end
 
     assert_response :redirect
     assert_redirected_to login_path
@@ -674,8 +692,10 @@ class UsersControllerTest < ActionController::TestCase
     uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) }
 
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      perform_enqueued_jobs do
         post :lost_password, :params => { :user => { :email => user.email } }
       end
+    end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match(/^Sorry you lost it/, flash[:notice])
@@ -687,8 +707,10 @@ class UsersControllerTest < ActionController::TestCase
     # Test resetting using an address that matches a different user
     # that has the same address in a different case
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      perform_enqueued_jobs do
         post :lost_password, :params => { :user => { :email => user.email.upcase } }
       end
+    end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match(/^Sorry you lost it/, flash[:notice])
@@ -700,8 +722,10 @@ class UsersControllerTest < ActionController::TestCase
     # Test resetting using an address that is a case insensitive match
     # for more than one user but not an exact match for either
     assert_no_difference "ActionMailer::Base.deliveries.size" do
+      perform_enqueued_jobs do
         post :lost_password, :params => { :user => { :email => user.email.titlecase } }
       end
+    end
     assert_response :success
     assert_template :lost_password
     assert_select ".error", /^Could not find that email address/
@@ -710,8 +734,10 @@ class UsersControllerTest < ActionController::TestCase
     # address which is case insensitively unique
     third_user = create(:user)
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      perform_enqueued_jobs do
         post :lost_password, :params => { :user => { :email => third_user.email } }
       end
+    end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match(/^Sorry you lost it/, flash[:notice])
@@ -723,8 +749,10 @@ class UsersControllerTest < ActionController::TestCase
     # Test resetting using an address that matches a user that has the
     # same (case insensitively unique) address in a different case
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      perform_enqueued_jobs do
         post :lost_password, :params => { :user => { :email => third_user.email.upcase } }
       end
+    end
     assert_response :redirect
     assert_redirected_to :action => :login
     assert_match(/^Sorry you lost it/, flash[:notice])
@@ -898,8 +926,10 @@ class UsersControllerTest < ActionController::TestCase
     # Changing email to one that exists should fail
     user.new_email = create(:user).email
     assert_no_difference "ActionMailer::Base.deliveries.size" do
+      perform_enqueued_jobs do
         post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
       end
+    end
     assert_response :success
     assert_template :account
     assert_select ".notice", false
@@ -909,8 +939,10 @@ class UsersControllerTest < ActionController::TestCase
     # Changing email to one that exists should fail, regardless of case
     user.new_email = create(:user).email.upcase
     assert_no_difference "ActionMailer::Base.deliveries.size" do
+      perform_enqueued_jobs do
         post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
       end
+    end
     assert_response :success
     assert_template :account
     assert_select ".notice", false
@@ -920,8 +952,10 @@ class UsersControllerTest < ActionController::TestCase
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      perform_enqueued_jobs do
         post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user }
       end
+    end
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
@@ -1258,8 +1292,10 @@ class UsersControllerTest < ActionController::TestCase
 
     # When logged in a POST should add the friendship
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      perform_enqueued_jobs do
         post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
       end
+    end
     assert_redirected_to user_path(friend)
     assert_match(/is now your friend/, flash[:notice])
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
@@ -1270,8 +1306,10 @@ class UsersControllerTest < ActionController::TestCase
 
     # A second POST should report that the friendship already exists
     assert_no_difference "ActionMailer::Base.deliveries.size" do
+      perform_enqueued_jobs do
         post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
       end
+    end
     assert_redirected_to user_path(friend)
     assert_match(/You are already friends with/, flash[:warning])
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
@@ -1297,8 +1335,10 @@ class UsersControllerTest < ActionController::TestCase
 
     # When logged in a POST should add the friendship and refer us
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      perform_enqueued_jobs do
         post :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
       end
+    end
     assert_redirected_to "/test"
     assert_match(/is now your friend/, flash[:notice])
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first

test/integration/user_creation_test.rb

@@ -37,11 +37,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       display_name = "#{locale}_new_tester"
       assert_difference("User.count", 0) do
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
+          perform_enqueued_jobs do
             post "/user/new",
                  :params => { :user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
                  :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
           end
         end
+      end
       assert_response :success
       assert_template "users/new"
       assert_equal locale.to_s, response.headers["Content-Language"] unless locale == :root
@@ -56,11 +58,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       email = "#{locale}_new_tester"
       assert_difference("User.count", 0) do
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
+          perform_enqueued_jobs do
             post "/user/new",
                  :params => { :user => { :email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
                  :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
           end
         end
+      end
       assert_response :success
       assert_template "users/new"
       assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"
@@ -75,20 +79,24 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
       assert_difference("User.count", 0) do
         assert_difference("ActionMailer::Base.deliveries.size", 0) do
+          perform_enqueued_jobs do
             post "/user/new",
                  :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }
           end
         end
+      end
 
       assert_redirected_to "/user/terms"
 
       assert_difference("User.count") do
         assert_difference("ActionMailer::Base.deliveries.size", 1) do
+          perform_enqueued_jobs do
             post "/user/save",
                  :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
             follow_redirect!
           end
         end
+      end
 
       # Check the e-mail
       register_email = ActionMailer::Base.deliveries.first
@@ -122,6 +130,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     referer = "/traces/mine"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :referer => referer }
           assert_redirected_to "/user/terms"
@@ -130,6 +139,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
@@ -168,6 +178,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     password = "testtest"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -184,6 +195,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the page
     assert_response :success
@@ -199,6 +211,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     display_name = "new_tester-openid2"
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -216,6 +229,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_template "users/new"
         end
       end
+    end
 
     ActionMailer::Base.deliveries.clear
   end
@@ -229,6 +243,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     referer = "/traces/mine"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
           assert_response :redirect
@@ -244,6 +259,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
@@ -284,6 +300,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     password = "testtest"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -300,6 +317,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the page
     assert_response :success
@@ -315,6 +333,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     display_name = "new_tester-google2"
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -332,6 +351,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_template "users/new"
         end
       end
+    end
 
     ActionMailer::Base.deliveries.clear
   end
@@ -347,6 +367,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     referer = "/traces/mine"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
           assert_response :redirect
@@ -362,6 +383,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
@@ -400,6 +422,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     password = "testtest"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -416,6 +439,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the page
     assert_response :success
@@ -431,6 +455,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     display_name = "new_tester-facebook2"
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -448,6 +473,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_template "users/new"
         end
       end
+    end
 
     ActionMailer::Base.deliveries.clear
   end
@@ -461,6 +487,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     referer = "/traces/mine"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
           assert_response :redirect
@@ -476,6 +503,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
@@ -514,6 +542,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     password = "testtest"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -530,6 +559,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the page
     assert_response :success
@@ -545,6 +575,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     display_name = "new_tester-windowslive2"
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -562,6 +593,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_template "users/new"
         end
       end
+    end
 
     ActionMailer::Base.deliveries.clear
   end
@@ -575,6 +607,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     referer = "/traces/mine"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
           assert_response :redirect
@@ -590,6 +623,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
@@ -628,6 +662,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     password = "testtest"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -644,6 +679,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the page
     assert_response :success
@@ -659,6 +695,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     display_name = "new_tester-github2"
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -676,6 +713,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_template "users/new"
         end
       end
+    end
 
     ActionMailer::Base.deliveries.clear
   end
@@ -689,6 +727,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     referer = "/traces/mine"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
           assert_response :redirect
@@ -704,6 +743,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
@@ -742,6 +782,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     password = "testtest"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -758,6 +799,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the page
     assert_response :success
@@ -773,6 +815,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     display_name = "new_tester-wikipedia2"
     assert_difference("User.count", 0) do
       assert_difference("ActionMailer::Base.deliveries.size", 0) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } }
           assert_response :redirect
@@ -790,6 +833,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_template "users/new"
         end
       end
+    end
 
     ActionMailer::Base.deliveries.clear
   end
@@ -803,6 +847,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     referer = "/traces/mine"
     assert_difference("User.count") do
       assert_difference("ActionMailer::Base.deliveries.size", 1) do
+        perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer }
           assert_response :redirect
@@ -818,6 +863,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           follow_redirect!
         end
       end
+    end
 
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first

test/test_helper.rb

@@ -11,6 +11,7 @@ WebMock.disable_net_connect!(:allow_localhost => true)
 module ActiveSupport
   class TestCase
     include FactoryBot::Syntax::Methods
+    include ActiveJob::TestHelper
 
     ##
     # takes a block which is executed in the context of a different