diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-21 10:00:30 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-21 10:00:30 -0700 |
| commit | 55bf087da1d93eda93f9b9632fc363fd4788bed2 (patch) | |
| tree | 6ea8dc38a35b60f9b72c93849f89ada7920a4f9a /actionpack/test | |
| parent | 1413c9b1d51414b72c4efb8583a3acae04a481dc (diff) | |
| download | rails-55bf087da1d93eda93f9b9632fc363fd4788bed2.tar.gz rails-55bf087da1d93eda93f9b9632fc363fd4788bed2.tar.bz2 rails-55bf087da1d93eda93f9b9632fc363fd4788bed2.zip | |
SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/render_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb index 034fb6c210..dd86bfed04 100644 --- a/actionpack/test/template/render_test.rb +++ b/actionpack/test/template/render_test.rb @@ -381,7 +381,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase end def test_render_utf8_template_with_incompatible_external_encoding - with_external_encoding Encoding::SJIS do + with_external_encoding Encoding::SHIFT_JIS do begin result = @view.render(:file => "test/utf8.html.erb", :layouts => "layouts/yield") flunk 'Should have raised incompatible encoding error' @@ -392,7 +392,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase end def test_render_utf8_template_with_partial_with_incompatible_encoding - with_external_encoding Encoding::SJIS do + with_external_encoding Encoding::SHIFT_JIS do begin result = @view.render(:file => "test/utf8_magic_with_bare_partial.html.erb", :layouts => "layouts/yield") flunk 'Should have raised incompatible encoding error' |