Merge pull request #1271 from joshk/remove_am_deprecated_methods

Removed deprecated ActionMailer API and related tests

1 files changed, 3 insertions, 10 deletions

diff --git a/actionmailer/test/log_subscriber_test.rb b/actionmailer/test/log_subscriber_test.rb
index ba9b4d6500..7d2e674a8c 100644
--- a/actionmailer/test/log_subscriber_test.rb
+++ b/actionmailer/test/log_subscriber_test.rb
@@ -11,13 +11,6 @@ class AMLogSubscriberTest < ActionMailer::TestCase
   end
 
   class TestMailer < ActionMailer::Base
-    def basic
-      recipients "somewhere@example.com"
-      subject    "basic"
-      from       "basic@example.com"
-      body       "Hello world"
-    end
-
     def receive(mail)
       # Do nothing
     end
@@ -28,12 +21,12 @@ class AMLogSubscriberTest < ActionMailer::TestCase
   end
 
   def test_deliver_is_notified
-    TestMailer.basic.deliver
+    BaseMailer.welcome.deliver
     wait
     assert_equal(1, @logger.logged(:info).size)
-    assert_match(/Sent mail to somewhere@example.com/, @logger.logged(:info).first)
+    assert_match(/Sent mail to system@test.lindsaar.net/, @logger.logged(:info).first)
     assert_equal(1, @logger.logged(:debug).size)
-    assert_match(/Hello world/, @logger.logged(:debug).first)
+    assert_match(/Welcome/, @logger.logged(:debug).first)
   end
 
   def test_receive_is_notified