Make logging_test pass with the new base

3 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 18e5b3d96a..2b48b2cad5 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -68,7 +68,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     http_digest_authentication layout mime_responds
     record_identifier redirect render render_json render_xml
     send_file request_forgery_protection rescue url_rewriter
-    verification webservice
+    verification webservice logging
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
 end
diff --git a/actionpack/lib/action_controller/base/filter_parameter_logging.rb b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
index 8e012b2a25..f5a678ca03 100644
--- a/actionpack/lib/action_controller/base/filter_parameter_logging.rb
+++ b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
@@ -71,7 +71,7 @@ module ActionController
 
         if logger
           parameters = respond_to?(:filter_parameters) ? filter_parameters(params) : params.dup
-          parameters = parameters.except!(:controller, :action, :format, :_method)
+          parameters = parameters.except!(:controller, :action, :format, :_method, :only_path)
 
           unless parameters.empty?
             # TODO : Move DelayedLog to AS
diff --git a/actionpack/test/controller/logging_test.rb b/actionpack/test/controller/logging_test.rb
index 75afa2d133..a7ed1b8665 100644
--- a/actionpack/test/controller/logging_test.rb
+++ b/actionpack/test/controller/logging_test.rb
@@ -35,7 +35,7 @@ class LoggingTest < ActionController::TestCase
   end
 
   def test_logging_with_parameters
-    get :show, :id => 10
+    get :show, :id => '10'
     assert_equal 3, logs.size
 
     params = logs.detect {|l| l =~ /Parameters/ }
@@ -49,6 +49,6 @@ class LoggingTest < ActionController::TestCase
   end
   
   def logs
-    @logs ||= @controller.logger.logged.compact.map {|l| l.strip}
+    @logs ||= @controller.logger.logged.compact.map {|l| l.to_s.strip}
   end
 end