diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-04 16:25:50 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-04 22:34:15 -0200 |
| commit | 31a485fa5a843a766c4b889ee88a6c590a3a6ebb (patch) | |
| tree | 8450bb26acbe29d281de997bdbdb4721832530ea /actionpack/test | |
| parent | c82025fcd6f5da92448a1362b38c0a0a9e966a12 (diff) | |
| download | rails-31a485fa5a843a766c4b889ee88a6c590a3a6ebb.tar.gz rails-31a485fa5a843a766c4b889ee88a6c590a3a6ebb.tar.bz2 rails-31a485fa5a843a766c4b889ee88a6c590a3a6ebb.zip | |
Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_option
Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix.
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/translation_helper_test.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb index ebf0f892e6..96580a2b9a 100644 --- a/actionpack/test/template/translation_helper_test.rb +++ b/actionpack/test/template/translation_helper_test.rb @@ -52,6 +52,12 @@ class TranslationHelperTest < ActiveSupport::TestCase assert_equal false, translate(:"translations.missing", :rescue_format => nil).html_safe? end + def test_raises_missing_translation_message_with_raise_option + assert_raise(I18n::MissingTranslationData) do + translate(:"translations.missing", :raise => true) + end + end + def test_i18n_translate_defaults_to_nil_rescue_format expected = 'translation missing: en.translations.missing' assert_equal expected, I18n.translate(:"translations.missing") |