6 files changed, 21 insertions, 9 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 008760f2fc..86ecb3ee88 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,5 +1,7 @@
 *   Add `assert_enqueued_emails` and `assert_no_enqueued_emails`.
 
+    Example:
+
         def test_emails
           assert_enqueued_emails 2 do
             ContactMailer.welcome.deliver_later
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index cc7935a7e0..227192f48d 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -33,6 +33,8 @@ module ActionMailer
     end
 
     # Returns +text+ wrapped at +len+ columns and indented +indent+ spaces.
+    # By default column length +len+ equals 72 characters and indent
+    # +indent+ equal two spaces.
     #
     #   my_text = 'Here is a sample text with more than 40 characters'
     #
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 7681679dc7..c4d5cb8c33 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -15,7 +15,7 @@ require 'mail'
 
 # Emulate AV railtie
 require 'action_view'
-ActionMailer::Base.send(:include, ActionView::Layouts)
+ActionMailer::Base.include(ActionView::Layouts)
 
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index b218d923e5..59c5638f96 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'abstract_unit'
 require 'set'
 
diff --git a/actionmailer/test/message_delivery_test.rb b/actionmailer/test/message_delivery_test.rb
index 55ee00602a..e4dd269494 100644
--- a/actionmailer/test/message_delivery_test.rb
+++ b/actionmailer/test/message_delivery_test.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'abstract_unit'
 require 'active_job'
 require 'minitest/mock'
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index 21e7154c43..089933e245 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -1,5 +1,5 @@
-# encoding: utf-8
 require 'abstract_unit'
+require 'active_support/testing/stream'
 
 class TestHelperMailer < ActionMailer::Base
   def test
@@ -11,6 +11,8 @@ class TestHelperMailer < ActionMailer::Base
 end
 
 class TestHelperMailerTest < ActionMailer::TestCase
+  include ActiveSupport::Testing::Stream
+
   def test_setup_sets_right_action_mailer_options
     assert_equal :test, ActionMailer::Base.delivery_method
     assert ActionMailer::Base.perform_deliveries
@@ -123,7 +125,9 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_enqueued_emails
     assert_nothing_raised do
       assert_enqueued_emails 1 do
-        TestHelperMailer.test.deliver_later
+        silence_stream($stdout) do
+          TestHelperMailer.test.deliver_later
+        end
       end
     end
   end
@@ -131,7 +135,9 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_enqueued_emails_too_few_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_emails 2 do
-        TestHelperMailer.test.deliver_later
+        silence_stream($stdout) do
+          TestHelperMailer.test.deliver_later
+        end
       end
     end
 
@@ -141,8 +147,10 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_enqueued_emails_too_many_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_enqueued_emails 1 do
-        TestHelperMailer.test.deliver_later
-        TestHelperMailer.test.deliver_later
+        silence_stream($stdout) do
+          TestHelperMailer.test.deliver_later
+          TestHelperMailer.test.deliver_later
+        end
       end
     end
 
@@ -160,7 +168,9 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_no_enqueued_emails_failure
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_enqueued_emails do
-        TestHelperMailer.test.deliver_later
+        silence_stream($stdout) do
+          TestHelperMailer.test.deliver_later
+        end
       end
     end