From 1ceddd951449b8647dff7d2b4301477bc8b6b510 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 27 Feb 2009 12:18:45 -0800
Subject: Skip backtrace filter test when using minitest

---
 railties/test/backtrace_cleaner_test.rb | 44 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb
index 5955fd2856..bfb9cb7639 100644
--- a/railties/test/backtrace_cleaner_test.rb
+++ b/railties/test/backtrace_cleaner_test.rb
@@ -3,26 +3,30 @@ require 'abstract_unit'
 require 'initializer'
 require 'rails/backtrace_cleaner'
 
-class TestWithBacktrace
-  include Test::Unit::Util::BacktraceFilter
-  include Rails::BacktraceFilterForTestUnit
-end
-
-class BacktraceCleanerFilterTest < ActiveSupport::TestCase
-  def setup
-    @test = TestWithBacktrace.new
-    @backtrace = [ './test/rails/benchmark_test.rb', './test/rails/dependencies.rb', '/opt/local/lib/ruby/kernel.rb' ]
+if defined? Test::Unit::Util::BacktraceFilter
+  class TestWithBacktrace
+    include Test::Unit::Util::BacktraceFilter
+    include Rails::BacktraceFilterForTestUnit
   end
-  
-  test "test with backtrace should use the rails backtrace cleaner to clean" do
-    Rails.stubs(:backtrace_cleaner).returns(stub(:clean))
-    Rails.backtrace_cleaner.expects(:clean).with(@backtrace, nil)
-    @test.filter_backtrace(@backtrace)
-  end
-  
-  test "filter backtrace should have the same arity as Test::Unit::Util::BacktraceFilter" do
-    assert_nothing_raised do
-      @test.filter_backtrace(@backtrace, '/opt/local/lib')
+
+  class BacktraceCleanerFilterTest < ActiveSupport::TestCase
+    def setup
+      @test = TestWithBacktrace.new
+      @backtrace = [ './test/rails/benchmark_test.rb', './test/rails/dependencies.rb', '/opt/local/lib/ruby/kernel.rb' ]
+    end
+    
+    test "test with backtrace should use the rails backtrace cleaner to clean" do
+      Rails.stubs(:backtrace_cleaner).returns(stub(:clean))
+      Rails.backtrace_cleaner.expects(:clean).with(@backtrace, nil)
+      @test.filter_backtrace(@backtrace)
+    end
+    
+    test "filter backtrace should have the same arity as Test::Unit::Util::BacktraceFilter" do
+      assert_nothing_raised do
+        @test.filter_backtrace(@backtrace, '/opt/local/lib')
+      end
     end
   end
-end
\ No newline at end of file
+else
+  $stderr.puts 'No BacktraceFilter for minitest'
+end
-- 
cgit v1.2.3