aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-22 18:19:42 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-22 19:19:12 -0800
commit51383c57a2f556d1ea44c93deb68e7b70f8c6e35 (patch)
tree360fdfe7303e935309a80c8297e78e9f556a66a5 /actionpack/test/controller
parenta75354fae11957b212ac550483208469f3935d4a (diff)
downloadrails-51383c57a2f556d1ea44c93deb68e7b70f8c6e35.tar.gz
rails-51383c57a2f556d1ea44c93deb68e7b70f8c6e35.tar.bz2
rails-51383c57a2f556d1ea44c93deb68e7b70f8c6e35.zip
MiniTest compat: don't check for test/unit's assertion in particular
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/resources_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index d5e8a3ae4a..541e8270c9 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1240,7 +1240,7 @@ class ResourcesTest < ActionController::TestCase
end
def assert_not_recognizes(expected_options, path)
- assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Test::Unit::AssertionFailedError do
+ assert_raise ActionController::RoutingError, ActionController::MethodNotAllowed, Assertion do
assert_recognizes(expected_options, path)
end
end