From 2b8eb5404e5545fb80eb6edf09c61bd5030034e8 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 24 May 2010 17:21:18 -0300
Subject: Revert "translation method for arrays on TranslationHelper module
 returns an array where values for keys of the form (.|_)html keys are
 html_safe"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7.

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 .../test/template/translation_helper_test.rb       | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'actionpack/test/template')

diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 395ba247a2..b382b5eb22 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -7,12 +7,12 @@ class TranslationHelperTest < ActiveSupport::TestCase
   attr_reader :request
   def setup
   end
-
+  
   def test_delegates_to_i18n_setting_the_raise_option
-    I18n.expects(:translate).with([:foo], :locale => 'en', :raise => true).returns([""])
+    I18n.expects(:translate).with(:foo, :locale => 'en', :raise => true).returns("")
     translate :foo, :locale => 'en'
   end
-
+  
   def test_returns_missing_translation_message_wrapped_into_span
     expected = '<span class="translation_missing">en, foo</span>'
     assert_equal expected, translate(:foo)
@@ -20,14 +20,13 @@ 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
-    translate_expected = ['<a href="#">foo</a>', '<a href="#">bar</a>', '<a href="#">baz</a>']
-    I18n.expects(:translate).with(["foo", "bar", "baz_html"], :raise => true).returns(translate_expected)
+    expected = '<a href="#">foo</a><a href="#">bar</a>'
+    I18n.expects(:translate).with(["foo", "bar", "html"], :raise => true).returns(['<a href="#">foo</a>', '<a href="#">bar</a>'])
     @view = ActionView::Base.new(ActionController::Base.view_paths, {})
-    expected = '&lt;a href=&quot;#&quot;&gt;foo&lt;/a&gt;, &lt;a href=&quot;#&quot;&gt;bar&lt;/a&gt;, <a href="#">baz</a>'
     assert_equal expected, @view.render(:file => "test/array_translation")
   end
 
@@ -36,31 +35,31 @@ class TranslationHelperTest < ActiveSupport::TestCase
     I18n.expects(:localize).with(@time)
     localize @time
   end
-
+  
   def test_scoping_by_partial
-    I18n.expects(:translate).with(["test.translation.helper"], :raise => true).returns(["helper"])
+    I18n.expects(:translate).with("test.translation.helper", :raise => true).returns("helper")
     @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", "test.scoped_array_translation.bar"], :raise => true).returns(["foo", "bar"])
+    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 "foo, bar", @view.render(:file => "test/scoped_array_translation")
+    assert_equal "foobar", @view.render(:file => "test/scoped_array_translation")
   end
-
+  
   def test_translate_does_not_mark_plain_text_as_safe_html
-    I18n.expects(:translate).with(["hello"], :raise => true).returns(["Hello World"])
+    I18n.expects(:translate).with("hello", :raise => true).returns("Hello World")
     assert_equal false, translate("hello").html_safe?
   end
 
   def test_translate_marks_translations_named_html_as_safe_html
-    I18n.expects(:translate).with(["html"], :raise => true).returns(["<a>Hello World</a>"])
+    I18n.expects(:translate).with("html", :raise => true).returns("<a>Hello World</a>")
     assert translate("html").html_safe?
   end
 
   def test_translate_marks_translations_with_a_html_suffix_as_safe_html
-    I18n.expects(:translate).with(["hello_html"], :raise => true).returns(["<a>Hello World</a>"])
+    I18n.expects(:translate).with("hello_html", :raise => true).returns("<a>Hello World</a>")
     assert translate("hello_html").html_safe?
   end
 end
-- 
cgit v1.2.3