diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-08 22:46:13 -0500 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-08 22:46:13 -0500 |
| commit | d87d3f76d547df7c956fe4fab324cad9396477ae (patch) | |
| tree | 528da2785d4b0ca8d43af0a11e28ad8140637b91 /actionpack/test/controller/test_test.rb | |
| parent | 8bfd5edbcf842c32c5fa60d109cf7f4cd9cf60b4 (diff) | |
| download | rails-d87d3f76d547df7c956fe4fab324cad9396477ae.tar.gz rails-d87d3f76d547df7c956fe4fab324cad9396477ae.tar.bz2 rails-d87d3f76d547df7c956fe4fab324cad9396477ae.zip | |
Ruby 1.9 compat: rescue Exception since minitest's assertion doesn't subclass StandardError
Diffstat (limited to 'actionpack/test/controller/test_test.rb')
| -rw-r--r-- | actionpack/test/controller/test_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |