diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-08 19:27:22 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-08 19:27:39 -0700 |
| commit | bd2bf5390d892a1c11bcaa2143f557b82611015e (patch) | |
| tree | 4300e2b76a33e0d35b2d1784829127e39be5a4c8 /actionpack/test/fixtures | |
| parent | fd7202a75653570693c6fe423faad96019fe0ea1 (diff) | |
| download | rails-bd2bf5390d892a1c11bcaa2143f557b82611015e.tar.gz rails-bd2bf5390d892a1c11bcaa2143f557b82611015e.tar.bz2 rails-bd2bf5390d892a1c11bcaa2143f557b82611015e.zip | |
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
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/test/utf8.html.erb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/test/utf8_magic.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
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__ %> |