From d87d3f76d547df7c956fe4fab324cad9396477ae Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 8 Nov 2008 22:46:13 -0500 Subject: Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't subclass StandardError --- actionpack/test/controller/test_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/test/controller') diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index 02eb447f31..ee7b8ade8c 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -606,7 +606,7 @@ class CleanBacktraceTest < ActionController::TestCase def test_should_reraise_the_same_object exception = ActiveSupport::TestCase::Assertion.new('message') clean_backtrace { raise exception } - rescue => caught + rescue Exception => caught assert_equal exception.object_id, caught.object_id assert_equal exception.message, caught.message end @@ -616,7 +616,7 @@ class CleanBacktraceTest < ActionController::TestCase exception = ActiveSupport::TestCase::Assertion.new('message') exception.set_backtrace ["#{path}/abc", "#{path}/assertions/def"] clean_backtrace { raise exception } - rescue => caught + rescue Exception => caught assert_equal ["#{path}/abc"], caught.backtrace end -- cgit v1.2.3