diff options
Diffstat (limited to 'actionmailer')
-rw-r--r-- | actionmailer/CHANGELOG.md | 20 | ||||
-rw-r--r-- | actionmailer/test/asset_host_test.rb | 1 | ||||
-rw-r--r-- | actionmailer/test/url_test.rb | 9 |
3 files changed, 11 insertions, 19 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 487e57be7b..975f61fa58 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -26,19 +26,19 @@ *Boris Staal* * Explicit multipart messages no longer set the order of the MIME parts. + *Nate Berkopec* -* Do not render views when mail() isn't called. - Fixes #7761. +* Do not render views when `mail` isn't called. Fixes #7761. *Yves Senn* -* Allow delivery method options to be set per mail instance *Aditya Sanghi* +* Allow delivery method options to be set per mail instance. - If your smtp delivery settings are dynamic, - you can now override settings per mail instance for e.g. + If your SMTP delivery settings are dynamic, you can now override settings + per mail instance for e.g. - def my_mailer(user,company) + def my_mailer(user, company) mail to: user.email, subject: "Welcome!", delivery_method_options: { user_name: company.smtp_user, password: company.smtp_password } @@ -47,14 +47,16 @@ This will ensure that your default SMTP settings will be overridden by the company specific ones. You only have to override the settings that are dynamic and leave the static setting in your environment - configuration file (e.g. config/environments/production.rb) + configuration file (e.g. `config/environments/production.rb`). + + *Aditya Sanghi* -* Allow to set default Action Mailer options via `config.action_mailer.default_options=` *Robert Pankowecki* +* Allow to set default Action Mailer options via `config.action_mailer.default_options=`. *Robert Pankowecki* * Raise an `ActionView::MissingTemplate` exception when no implicit template could be found. *Damien Mathieu* * Allow callbacks to be defined in mailers similar to `ActionController::Base`. You can configure default settings, headers, attachments, delivery settings or change delivery using - `before_filter`, `after_filter` etc. *Justin S. Leitgeb* + `before_filter`, `after_filter`, etc. *Justin S. Leitgeb* Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionmailer/CHANGELOG.md) for previous changes. diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/asset_host_test.rb index 32ae76a7c5..00f1348a53 100644 --- a/actionmailer/test/asset_host_test.rb +++ b/actionmailer/test/asset_host_test.rb @@ -16,7 +16,6 @@ class AssetHostTest < ActiveSupport::TestCase ActionMailer::Base.deliveries.clear AssetHostMailer.configure do |c| c.asset_host = "http://www.example.com" - c.assets_dir = '' end end diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb index dcd80f46b5..589944fa69 100644 --- a/actionmailer/test/url_test.rb +++ b/actionmailer/test/url_test.rb @@ -41,18 +41,9 @@ class ActionMailerUrlTest < ActionMailer::TestCase end def setup - set_delivery_method :test - ActionMailer::Base.perform_deliveries = true - ActionMailer::Base.deliveries.clear - ActiveSupport::Deprecation.silenced = false - @recipient = 'test@localhost' end - def teardown - restore_delivery_method - end - def test_signed_up_with_url UrlTestMailer.delivery_method = :test |