diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-22 09:34:33 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-22 09:34:33 -0700 |
commit | 2ef6270f8fbbefba8d4f10504497e198d8e7deea (patch) | |
tree | a90b640a9e59306e92fc4bcc2ab58d08b0341e23 /actionpack/test/template/render_test.rb | |
parent | 6ab65bec611247bbd1dd62da0ee8c4dc44b37ec1 (diff) | |
parent | 2ddfdba9a0dab7d8499c3ad0d13583bddbac4f69 (diff) | |
download | rails-2ef6270f8fbbefba8d4f10504497e198d8e7deea.tar.gz rails-2ef6270f8fbbefba8d4f10504497e198d8e7deea.tar.bz2 rails-2ef6270f8fbbefba8d4f10504497e198d8e7deea.zip |
Merge branch 'master' into fuuu
* master:
Do not show optional (.:format) block for wildcard route [#6605 state:resolved]
pushing id insertion and prefetch primary keys down to Relation#insert
use prepared statements to fetch the last insert id
escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved]
schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved]
Reapply extensions when using except and only
SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test
Improved resolver docs a bit
[action_view] docs for FileSystemResolver
[action_view] added custom patterns to template resolver
Diffstat (limited to 'actionpack/test/template/render_test.rb')
-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' |