diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-10-30 18:43:57 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-10-30 18:43:57 +0000 |
| commit | 7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4 (patch) | |
| tree | 6db2b2e3a163a97547690724838a886e47f875e7 /actionmailer/test | |
| parent | e0fb16b92adb0d708e0a5bc258c76a367866eed2 (diff) | |
| download | rails-7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4.tar.gz rails-7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4.tar.bz2 rails-7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4.zip | |
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
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/base_test.rb | 7 |
1 files changed, 0 insertions, 7 deletions
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 |