aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-20 01:58:01 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-20 01:58:01 -0800
commitfde9af06785cb871ad040a34b04380b28d9657c7 (patch)
treee1ca6142f8ce8549d513a0fcd088c1ebf0394eac /railties/test
parent23f6cabff1c6af1815a02f0dfd15f0316cd7f4d6 (diff)
parent10304a228d2b31a52c3e2e0efd83190f4d1d5e28 (diff)
downloadrails-fde9af06785cb871ad040a34b04380b28d9657c7.tar.gz
rails-fde9af06785cb871ad040a34b04380b28d9657c7.tar.bz2
rails-fde9af06785cb871ad040a34b04380b28d9657c7.zip
Merge pull request #4043 from cqpx/master
don't encode an UTF-8 encoded template
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/middleware/exceptions_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
index a9cde42be8..aedc4fe648 100644
--- a/railties/test/application/middleware/exceptions_test.rb
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -99,7 +99,7 @@ module ApplicationTests
app_file 'app/views/foo/index.html.erb', <<-ERB
<% raise 'boooom' %>
- ✓
+ ✓測試テスト시험
ERB
app_file 'config/routes.rb', <<-RUBY
@@ -110,6 +110,7 @@ module ApplicationTests
post '/foo', :utf8 => '✓'
assert_match(/boooom/, last_response.body)
+ assert_match(/測試テスト시험/, last_response.body)
end
end
end