1 files changed, 23 insertions, 13 deletions
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb
index 78507ce7dc..2786fe0d07 100644
--- a/actionmailer/test/delivery_methods_test.rb
+++ b/actionmailer/test/delivery_methods_test.rb
@@ -31,8 +31,8 @@ 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
 
@@ -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
@@ -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