2 files changed, 46 insertions, 40 deletions

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
diff --git a/railties/test/console_app_test.rb b/railties/test/console_app_test.rb
index 7a5de5af8f..f11de087e3 100644
--- a/railties/test/console_app_test.rb
+++ b/railties/test/console_app_test.rb
@@ -11,30 +11,32 @@ require 'dispatcher'
 require 'console_app'
 
 # console_app sets Test::Unit.run to work around the at_exit hook in test/unit, which kills IRB
-Test::Unit.run = false
-
-class ConsoleAppTest < Test::Unit::TestCase
-  def test_app_method_should_return_integration_session
-    assert_nothing_thrown do
-      console_session = app
-      assert_not_nil console_session
-      assert_instance_of ActionController::Integration::Session,
-        console_session
+if Test::Unit.respond_to?(:run=)
+  Test::Unit.run = false
+
+  class ConsoleAppTest < Test::Unit::TestCase
+    def test_app_method_should_return_integration_session
+      assert_nothing_thrown do
+        console_session = app
+        assert_not_nil console_session
+        assert_instance_of ActionController::Integration::Session,
+          console_session
+      end
     end
-  end
 
-  def test_reload_should_fire_preparation_callbacks
-    a = b = c = nil
+    def test_reload_should_fire_preparation_callbacks
+      a = b = c = nil
 
-    Dispatcher.to_prepare { a = b = c = 1 }
-    Dispatcher.to_prepare { b = c = 2 }
-    Dispatcher.to_prepare { c = 3 }
-    ActionController::Routing::Routes.expects(:reload)
+      Dispatcher.to_prepare { a = b = c = 1 }
+      Dispatcher.to_prepare { b = c = 2 }
+      Dispatcher.to_prepare { c = 3 }
+      ActionController::Routing::Routes.expects(:reload)
 
-    reload!
+      reload!
 
-    assert_equal 1, a
-    assert_equal 2, b
-    assert_equal 3, c
+      assert_equal 1, a
+      assert_equal 2, b
+      assert_equal 3, c
+    end
   end
 end