github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Rewrite AS::TestCase setup/teardown as a single callback chain"

Browse Source 
This reverts commit 610e94c097.
This commit is contained in:
Jeremy Kemper
2009-10-14 16:12:09 -07:00
parent d5d242660c
commit efdc062454
1 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
activesupport/lib/active_support/testing/setup_and_teardown.rb
View File

@@ -6,7 +6,7 @@ module ActiveSupport
extend ClassMethods
include ActiveSupport::Callbacks
define_callbacks :test
define_callbacks :setup, :teardown
if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
include ForMiniTest
@@ -18,15 +18,11 @@ module ActiveSupport
module ClassMethods
def setup(*args, &block)
set_callback(:test, :before, *args, &block)
set_callback(:setup, *args, &block)
end
def teardown(*args, &block)
set_callback(:test, :after, *args, &block)
end
def wrap(*args, &block)
set_callback(:test, :around, *args, &block)
set_callback(:teardown, *args, &block)
end
end
@@ -34,15 +30,16 @@ module ActiveSupport
def run(runner)
result = '.'
begin
run_callbacks :test do
begin
result = super
rescue Exception => e
result = runner.puke(self.class, self.name, e)
end
end
run_callbacks :setup
result = super
rescue Exception => e
result = runner.puke(self.class, self.name, e)
ensure
begin
run_callbacks :teardown, :enumerator => :reverse_each
rescue Exception => e
result = runner.puke(self.class, self.name, e)
end
end
result
end
@@ -70,27 +67,27 @@ module ActiveSupport
@_result = result
begin
begin
run_callbacks :test do
begin
setup
__send__(@method_name)
mocha_verify(assertion_counter) if using_mocha
rescue Mocha::ExpectationError => e
add_failure(e.message, e.backtrace)
rescue Test::Unit::AssertionFailedError => e
add_failure(e.message, e.backtrace)
rescue Exception => e
raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
add_error(e)
ensure
teardown
end
end
run_callbacks :setup
setup
__send__(@method_name)
mocha_verify(assertion_counter) if using_mocha
rescue Mocha::ExpectationError => e
add_failure(e.message, e.backtrace)
rescue Test::Unit::AssertionFailedError => e
add_failure(e.message, e.backtrace)
rescue Exception => e
raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
add_error(e)
ensure
begin
teardown
run_callbacks :teardown, :enumerator => :reverse_each
rescue Test::Unit::AssertionFailedError => e
add_failure(e.message, e.backtrace)
rescue Exception => e
raise if PASSTHROUGH_EXCEPTIONS.include?(e.class)
add_error(e)
end
end
ensure
mocha_teardown if using_mocha