diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-15 12:51:59 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-15 12:51:59 -0300 |
| commit | 3fce111b3bb602d0d65c76a450d0fa2d7c7b54a5 (patch) | |
| tree | e129008c0090b2b7f5b47b050f63ebfe4562c9e3 | |
| parent | ccdea7bc83417e9b9ee4843976fff93c5c7cee32 (diff) | |
| parent | 59dbf689606c35b6e32c565a56a6f616359c4e7e (diff) | |
| download | rails-3fce111b3bb602d0d65c76a450d0fa2d7c7b54a5.tar.gz rails-3fce111b3bb602d0d65c76a450d0fa2d7c7b54a5.tar.bz2 rails-3fce111b3bb602d0d65c76a450d0fa2d7c7b54a5.zip | |
Merge pull request #14745 from razum2um/plain-text-diagnostics
Display diagnostics in text format for xhr request
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb (renamed from actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb) | 0 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb | 9 | ||||
| -rw-r--r-- | actionpack/test/dispatch/debug_exceptions_test.rb | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb index f154021ae6..f154021ae6 100644 --- a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb +++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb new file mode 100644 index 0000000000..603de54b8b --- /dev/null +++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb @@ -0,0 +1,9 @@ +<%= @exception.class.to_s %><% + if @request.parameters['controller'] +%> in <%= @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%= @request.parameters['action'] %><% end %> +<% end %> + +<%= @exception.message %> +<%= render template: "rescues/_source" %> +<%= render template: "rescues/_trace" %> +<%= render template: "rescues/_request_and_response" %> diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb index 0dba651139..8660deb634 100644 --- a/actionpack/test/dispatch/debug_exceptions_test.rb +++ b/actionpack/test/dispatch/debug_exceptions_test.rb @@ -147,9 +147,10 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest get "/", {}, xhr_request_env assert_response 500 + assert_no_match(/<header>/, body) assert_no_match(/<body>/, body) assert_equal response.content_type, "text/plain" - assert_match(/puke/, body) + assert_match(/RuntimeError\npuke/, body) get "/not_found", {}, xhr_request_env assert_response 404 |