1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test

This commit is contained in:
Aaron Patterson 2011-03-21 10:00:30 -07:00
parent 1413c9b1d5
commit 55bf087da1

View file

@ -381,7 +381,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
end end
def test_render_utf8_template_with_incompatible_external_encoding def test_render_utf8_template_with_incompatible_external_encoding
with_external_encoding Encoding::SJIS do with_external_encoding Encoding::SHIFT_JIS do
begin begin
result = @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield") result = @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield")
flunk 'Should have raised incompatible encoding error' flunk 'Should have raised incompatible encoding error'
@ -392,7 +392,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
end end
def test_render_utf8_template_with_partial_with_incompatible_encoding def test_render_utf8_template_with_partial_with_incompatible_encoding
with_external_encoding Encoding::SJIS do with_external_encoding Encoding::SHIFT_JIS do
begin begin
result = @view.render(:file => "test/utf8_magic_with_bare_partial.html.erb", :layouts => "layouts/yield") result = @view.render(:file => "test/utf8_magic_with_bare_partial.html.erb", :layouts => "layouts/yield")
flunk 'Should have raised incompatible encoding error' flunk 'Should have raised incompatible encoding error'