1 files changed, 77 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index ff0baccd76..8660deb634 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -43,6 +43,19 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
         raise ActionController::UrlGenerationError, "No route matches"
       when "/parameter_missing"
         raise ActionController::ParameterMissing, :missing_param_key
+      when "/original_syntax_error"
+        eval 'broke_syntax =' # `eval` need for raise native SyntaxError at runtime
+      when "/syntax_error_into_view"
+        begin
+          eval 'broke_syntax ='
+        rescue Exception => e
+          template = ActionView::Template.new(File.read(__FILE__),
+                                              __FILE__,
+                                              ActionView::Template::Handlers::Raw.new,
+                                              {})
+          raise ActionView::Template::Error.new(template, e)
+        end
+
       else
         raise "puke!"
       end
@@ -128,6 +141,48 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     assert_match(/ActionController::ParameterMissing/, body)
   end
 
+  test "rescue with text error for xhr request" do
+    @app = DevelopmentApp
+    xhr_request_env = {'action_dispatch.show_exceptions' => true, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest'}
+
+    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(/RuntimeError\npuke/, body)
+
+    get "/not_found", {}, xhr_request_env
+    assert_response 404
+    assert_no_match(/<body>/, body)
+    assert_equal response.content_type, "text/plain"
+    assert_match(/#{AbstractController::ActionNotFound.name}/, body)
+
+    get "/method_not_allowed", {}, xhr_request_env
+    assert_response 405
+    assert_no_match(/<body>/, body)
+    assert_equal response.content_type, "text/plain"
+    assert_match(/ActionController::MethodNotAllowed/, body)
+
+    get "/unknown_http_method", {}, xhr_request_env
+    assert_response 405
+    assert_no_match(/<body>/, body)
+    assert_equal response.content_type, "text/plain"
+    assert_match(/ActionController::UnknownHttpMethod/, body)
+
+    get "/bad_request", {}, xhr_request_env
+    assert_response 400
+    assert_no_match(/<body>/, body)
+    assert_equal response.content_type, "text/plain"
+    assert_match(/ActionController::BadRequest/, body)
+
+    get "/parameter_missing", {}, xhr_request_env
+    assert_response 400
+    assert_no_match(/<body>/, body)
+    assert_equal response.content_type, "text/plain"
+    assert_match(/ActionController::ParameterMissing/, body)
+  end
+
   test "does not show filtered parameters" do
     @app = DevelopmentApp
 
@@ -201,4 +256,26 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     get "/", {}, env
     assert_operator((output.rewind && output.read).lines.count, :>, 10)
   end
+
+  test 'display backtrace when error type is SyntaxError' do
+    @app = DevelopmentApp
+
+    get '/original_syntax_error', {}, {'action_dispatch.backtrace_cleaner' => ActiveSupport::BacktraceCleaner.new}
+
+    assert_response 500
+    assert_select '#Application-Trace' do
+      assert_select 'pre code', /\(eval\):1: syntax error, unexpected/
+    end
+  end
+
+  test 'display backtrace when error type is SyntaxError wrapped by ActionView::Template::Error' do
+    @app = DevelopmentApp
+
+    get '/syntax_error_into_view', {}, {'action_dispatch.backtrace_cleaner' => ActiveSupport::BacktraceCleaner.new}
+
+    assert_response 500
+    assert_select '#Application-Trace' do
+      assert_select 'pre code', /\(eval\):1: syntax error, unexpected/
+    end
+  end
 end