Accept a prefix argument to filter_backtrace_with_cleaning [#1456 state:committed]

Add a prefix argument to filter_backtrace_with_cleaning so it has
the same arity as test/unit's filter_backtrace.

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>

2 files changed, 30 insertions, 1 deletions

diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 516ab8523e..b6edc03391 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -9,6 +9,7 @@ gem 'mocha', '>= 0.9.3'
 require 'mocha'
 require 'stringio'
 require 'active_support'
+require 'active_support/test_case'
 
 def uses_mocha(test_name)
   yield
@@ -18,4 +19,4 @@ if defined?(RAILS_ROOT)
   RAILS_ROOT.replace File.dirname(__FILE__)
 else
   RAILS_ROOT = File.dirname(__FILE__)
-end
+end
\ No newline at end of file
diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb
new file mode 100644
index 0000000000..5955fd2856
--- /dev/null
+++ b/railties/test/backtrace_cleaner_test.rb
@@ -0,0 +1,28 @@
+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' ]
+  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
\ No newline at end of file