Revert rspec-runner change. TODO: Add back support for the rspec T::U runner.

Author: wycats

activesupport/lib/active_support/testing/setup_and_teardown.rb

@@ -10,6 +10,8 @@ def self.included(base)
 
           if defined? MiniTest
             include ForMiniTest
+          elsif defined? Spec
+            include ForRspec
           else
             include ForClassicTestUnit
           end
@@ -34,19 +36,11 @@ def run(runner)
           result
         end
       end
-
+      
       module ForClassicTestUnit
         # For compatibility with Ruby < 1.8.6
         PASSTHROUGH_EXCEPTIONS = Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS rescue [NoMemoryError, SignalException, Interrupt, SystemExit]
 
-        def setup
-          run_callbacks :setup
-        end
-
-        def teardown
-          run_callbacks :teardown, :enumerator => :reverse_each
-        end
-
         # This redefinition is unfortunate but test/unit shows us no alternative.
         # Doubly unfortunate: hax to support Mocha's hax.
         def run(result)
@@ -60,7 +54,7 @@ def run(result)
           @_result = result
           begin
             begin
-              # run_callbacks :setup
+              run_callbacks :setup
               setup
               __send__(@method_name)
               mocha_verify(assertion_counter) if using_mocha
@@ -74,7 +68,7 @@ def run(result)
             ensure
               begin
                 teardown
-                # run_callbacks :teardown, :enumerator => :reverse_each
+                run_callbacks :teardown, :enumerator => :reverse_each
               rescue Test::Unit::AssertionFailedError => e
                 add_failure(e.message, e.backtrace)
               rescue Exception => e