aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorKouhei Sutou <kou@clear-code.com>2015-01-02 19:59:53 -0800
committerAman Gupta <aman@tmm1.net>2015-01-02 20:00:27 -0800
commite4a2396942d1479b254cee95a31a00a2853770bb (patch)
treea1743ab8e19e6dca27374eb13df7b1b66ffadbf0 /actionpack/test
parent4d70f97af49ebcf316bc38883ec076603f610d84 (diff)
downloadrails-e4a2396942d1479b254cee95a31a00a2853770bb.tar.gz
rails-e4a2396942d1479b254cee95a31a00a2853770bb.tar.bz2
rails-e4a2396942d1479b254cee95a31a00a2853770bb.zip
switch to minitest and test-unit compatible assert_raise syntax
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/template/template_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index b7f785fe3a..f73024fc54 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -179,10 +179,11 @@ class TestERBTemplate < ActiveSupport::TestCase
end
def test_error_when_template_isnt_valid_utf8
- assert_raises(ActionView::Template::Error, /\xFC/) do
+ exception = assert_raise(ActionView::Template::Error) do
@template = new_template("hello \xFCmlat", :virtual_path => nil)
render
end
+ assert_match(/\xFC/, exception.message)
end
def with_external_encoding(encoding)