From 7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 30 Oct 2012 18:43:57 +0000
Subject: Revert "Support `Mailer.deliver_foo(*args)` as a synonym for
`Mailer.foo(*args).deliver`."
This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8.
Conflicts:
actionmailer/CHANGELOG.md
See discussion at
https://github.com/rails/rails/commit/7e0cf563639bc7508da381b1b8321c7a89be1aa8#commitcomment-2075489
---
actionmailer/test/base_test.rb | 7 -------
1 file changed, 7 deletions(-)
(limited to 'actionmailer/test')
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index b30ec2ddc9..b07b352082 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -668,13 +668,6 @@ class BaseTest < ActiveSupport::TestCase
assert_equal ["robert.pankowecki@gmail.com"], DefaultFromMailer.welcome.from
end
- test "Mailer.deliver_welcome calls Mailer.welcome.deliver" do
- BaseMailer.deliveries.clear
- BaseMailer.deliver_welcome(subject: 'omg')
- assert_equal 1, BaseMailer.deliveries.length
- assert_equal 'omg', BaseMailer.deliveries.first.subject
- end
-
protected
# Execute the block setting the given values and restoring old values after
--
cgit v1.2.3