Merge pull request #60 from barelyknown/use_deliver_now_if_possible

use deliver_now if possible in preparation for Rails 5

lib/devise/async/backend/base.rb

@@ -17,7 +17,8 @@ def perform(method, resource_class, resource_id, *args)
           I18n.with_locale locale_from_args(args) do
             resource = resource_class.constantize.to_adapter.get!(resource_id)
             args[-1] = args.last.symbolize_keys if args.last.is_a?(Hash)
-            mailer_class(resource).send(method, resource, *args).deliver
+            mailer = mailer_class(resource).send(method, resource, *args)
+            mailer.send(deliver_method(mailer))
           end
         end
 
@@ -31,6 +32,17 @@ def locale_from_args(args)
           args_last = args.last
           args_last.delete('locale') if args_last.is_a?(Hash)
         end
+
+        # Use #deliver_now if supported, otherwise falls back to #deliver.
+        # Added in preparation for the planned removal of #deliver in Rails 5.
+        def deliver_method(mailer)
+          if mailer.respond_to?(:deliver_now)
+            :deliver_now
+          else
+            :deliver
+          end
+        end
+
       end
     end
   end

test/devise/async/backend/base_test.rb

@@ -40,8 +40,31 @@ module Backend
           Base.new.perform(:confirmation_instructions, "UserWithMailer", user.id, {})
         end
 
-      end
+        describe "the delivery method" do
+          before do
+            Devise.mailer = "MyMailer"
+            @user = create_user
+          end
+
+          it "uses #deliver_now when possible" do
+            mailer_instance = mock(:deliver_now => true)
+
+            MyMailer.expects(:confirmation_instructions).once.returns(mailer_instance)
+            Base.new.perform(:confirmation_instructions, "User", @user.id, {})
+          end
+
+          it "uses #deliver otherwise" do
+            mailer_instance = mock(:deliver => true)
+
+            MyMailer.expects(:confirmation_instructions).once.returns(mailer_instance)
+            Base.new.perform(:confirmation_instructions, "User", @user.id, {})
+          end
+        end
 
+        after do
+          Devise.mailer = "Devise::Mailer"
+        end
+      end
     end
   end
 end