aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-07 13:26:28 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-07 13:26:28 -0500
commit00f72cf99d3653198a1e080964d396fbeb23e52e (patch)
tree6505bc9d4e503e7dedef1f193c03bfc2cbf7c64a /activesupport/lib
parentae9581e0f3961a8a9754db6588b24200d4c443a5 (diff)
downloadrails-00f72cf99d3653198a1e080964d396fbeb23e52e.tar.gz
rails-00f72cf99d3653198a1e080964d396fbeb23e52e.tar.bz2
rails-00f72cf99d3653198a1e080964d396fbeb23e52e.zip
Set AS::TestCase::Assertion to the underlying test exception for either miniunit or test/unit
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/test_case.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index b991f62a17..f47329d026 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -13,7 +13,9 @@ module ActiveSupport
require 'test/unit'
MiniTest::Unit.class_variable_set('@@installed_at_exit', autorun_enabled)
- class TestCase < ::Test::Unit::TestCase; end
+ class TestCase < ::Test::Unit::TestCase
+ Assertion = MiniTest::Assertion
+ end
# Test::Unit compatibility.
rescue LoadError
@@ -21,6 +23,7 @@ module ActiveSupport
require 'active_support/testing/default'
class TestCase < ::Test::Unit::TestCase
+ Assertion = Test::Unit::AssertionFailedError
include ActiveSupport::Testing::Default
end
end