Changes necessary to run the T::U tests with the rspec runner

2 files changed, 25 insertions, 8 deletions

diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb
index e33b4239ad..5ed4dd3f12 100644
--- a/actionpack/test/new_base/test_helper.rb
+++ b/actionpack/test/new_base/test_helper.rb
@@ -67,12 +67,21 @@ class Rack::TestCase < ActiveSupport::TestCase
     ActionController::Routing.use_controllers!(controllers)
   end
   
-  def self.describe(text)
-    class_eval <<-RUBY_EVAL
-      def self.name
-        "#{text}"
-      end
-    RUBY_EVAL
+  unless method_defined?(:describe)
+    def self.describe(text)
+      class_eval <<-RUBY_EVAL
+        def self.name
+          "#{text}"
+        end
+      RUBY_EVAL
+    end
+  end
+
+  if defined?(Spec)
+    class << self
+      undef test
+      alias_method :test, :it
+    end
   end
   
   def app
diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 245f57a7b0..780c1309f4 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -39,6 +39,14 @@ module ActiveSupport
         # 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)
@@ -52,7 +60,7 @@ module ActiveSupport
           @_result = result
           begin
             begin
-              run_callbacks :setup
+              # run_callbacks :setup
               setup
               __send__(@method_name)
               mocha_verify(assertion_counter) if using_mocha
@@ -66,7 +74,7 @@ module ActiveSupport
             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