4 files changed, 21 insertions, 7 deletions
diff --git a/actionmailer/test/delivery_methods_test.rb b/actionmailer/test/delivery_methods_test.rb
index 2786fe0d07..bcbd036f26 100644
--- a/actionmailer/test/delivery_methods_test.rb
+++ b/actionmailer/test/delivery_methods_test.rb
@@ -39,7 +39,7 @@ class DefaultsDeliveryMethodsTest < ActiveSupport::TestCase
   test "default sendmail settings" do
     settings = {
       location:  '/usr/sbin/sendmail',
-      arguments: '-i -t'
+      arguments: '-i'
     }
     assert_equal settings, ActionMailer::Base.sendmail_settings
   end
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb
index 6124ffeb52..50c4b74eb8 100644
--- a/actionmailer/test/i18n_with_controller_test.rb
+++ b/actionmailer/test/i18n_with_controller_test.rb
@@ -25,7 +25,9 @@ end
 class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do
-    get ':controller(/:action(/:id))'
+    ActiveSupport::Deprecation.silence do
+      get ':controller(/:action(/:id))'
+    end
   end
 
   class RoutedRackApp
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb
index b834cdd08c..f06d69369f 100644
--- a/actionmailer/test/message_delivery_test.rb
+++ b/actionmailer/test/message_delivery_test.rb
@@ -93,4 +93,12 @@ class MessageDeliveryTest < ActiveSupport::TestCase
       @mail.deliver_later(queue: :another_queue)
     end
   end
+
+  test 'deliver_later after accessing the message is disallowed' do
+    @mail.message # Load the message, which calls the mailer method.
+
+    assert_raise RuntimeError do
+      @mail.deliver_later
+    end
+  end
 end
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 7928fe9542..70bd05055f 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -79,9 +79,11 @@ class ActionMailerUrlTest < ActionMailer::TestCase
     UrlTestMailer.delivery_method = :test
 
     AppRoutes.draw do
-      get ':controller(/:action(/:id))'
-      get '/welcome'  => 'foo#bar', as: 'welcome'
-      get '/dummy_model' => 'foo#baz', as: 'dummy_model'
+      ActiveSupport::Deprecation.silence do
+        get ':controller(/:action(/:id))'
+        get '/welcome'  => 'foo#bar', as: 'welcome'
+        get '/dummy_model' => 'foo#baz', as: 'dummy_model'
+      end
     end
 
     # string
@@ -108,8 +110,10 @@ class ActionMailerUrlTest < ActionMailer::TestCase
     UrlTestMailer.delivery_method = :test
 
     AppRoutes.draw do
-      get ':controller(/:action(/:id))'
-      get '/welcome' => "foo#bar", as: "welcome"
+      ActiveSupport::Deprecation.silence do
+        get ':controller(/:action(/:id))'
+        get '/welcome' => "foo#bar", as: "welcome"
+      end
     end
 
     expected = new_mail