Merge commit 'mainstream/master'

Conflicts:

	railties/doc/guides/html/actioncontroller_basics.html
	railties/doc/guides/html/activerecord_validations_callbacks.html
	railties/doc/guides/html/debugging_rails_applications.html
	railties/doc/guides/html/testing_rails_applications.html
	railties/doc/guides/source/actioncontroller_basics/methods.txt
	railties/doc/guides/source/actioncontroller_basics/params.txt
	railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt
	railties/doc/guides/source/actioncontroller_basics/session.txt
	railties/doc/guides/source/activerecord_validations_callbacks.txt
	railties/doc/guides/source/debugging_rails_applications.txt
	railties/doc/guides/source/testing_rails_applications.txt

1 files changed, 46 insertions, 0 deletions

diff --git a/actionpack/test/controller/logging_test.rb b/actionpack/test/controller/logging_test.rb
new file mode 100644
index 0000000000..3c936854dd
--- /dev/null
+++ b/actionpack/test/controller/logging_test.rb
@@ -0,0 +1,46 @@
+require 'abstract_unit'
+
+class LoggingController < ActionController::Base
+  def show
+    render :nothing => true
+  end
+end
+
+class LoggingTest < ActionController::TestCase
+  tests LoggingController
+
+  class MockLogger
+    attr_reader :logged
+    
+    def method_missing(method, *args)
+      @logged ||= []
+      @logged << args.first
+    end
+  end
+
+  setup :set_logger
+
+  def test_logging_without_parameters
+    get :show
+    assert_equal 2, logs.size
+    assert_nil logs.detect {|l| l =~ /Parameters/ }
+  end
+
+  def test_logging_with_parameters
+    get :show, :id => 10
+    assert_equal 3, logs.size
+
+    params = logs.detect {|l| l =~ /Parameters/ }
+    assert_equal 'Parameters: {"id"=>"10"}', params
+  end
+  
+  private
+
+  def set_logger
+    @controller.logger = MockLogger.new
+  end
+  
+  def logs
+    @logs ||= @controller.logger.logged.compact.map {|l| l.strip}
+  end
+end