diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-10 16:14:10 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-10 16:14:10 -0800 |
commit | 8cd486da807d1b15b8ba4a049a79df6c47c56bd4 (patch) | |
tree | fd044bd090e5a0b859bb90a0974095a193a2f4ad /actionpack | |
parent | d8fd0499bfd6edc676ff3fbffc327656f6d5c320 (diff) | |
download | rails-8cd486da807d1b15b8ba4a049a79df6c47c56bd4.tar.gz rails-8cd486da807d1b15b8ba4a049a79df6c47c56bd4.tar.bz2 rails-8cd486da807d1b15b8ba4a049a79df6c47c56bd4.zip |
test-unit 2 compat: assert_raise doesn't support regexp second arg to match exception message
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/test/abstract/layouts_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/controller/new_base/render_action_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb index 9c29696ad5..ae2f1bf1f2 100644 --- a/actionpack/test/abstract/layouts_test.rb +++ b/actionpack/test/abstract/layouts_test.rb @@ -212,7 +212,7 @@ module AbstractControllerTests end test "when the layout is specified as a symbol and the method doesn't exist, raise an exception" do - assert_raises(NoMethodError, /:nilz/) { WithSymbolAndNoMethod.new.process(:index) } + assert_raises(NoMethodError) { WithSymbolAndNoMethod.new.process(:index) } end test "when the layout is specified as a symbol and the method returns something besides a string/false/nil, raise an exception" do diff --git a/actionpack/test/controller/new_base/render_action_test.rb b/actionpack/test/controller/new_base/render_action_test.rb index ecd29c4530..239f68659c 100644 --- a/actionpack/test/controller/new_base/render_action_test.rb +++ b/actionpack/test/controller/new_base/render_action_test.rb @@ -86,7 +86,7 @@ module RenderAction describe "Both <controller_path>.html.erb and application.html.erb are missing" test "rendering with layout => true" do - assert_raise(ArgumentError, /no default layout for RenderAction::BasicController in/) do + assert_raise(ArgumentError) do get "/render_action/basic/hello_world_with_layout", {}, "action_dispatch.show_exceptions" => false end end |