diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-29 12:55:51 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-29 12:55:51 -0300 |
| commit | ff47e45d14737ac20a69089a3c7f54cb7e8dc47a (patch) | |
| tree | ac236bf8607c6feae7bda5e60a6f9409fadaface | |
| parent | 45c91e794abc45f5f440ab9f6ee78137e48a5dec (diff) | |
| parent | 6149444685712db929cabeedc71a1255eff7fefc (diff) | |
| download | rails-ff47e45d14737ac20a69089a3c7f54cb7e8dc47a.tar.gz rails-ff47e45d14737ac20a69089a3c7f54cb7e8dc47a.tar.bz2 rails-ff47e45d14737ac20a69089a3c7f54cb7e8dc47a.zip | |
Merge pull request #21056 from yui-knk/fix/deprecation_silence
Make silence a warning inserted by commit #4b3f8ac
| -rw-r--r-- | actionmailer/test/i18n_with_controller_test.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb index 010e44d045..5ffde06a80 100644 --- a/actionmailer/test/i18n_with_controller_test.rb +++ b/actionmailer/test/i18n_with_controller_test.rb @@ -1,6 +1,7 @@ require 'abstract_unit' require 'action_view' require 'action_controller' +require 'active_support/deprecation' class I18nTestMailer < ActionMailer::Base configure do |c| @@ -54,7 +55,9 @@ class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest def test_send_mail Mail::SMTP.any_instance.expects(:deliver!) with_translation 'de', email_subject: '[Anmeldung] Willkommen' do - get '/test/send_mail' + ActiveSupport::Deprecation.silence do + get '/test/send_mail' + end assert_equal "Mail sent - Subject: [Anmeldung] Willkommen", @response.body end end |