Merge remote branch 'rails/master'

1 files changed, 14 insertions, 1 deletions

diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 699fb2f5bc..6782bf06d4 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -20,7 +20,14 @@ class TranslationHelperTest < ActiveSupport::TestCase
 
   def test_translation_of_an_array
     I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", "bar"])
-    assert_equal ["foo", "bar"], translate(["foo", "bar"])
+    assert_equal "foobar", translate(["foo", "bar"])
+  end
+
+  def test_translation_of_an_array_with_html
+    expected = '<a href="#">foo</a><a href="#">bar</a>'
+    I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(['<a href="#">foo</a>', '<a href="#">bar</a>'])
+    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+    assert_equal expected, @view.render(:file => "test/array_translation")
   end
 
   def test_delegates_localize_to_i18n
@@ -34,4 +41,10 @@ class TranslationHelperTest < ActiveSupport::TestCase
     @view = ActionView::Base.new(ActionController::Base.view_paths, {})
     assert_equal "helper", @view.render(:file => "test/translation")
   end
+
+  def test_scoping_by_partial_of_an_array
+    I18n.expects(:translate).with("test.scoped_array_translation.foo.bar", :raise => true).returns(["foo", "bar"])
+    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+    assert_equal "foobar", @view.render(:file => "test/scoped_array_translation")
+  end
 end