1 files changed, 88 insertions, 11 deletions
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb
index 7c7f0b6fdc..0a4bc75d3e 100644
--- a/actionmailer/test/test_helper_test.rb
+++ b/actionmailer/test/test_helper_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'active_support/testing/stream'
 
 class TestHelperMailer < ActionMailer::Base
   def test
@@ -10,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
@@ -36,10 +39,18 @@ class TestHelperMailerTest < ActionMailer::TestCase
     assert_equal "UTF-8", charset
   end
 
+  def test_encode
+    assert_equal '=?UTF-8?Q?This_is_=E3=81=82_string?=', encode('This is あ string')
+  end
+
+  def test_read_fixture
+    assert_equal ['Welcome!'], read_fixture('welcome')
+  end
+
   def test_assert_emails
     assert_nothing_raised do
       assert_emails 1 do
-        TestHelperMailer.test.deliver
+        TestHelperMailer.test.deliver_now
       end
     end
   end
@@ -47,27 +58,27 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_repeated_assert_emails_calls
     assert_nothing_raised do
       assert_emails 1 do
-        TestHelperMailer.test.deliver
+        TestHelperMailer.test.deliver_now
       end
     end
 
     assert_nothing_raised do
       assert_emails 2 do
-        TestHelperMailer.test.deliver
-        TestHelperMailer.test.deliver
+        TestHelperMailer.test.deliver_now
+        TestHelperMailer.test.deliver_now
       end
     end
   end
 
   def test_assert_emails_with_no_block
     assert_nothing_raised do
-      TestHelperMailer.test.deliver
+      TestHelperMailer.test.deliver_now
       assert_emails 1
     end
 
     assert_nothing_raised do
-      TestHelperMailer.test.deliver
-      TestHelperMailer.test.deliver
+      TestHelperMailer.test.deliver_now
+      TestHelperMailer.test.deliver_now
       assert_emails 3
     end
   end
@@ -83,7 +94,7 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_emails_too_few_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 2 do
-        TestHelperMailer.test.deliver
+        TestHelperMailer.test.deliver_now
       end
     end
 
@@ -93,18 +104,84 @@ class TestHelperMailerTest < ActionMailer::TestCase
   def test_assert_emails_too_many_sent
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 1 do
-        TestHelperMailer.test.deliver
-        TestHelperMailer.test.deliver
+        TestHelperMailer.test.deliver_now
+        TestHelperMailer.test.deliver_now
       end
     end
 
     assert_match(/1 .* but 2/, error.message)
   end
 
+  def test_assert_emails_message
+    TestHelperMailer.test.deliver_now
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_emails 2 do
+        TestHelperMailer.test.deliver_now
+      end
+    end
+    assert_match "Expected: 2", error.message
+    assert_match "Actual: 1", error.message
+  end
+
   def test_assert_no_emails_failure
     error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_emails do
-        TestHelperMailer.test.deliver
+        TestHelperMailer.test.deliver_now
+      end
+    end
+
+    assert_match(/0 .* but 1/, error.message)
+  end
+
+  def test_assert_enqueued_emails
+    assert_nothing_raised do
+      assert_enqueued_emails 1 do
+        silence_stream($stdout) do
+          TestHelperMailer.test.deliver_later
+        end
+      end
+    end
+  end
+
+  def test_assert_enqueued_emails_too_few_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_enqueued_emails 2 do
+        silence_stream($stdout) do
+          TestHelperMailer.test.deliver_later
+        end
+      end
+    end
+
+    assert_match(/2 .* but 1/, error.message)
+  end
+
+  def test_assert_enqueued_emails_too_many_sent
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_enqueued_emails 1 do
+        silence_stream($stdout) do
+          TestHelperMailer.test.deliver_later
+          TestHelperMailer.test.deliver_later
+        end
+      end
+    end
+
+    assert_match(/1 .* but 2/, error.message)
+  end
+
+  def test_assert_no_enqueued_emails
+    assert_nothing_raised do
+      assert_no_enqueued_emails do
+        TestHelperMailer.test.deliver_now
+      end
+    end
+  end
+
+  def test_assert_no_enqueued_emails_failure
+    error = assert_raise ActiveSupport::TestCase::Assertion do
+      assert_no_enqueued_emails do
+        silence_stream($stdout) do
+          TestHelperMailer.test.deliver_later
+        end
       end
     end