1 files changed, 35 insertions, 25 deletions

diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb
index 78507ce7dc..f64a69019f 100644
--- a/actionmailer/test/delivery_methods_test.rb
+++ b/actionmailer/test/delivery_methods_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "abstract_unit"
 
 class MyCustomDelivery
 end
@@ -23,7 +23,7 @@ class DefaultsDeliveryMethodsTest < ActiveSupport::TestCase
   test "default smtp settings" do
     settings = { address:              "localhost",
                  port:                 25,
-                 domain:               'localhost.localdomain',
+                 domain:               "localhost.localdomain",
                  user_name:            nil,
                  password:             nil,
                  authentication:       nil,
@@ -31,15 +31,15 @@ class DefaultsDeliveryMethodsTest < ActiveSupport::TestCase
     assert_equal settings, ActionMailer::Base.smtp_settings
   end
 
-  test "default file delivery settings" do
-    settings = {location: "#{Dir.tmpdir}/mails"}
+  test "default file delivery settings (with Rails.root)" do
+    settings = { location: "#{Rails.root}/tmp/mails" }
     assert_equal settings, ActionMailer::Base.file_settings
   end
 
   test "default sendmail settings" do
     settings = {
-      location:  '/usr/sbin/sendmail',
-      arguments: '-i -t'
+      location:  "/usr/sbin/sendmail",
+      arguments: "-i"
     }
     assert_equal settings, ActionMailer::Base.sendmail_settings
   end
@@ -83,11 +83,11 @@ end
 class MailDeliveryTest < ActiveSupport::TestCase
   class DeliveryMailer < ActionMailer::Base
     DEFAULT_HEADERS = {
-      to: 'mikel@test.lindsaar.net',
-      from: 'jose@test.plataformatec.com'
+      to: "mikel@test.lindsaar.net",
+      from: "jose@test.plataformatec.com"
     }
 
-    def welcome(hash={})
+    def welcome(hash = {})
       mail(DEFAULT_HEADERS.merge(hash))
     end
   end
@@ -102,16 +102,21 @@ class MailDeliveryTest < ActiveSupport::TestCase
   end
 
   test "ActionMailer should be told when Mail gets delivered" do
-    DeliveryMailer.expects(:deliver_mail).once
-    DeliveryMailer.welcome.deliver_now
+    DeliveryMailer.delivery_method = :test
+    assert_called(DeliveryMailer, :deliver_mail) do
+      DeliveryMailer.welcome.deliver_now
+    end
   end
 
   test "delivery method can be customized per instance" do
-    Mail::SMTP.any_instance.expects(:deliver!)
-    email = DeliveryMailer.welcome.deliver_now
-    assert_instance_of Mail::SMTP, email.delivery_method
-    email = DeliveryMailer.welcome(delivery_method: :test).deliver_now
-    assert_instance_of Mail::TestMailer, email.delivery_method
+    stub_any_instance(Mail::SMTP, instance: Mail::SMTP.new({})) do |instance|
+      assert_called(instance, :deliver!) do
+        email = DeliveryMailer.welcome.deliver_now
+        assert_instance_of Mail::SMTP, email.delivery_method
+        email = DeliveryMailer.welcome(delivery_method: :test).deliver_now
+        assert_instance_of Mail::TestMailer, email.delivery_method
+      end
+    end
   end
 
   test "delivery method can be customized in subclasses not changing the parent" do
@@ -122,16 +127,16 @@ class MailDeliveryTest < ActiveSupport::TestCase
   end
 
   test "delivery method options default to class level options" do
-    default_options = {a: "b"}
+    default_options = { a: "b" }
     ActionMailer::Base.add_delivery_method :optioned, MyOptionedDelivery, default_options
     mail_instance = DeliveryMailer.welcome(delivery_method: :optioned)
     assert_equal default_options, mail_instance.delivery_method.options
   end
 
   test "delivery method options can be overridden per mail instance" do
-    default_options = {a: "b"}
+    default_options = { a: "b" }
     ActionMailer::Base.add_delivery_method :optioned, MyOptionedDelivery, default_options
-    overridden_options = {a: "a"}
+    overridden_options = { a: "a" }
     mail_instance = DeliveryMailer.welcome(delivery_method: :optioned, delivery_method_options: overridden_options)
     assert_equal overridden_options, mail_instance.delivery_method.options
   end
@@ -140,14 +145,14 @@ class MailDeliveryTest < ActiveSupport::TestCase
     settings = {
       address: "localhost",
       port: 25,
-      domain: 'localhost.localdomain',
+      domain: "localhost.localdomain",
       user_name: nil,
       password: nil,
       authentication: nil,
       enable_starttls_auto: true
     }
     assert_equal settings, ActionMailer::Base.smtp_settings
-    overridden_options = {user_name: "overridden", password: "somethingobtuse"}
+    overridden_options = { user_name: "overridden", password: "somethingobtuse" }
     mail_instance = DeliveryMailer.welcome(delivery_method_options: overridden_options)
     delivery_method_instance = mail_instance.delivery_method
     assert_equal "overridden", delivery_method_instance.settings[:user_name]
@@ -160,24 +165,29 @@ class MailDeliveryTest < ActiveSupport::TestCase
 
   test "non registered delivery methods raises errors" do
     DeliveryMailer.delivery_method = :unknown
-    assert_raise RuntimeError do
+    error = assert_raise RuntimeError do
       DeliveryMailer.welcome.deliver_now
     end
+    assert_equal "Invalid delivery method :unknown", error.message
   end
 
   test "undefined delivery methods raises errors" do
     DeliveryMailer.delivery_method = nil
-    assert_raise RuntimeError do
+    error = assert_raise RuntimeError do
       DeliveryMailer.welcome.deliver_now
     end
+    assert_equal "Delivery method cannot be nil", error.message
   end
 
   test "does not perform deliveries if requested" do
     old_perform_deliveries = DeliveryMailer.perform_deliveries
     begin
       DeliveryMailer.perform_deliveries = false
-      Mail::Message.any_instance.expects(:deliver!).never
-      DeliveryMailer.welcome.deliver_now
+      stub_any_instance(Mail::Message) do |instance|
+        assert_not_called(instance, :deliver!) do
+          DeliveryMailer.welcome.deliver_now
+        end
+      end
     ensure
       DeliveryMailer.perform_deliveries = old_perform_deliveries
     end