Fix #1251 devise mailer with async.

Author: huacnlee

app/models/user/deviseable.rb

@@ -9,18 +9,19 @@ module Deviseable
       attr_accessor :omniauth_provider, :omniauth_uid
 
       devise :database_authenticatable, :registerable, :recoverable, :lockable,
-         :rememberable, :trackable, :validatable, :omniauthable
+             :rememberable, :trackable, :validatable, :omniauthable
 
       after_create :bind_omniauth_on_create
-    end
 
-    def password_required?
-      (authorizations.empty? || !password.blank?) && super
-    end
+      # Override Devise to send mails with async
+      def send_devise_notification(notification, *args)
+        devise_mailer.send(notification, self, *args).deliver_later
+      end
 
-    # Override Devise to send mails with async
-    def send_devise_notification(notification, *args)
-      devise_mailer.send(notification, self, *args).deliver_later
+      # Override Devise password_required?
+      def password_required?
+        (authorizations.empty? || !password.blank?) && super
+      end
     end
 
     def bind?(provider)
@@ -95,7 +96,7 @@ def new_from_provider_data(provider, uid, data)
             return user
           end
 
-          Rails.logger.warn("User.create_from_hash 失败，#{user.errors.inspect}")
+          Rails.logger.warn("User.create_from_hash error: #{user.errors.inspect}")
           return nil
         end
       end

test/models/user/deviseable_test.rb

@@ -3,6 +3,8 @@
 require "test_helper"
 
 class User::DeviseableTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   class Monkey < ApplicationRecord
     include User::Deviseable
   end
@@ -62,4 +64,12 @@ class Monkey < ApplicationRecord
     description = data["description"] = "A newbie Ruby developer"
     assert_equal description, Monkey.new_from_provider_data(nil, nil, data).tagline
   end
+
+  test "async mailer" do
+    user = create(:user)
+
+    assert_performed_jobs 1 do
+      user.send(:send_devise_notification, :reset_password_instructions, "foobar")
+    end
+  end
 end