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>

1 files changed, 4 insertions, 6 deletions

diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb
index ffc5ef42aa..88df0ebbda 100644
--- a/railties/lib/rails/backtrace_cleaner.rb
+++ b/railties/lib/rails/backtrace_cleaner.rb
@@ -1,14 +1,13 @@
 module Rails
   class BacktraceCleaner < ActiveSupport::BacktraceCleaner
     ERB_METHOD_SIG = /:in `_run_erb_.*/
-    
+
     VENDOR_DIRS  = %w( vendor/plugins vendor/gems vendor/rails )
     MONGREL_DIRS = %w( lib/mongrel bin/mongrel )
     RAILS_NOISE  = %w( script/server )
     RUBY_NOISE   = %w( rubygems/custom_require benchmark.rb )
 
     ALL_NOISE    = VENDOR_DIRS + MONGREL_DIRS + RAILS_NOISE + RUBY_NOISE
-  
 
     def initialize
       super
@@ -18,15 +17,14 @@ module Rails
     end
   end
 
-
   # For installing the BacktraceCleaner in the test/unit
   module BacktraceFilterForTestUnit #:nodoc:
     def self.included(klass)
       klass.send :alias_method_chain, :filter_backtrace, :cleaning
     end
-  
-    def filter_backtrace_with_cleaning(backtrace)
-      backtrace = filter_backtrace_without_cleaning(backtrace)
+
+    def filter_backtrace_with_cleaning(backtrace, prefix=nil)
+      backtrace = filter_backtrace_without_cleaning(backtrace, prefix)
       backtrace = backtrace.first.split("\n") if backtrace.size == 1
       Rails.backtrace_cleaner.clean(backtrace)
     end