aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/template
diff options
context:
space:
mode:
authorBernard Potocki <bernard.potocki@imanel.org>2015-05-04 22:26:07 +0200
committerBernard Potocki <bernard.potocki@imanel.org>2015-05-04 22:26:07 +0200
commit9c8542bb12fac316253addf24e4fa2af34d33d7d (patch)
tree7d8349b748d772ee490b91e6b7ee1af06c41da33 /actionview/test/template
parent71669370ae789f547311821ab880b0f19682b405 (diff)
downloadrails-9c8542bb12fac316253addf24e4fa2af34d33d7d.tar.gz
rails-9c8542bb12fac316253addf24e4fa2af34d33d7d.tar.bz2
rails-9c8542bb12fac316253addf24e4fa2af34d33d7d.zip
Handle raise flag in translate when both main and default translation is missing. Fixes #19967
Diffstat (limited to 'actionview/test/template')
-rw-r--r--actionview/test/template/translation_helper_test.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb
index df096b3c3a..57b78112f9 100644
--- a/actionview/test/template/translation_helper_test.rb
+++ b/actionview/test/template/translation_helper_test.rb
@@ -157,6 +157,19 @@ class TranslationHelperTest < ActiveSupport::TestCase
assert_equal true, translation.html_safe?
end
+ def test_translate_with_missing_default
+ translation = translate(:'translations.missing', :default => :'translations.missing_html')
+ expected = '<span class="translation_missing" title="translation missing: en.translations.missing_html">Missing Html</span>'
+ assert_equal expected, translation
+ assert_equal true, translation.html_safe?
+ end
+
+ def test_translate_with_missing_default_and_raise_option
+ assert_raise(I18n::MissingTranslationData) do
+ translate(:'translations.missing', :default => :'translations.missing_html', :raise => true)
+ end
+ end
+
def test_translate_with_two_defaults_named_html
translation = translate(:'translations.missing', :default => [:'translations.missing_html', :'translations.hello_html'])
assert_equal '<a>Hello World</a>', translation