just mix the run method in for minitest

This commit is contained in:
Aaron Patterson 2012-01-05 15:35:38 -08:00
parent 0579f303ec
commit 579acb49df
1 changed files with 11 additions and 14 deletions

View File

@ -10,7 +10,6 @@ module ActiveSupport
include ActiveSupport::Callbacks
define_callbacks :setup, :teardown
include ForMiniTest
end
module ClassMethods
@ -23,24 +22,22 @@ module ActiveSupport
end
end
module ForMiniTest
def run(runner)
result = '.'
def run(runner)
result = '.'
begin
run_callbacks :setup do
result = super
end
rescue Exception => e
result = runner.puke(self.class, method_name, e)
ensure
begin
run_callbacks :setup do
result = super
end
run_callbacks :teardown
rescue Exception => e
result = runner.puke(self.class, method_name, e)
ensure
begin
run_callbacks :teardown
rescue Exception => e
result = runner.puke(self.class, method_name, e)
end
end
result
end
result
end
end