diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-17 08:22:26 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-17 08:22:26 -0800 |
| commit | ae196e85ee7169700afac2eecdc276bc06b10b8d (patch) | |
| tree | ea504d00de22f81a34b84cd5852e5f1dd043cb7c /actionmailer/test | |
| parent | 5d77edf0cf1ed653ed3f7729d77eeb8de219d0b3 (diff) | |
| parent | 7c858b03a9de3c600594ca3c88540b14d835dd91 (diff) | |
| download | rails-ae196e85ee7169700afac2eecdc276bc06b10b8d.tar.gz rails-ae196e85ee7169700afac2eecdc276bc06b10b8d.tar.bz2 rails-ae196e85ee7169700afac2eecdc276bc06b10b8d.zip | |
Merge pull request #13341 from carlosantoniodasilva/ca-i18n
Default I18n.enforce_available_locales to true
We will default this option to true from now on to ensure users properly handle their list of available locales whenever necessary. This option was added as a security measure and thus Rails will follow it defaulting to secure option.
Also improve the handling of I18n config options in its railtie, taking the new enforce_available_locales option into account, by setting it as the last one in the process. This ensures no other configuration will trigger a deprecation warning due to that setting.
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index aa18c512c7..cf790c7487 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -20,6 +20,9 @@ ActionMailer::Base.send(:include, ActionView::Layouts) # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true +# Disable available locale checks to avoid warnings running the test suite. +I18n.enforce_available_locales = false + # Bogus template processors ActionView::Template.register_template_handler :haml, lambda { |template| "Look its HAML!".inspect } ActionView::Template.register_template_handler :bak, lambda { |template| "Lame backup".inspect } |