diff options
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/fixtures/test/array_translation.erb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/test/scoped_array_translation.erb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/translation_helper_test.rb | 29 |
3 files changed, 17 insertions, 16 deletions
diff --git a/actionpack/test/fixtures/test/array_translation.erb b/actionpack/test/fixtures/test/array_translation.erb index def3a1a0c1..bcdeea4c0d 100644 --- a/actionpack/test/fixtures/test/array_translation.erb +++ b/actionpack/test/fixtures/test/array_translation.erb @@ -1 +1 @@ -<%= t(['foo', 'bar', 'html']) %>
\ No newline at end of file +<% translation = t(['foo', 'bar', 'baz_html']) %><%= translation.first %>, <%= translation.second %>, <%= translation.third %>
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/scoped_array_translation.erb b/actionpack/test/fixtures/test/scoped_array_translation.erb index 0a0c79f717..cb07fca838 100644 --- a/actionpack/test/fixtures/test/scoped_array_translation.erb +++ b/actionpack/test/fixtures/test/scoped_array_translation.erb @@ -1 +1 @@ -<%= t(['.foo', '.bar']) %>
\ No newline at end of file +<%= t(['.foo', '.bar']).join(", ") %>
\ No newline at end of file diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb index b382b5eb22..395ba247a2 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,13 +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 "foobar", translate(["foo", "bar"]) + assert_equal ["foo", "bar"], 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", "html"], :raise => true).returns(['<a href="#">foo</a>', '<a href="#">bar</a>']) + 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) @view = ActionView::Base.new(ActionController::Base.view_paths, {}) + expected = '<a href="#">foo</a>, <a href="#">bar</a>, <a href="#">baz</a>' assert_equal expected, @view.render(:file => "test/array_translation") end @@ -35,31 +36,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.bar", :raise => true).returns(["foo", "bar"]) + I18n.expects(:translate).with(["test.scoped_array_translation.foo", "test.scoped_array_translation.bar"], :raise => true).returns(["foo", "bar"]) @view = ActionView::Base.new(ActionController::Base.view_paths, {}) - assert_equal "foobar", @view.render(:file => "test/scoped_array_translation") + assert_equal "foo, bar", @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 |