i18n: t() handles single keys returning an Array, also

1 files changed, 10 insertions, 0 deletions

diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 89acdc9dd3..1be418a206 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -18,6 +18,11 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert_equal expected, translate(:foo)
   end
 
+  def test_translation_returning_an_array
+    I18n.expects(:translate).with(:foo, :raise => true).returns(["foo", "bar"])
+    assert_equal ["foo", "bar"], translate(:foo)
+  end
+
   def test_delegates_localize_to_i18n
     @time = Time.utc(2008, 7, 8, 12, 18, 38)
     I18n.expects(:localize).with(@time)
@@ -50,4 +55,9 @@ class TranslationHelperTest < ActiveSupport::TestCase
     I18n.expects(:translate).with("hello_html", :raise => true).returns("<a>Hello World</a>")
     assert translate("hello_html").html_safe?
   end
+
+  def test_translation_returning_an_array_ignores_html_suffix
+    I18n.expects(:translate).with(:foo_html, :raise => true).returns(["foo", "bar"])
+    assert_equal ["foo", "bar"], translate(:foo_html)
+  end
 end