Merge branch 'master' of github.com:lifo/docrails

1 files changed, 13 insertions, 3 deletions

diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 97777ccff0..d496dbb35e 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -111,18 +111,28 @@ class TranslationHelperTest < ActiveSupport::TestCase
   def test_translate_with_default_named_html
     translation = translate(:'translations.missing', :default => :'translations.hello_html')
     assert_equal '<a>Hello World</a>', translation
-    assert translation.html_safe?
+    assert_equal true, translation.html_safe?
   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
-    assert translation.html_safe?
+    assert_equal true, translation.html_safe?
   end
 
   def test_translate_with_last_default_named_html
     translation = translate(:'translations.missing', :default => [:'translations.missing', :'translations.hello_html'])
     assert_equal '<a>Hello World</a>', translation
-    assert translation.html_safe?
+    assert_equal true, translation.html_safe?
+  end
+
+  def test_translate_with_string_default
+    translation = translate(:'translations.missing', default: 'A Generic String')
+    assert_equal 'A Generic String', translation
+  end
+
+  def test_translate_with_array_of_string_defaults
+    translation = translate(:'translations.missing', default: ['A Generic String', 'Second generic string'])
+    assert_equal 'A Generic String', translation
   end
 end