diff options
| -rw-r--r-- | actionmailer/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 | ||||
| -rw-r--r-- | actionmailer/test/base_test.rb | 7 |
3 files changed, 0 insertions, 15 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index ebce32bf11..28a5c0ab71 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -5,11 +5,6 @@ *Yves Senn* -* Support `Mailer.deliver_foo(*args)` as a synonym for - `Mailer.foo(*args).deliver`. This makes it easy to write e.g. - `Mailer.expects(:deliver_foo)` when testing code that calls - the mailer. *Jon Leighton* - * Allow delivery method options to be set per mail instance *Aditya Sanghi* If your smtp delivery settings are dynamic, diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 4d1c697502..a66e81f1c3 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -142,7 +142,6 @@ module ActionMailer # for delivery later: # # Notifier.welcome(david).deliver # sends the email - # Notifier.deliver_welcome(david) # synonym for the former # mail = Notifier.welcome(david) # => a Mail::Message object # mail.deliver # sends the email # @@ -488,8 +487,6 @@ module ActionMailer def method_missing(method_name, *args) if action_methods.include?(method_name.to_s) QueuedMessage.new(queue, self, method_name, *args) - elsif method_name.to_s =~ /^deliver_(.+)$/ && action_methods.include?($1) - public_send($1, *args).deliver else super end 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 |