From bd2bf5390d892a1c11bcaa2143f557b82611015e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 8 Apr 2010 19:27:22 -0700 Subject: Expect an incompatible encoding exception when a template doesn't have a magic comment and its source encoding doesn't match the default external encoding --- actionpack/test/fixtures/test/utf8.html.erb | 2 +- actionpack/test/fixtures/test/utf8_magic.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/test/fixtures') diff --git a/actionpack/test/fixtures/test/utf8.html.erb b/actionpack/test/fixtures/test/utf8.html.erb index 14fe12debc..551c24e354 100644 --- a/actionpack/test/fixtures/test/utf8.html.erb +++ b/actionpack/test/fixtures/test/utf8.html.erb @@ -1,4 +1,4 @@ -Русский текст +Русский <%= "текст" %> <%= "日".encoding %> <%= @output_buffer.encoding %> <%= __ENCODING__ %> diff --git a/actionpack/test/fixtures/test/utf8_magic.html.erb b/actionpack/test/fixtures/test/utf8_magic.html.erb index 58cd03b439..e2aa85e66a 100644 --- a/actionpack/test/fixtures/test/utf8_magic.html.erb +++ b/actionpack/test/fixtures/test/utf8_magic.html.erb @@ -1,5 +1,5 @@ <%# encoding: utf-8 -%> -Русский текст +Русский <%= "текст" %> <%= "日".encoding %> <%= @output_buffer.encoding %> <%= __ENCODING__ %> -- cgit v1.2.3