Resolve test/unit load ordering by removing backtrace filter from boot initializers

This commit is contained in:
Jeremy Kemper 2010-02-11 09:01:33 -08:00
parent 523002fe16
commit 8afcd33246
3 changed files with 8 additions and 11 deletions

View File

@ -1,6 +1,5 @@
ENV["RAILS_ENV"] = "test"
require 'test/unit'
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
class ActiveSupport::TestCase

View File

@ -5,6 +5,12 @@ exit("Abort testing: Your Rails environment is not running in test mode!") unles
require 'test/unit'
require 'active_support/core_ext/kernel/requires'
# TODO: Figure out how to get the Rails::BacktraceFilter into minitest/unit
if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil?
require 'rails/backtrace_cleaner'
Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit }
end
if defined?(ActiveRecord)
class ActiveSupport::TestCase
include ActiveRecord::TestFixtures

View File

@ -13,13 +13,5 @@ module Rails
rake_tasks do
load "rails/test_unit/testing.rake"
end
initializer "test_unit.backtrace_cleaner" do
# TODO: Figure out how to get the Rails::BacktraceFilter into minitest/unit
if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil?
require 'rails/backtrace_cleaner'
Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit }
end
end
end
end
end