@@ -11,12 +11,18 @@ module QuietBacktrace def filter_backtrace_with_cleaning(backtrace) backtrace = filter_backtrace_without_cleaning(backtrace) backtrace = backtrace.first.split("\n") if backtrace.size == 1 - cleaner = QuietBacktrace::BacktraceCleaner.new + cleaner = QuietBacktrace::BacktraceCleaner.new cleaner.clean(backtrace) end end end -Test::Unit::Util::BacktraceFilter.module_eval do - include QuietBacktrace::CleanerForTestUnit -end +Test::Unit::Util::BacktraceFilter.module_eval do + include QuietBacktrace::CleanerForTestUnit +end if defined?(Test::Unit::Util) + +module MiniTest + def self.filter_backtrace(backtrace) + QuietBacktrace::BacktraceCleaner.new.clean(backtrace) + end +end if defined?(MiniTest) lib/quietbacktrace.rb @@ -11,19 +11,22 @@ class RailsCleanerTest < Test::Unit::TestCase "rubygems/custom_require", "benchmark.rb", ":in `_run_erb_."].each do |each| test "silence #{each} noise" do - self.filter_backtrace(@backtrace.dup).each do |line| + cleaner.filter_backtrace(@backtrace.dup).each do |line| assert !line.include?(each), "#{each} noise is not being silenced: #{line}" end end end - + test "do not clean a legitimate line" do rails_app_line = "/Users/james/Documents/railsApps/generating_station/app/controllers/photos_controller.rb:315" - default_quiet_backtrace = self.filter_backtrace(@backtrace.dup) - - assert default_quiet_backtrace.join.include?(rails_app_line), + default_quiet_backtrace = cleaner.filter_backtrace(@backtrace.dup) + + assert default_quiet_backtrace.join.include?(rails_app_line), "Rails app line is being quieted: #{default_quiet_backtrace}" end - -end \ No newline at end of file + + def cleaner + defined?(MiniTest) ? MiniTest : self + end +end test/quietbacktrace_test.rb 9111eb99578c55846fcdb1a488fde6a9f9bbeef3 Damian Janowski damian.janowski@gmail.com http://github.com/thoughtbot/quietbacktrace/commit/cb8e610ca2ac2c62da61c0c6178b6d5f16a90036 cb8e610ca2ac2c62da61c0c6178b6d5f16a90036 2009-06-26T08:21:47-07:00 2009-06-15T17:35:16-07:00 Fix for Ruby 1.9. Signed-off-by: Dan Croak <dcroak@thoughtbot.com> f4e25a19f0624af48a98fbd8bb096af1c253e65b Dan Croak dcroak@thoughtbot.com