TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Just rescue exception rather than checking for both miniunit and test/unit

Browse Source
This commit is contained in:
Jeremy Kemper 2008-11-07 13:00:13 -05:00
parent f12a2b4820
commit 728606df91
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activesupport/test/abstract_unit.rb
View File

@ -5,6 +5,7 @@
$:.unshift "#{File.dirname(__FILE__)}/../lib"
$:.unshift File.dirname(__FILE__)
require 'active_support'
require 'active_support/test_case'
if RUBY_VERSION < '1.9'
$KCODE = 'UTF8'

9
activesupport/test/test_test.rb
View File

@ -1,5 +1,4 @@
require 'abstract_unit'
require 'active_support/test_case'
class AssertDifferenceTest < ActiveSupport::TestCase
def setup
@ -66,10 +65,8 @@ def test_array_of_expressions_identify_failure
@object.increment
end
fail 'should not get to here'
rescue MiniTest::Assertion => e
rescue Exception => e
assert_equal "<3> expected but was\n<2>.", e.message
rescue Test::Unit::AssertionFailedError => e
assert_equal "<1 + 1> was the expression that failed.\n<3> expected but was\n<2>.", e.message
end
def test_array_of_expressions_identify_failure_when_message_provided
@ -77,10 +74,8 @@ def test_array_of_expressions_identify_failure_when_message_provided
@object.increment
end
fail 'should not get to here'
rescue MiniTest::Assertion => e
rescue Exception => e
assert_equal "something went wrong.\n<3> expected but was\n<2>.", e.message
rescue Test::Unit::AssertionFailedError => e
assert_equal "something went wrong.\n<1 + 1> was the expression that failed.\n<3> expected but was\n<2>.", e.message
end
else
def default_test; end