aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/log_subscriber_test.rb
diff options
context:
space:
mode:
authorDoug Fales <doug@getharvest.com>2011-01-18 15:36:08 -0700
committerJosé Valim <jose.valim@gmail.com>2011-01-25 20:12:22 +0100
commit7927fc2ff77543a0ab151ac1cb3d60318e2dfa68 (patch)
treef71557b6757a43e05852cb5a3bbe6886d0e3a88b /actionpack/test/controller/log_subscriber_test.rb
parent59f3218463228ca2301857cd7bf4f82f308924a6 (diff)
downloadrails-7927fc2ff77543a0ab151ac1cb3d60318e2dfa68.tar.gz
rails-7927fc2ff77543a0ab151ac1cb3d60318e2dfa68.tar.bz2
rails-7927fc2ff77543a0ab151ac1cb3d60318e2dfa68.zip
A patch so that http status codes are still included in logs even during an exception [#6333 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/test/controller/log_subscriber_test.rb')
-rw-r--r--actionpack/test/controller/log_subscriber_test.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index cac0881133..21bbd83653 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -32,6 +32,11 @@ module Another
cache_page("Super soaker", "/index.html")
render :nothing => true
end
+
+ def with_exception
+ raise Exception
+ end
+
end
end
@@ -168,6 +173,16 @@ class ACLogSubscriberTest < ActionController::TestCase
ensure
@controller.config.perform_caching = true
end
+
+ def test_process_action_with_exception_includes_http_status_code
+ begin
+ get :with_exception
+ wait
+ rescue Exception => e
+ end
+ assert_equal 2, logs.size
+ assert_match(/Completed 500/, logs.last)
+ end
def logs
@logs ||= @logger.logged(:info)