diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-30 14:29:01 -0300 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-30 14:29:01 -0300 |
commit | d23687bb7fcf90940e6739aaf0ea4f648f8a8719 (patch) | |
tree | a7f817ab7dd8b5a85a12a40266dc23039cfd9bc2 /actionmailer | |
parent | 7e976fd84d7c4604575653774d7fe44738f8ef43 (diff) | |
parent | 5aa6c85c3b5e9bcb55679333c70c07f6faa1a88b (diff) | |
download | rails-d23687bb7fcf90940e6739aaf0ea4f648f8a8719.tar.gz rails-d23687bb7fcf90940e6739aaf0ea4f648f8a8719.tar.bz2 rails-d23687bb7fcf90940e6739aaf0ea4f648f8a8719.zip |
Merge pull request #24370 from yui-knk/suppress_warnings
Suppress warnings
Diffstat (limited to 'actionmailer')
-rw-r--r-- | actionmailer/test/i18n_with_controller_test.rb | 4 | ||||
-rw-r--r-- | actionmailer/test/url_test.rb | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb index 6124ffeb52..50c4b74eb8 100644 --- a/actionmailer/test/i18n_with_controller_test.rb +++ b/actionmailer/test/i18n_with_controller_test.rb @@ -25,7 +25,9 @@ end class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest Routes = ActionDispatch::Routing::RouteSet.new Routes.draw do - get ':controller(/:action(/:id))' + ActiveSupport::Deprecation.silence do + get ':controller(/:action(/:id))' + end end class RoutedRackApp diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb index 7928fe9542..70bd05055f 100644 --- a/actionmailer/test/url_test.rb +++ b/actionmailer/test/url_test.rb @@ -79,9 +79,11 @@ class ActionMailerUrlTest < ActionMailer::TestCase UrlTestMailer.delivery_method = :test AppRoutes.draw do - get ':controller(/:action(/:id))' - get '/welcome' => 'foo#bar', as: 'welcome' - get '/dummy_model' => 'foo#baz', as: 'dummy_model' + ActiveSupport::Deprecation.silence do + get ':controller(/:action(/:id))' + get '/welcome' => 'foo#bar', as: 'welcome' + get '/dummy_model' => 'foo#baz', as: 'dummy_model' + end end # string @@ -108,8 +110,10 @@ class ActionMailerUrlTest < ActionMailer::TestCase UrlTestMailer.delivery_method = :test AppRoutes.draw do - get ':controller(/:action(/:id))' - get '/welcome' => "foo#bar", as: "welcome" + ActiveSupport::Deprecation.silence do + get ':controller(/:action(/:id))' + get '/welcome' => "foo#bar", as: "welcome" + end end expected = new_mail |