1 files changed, 112 insertions, 7 deletions
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index 3045a07ad6..5e87744f6b 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -10,6 +10,8 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       @closed = false
     end
 
+    # We're obliged to implement this (even though it doesn't actually
+    # get called here) to properly comply with the Rack SPEC
     def each
     end
 
@@ -17,6 +19,10 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       @closed = true
     end
 
+    def method_that_raises
+      raise StandardError.new 'error in framework'
+    end
+
     def call(env)
       env['action_dispatch.show_detailed_exceptions'] = @detailed
       req = ActionDispatch::Request.new(env)
@@ -37,12 +43,28 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
         raise ActionController::InvalidAuthenticityToken
       when "/not_found_original_exception"
         raise ActionView::Template::Error.new('template', AbstractController::ActionNotFound.new)
+      when "/missing_template"
+        raise ActionView::MissingTemplate.new(%w(foo), 'foo/index', %w(foo), false, 'mailer')
       when "/bad_request"
         raise ActionController::BadRequest
       when "/missing_keys"
         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
+      when "/framework_raises"
+        method_that_raises
       else
         raise "puke!"
       end
@@ -100,6 +122,15 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     assert_no_match '&lt;|&gt;', routing_table, "there should not be escaped html in the output"
   end
 
+  test 'displays request and response info when a RoutingError occurs' do
+    @app = DevelopmentApp
+
+    get "/pass", {}, {'action_dispatch.show_exceptions' => true}
+
+    assert_select 'h2', /Request/
+    assert_select 'h2', /Response/
+  end
+
   test "rescue with diagnostics message" do
     @app = DevelopmentApp
 
@@ -134,38 +165,39 @@ 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_equal "text/plain", response.content_type
+    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_equal "text/plain", response.content_type
     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_equal "text/plain", response.content_type
     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_equal "text/plain", response.content_type
     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_equal "text/plain", response.content_type
     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_equal "text/plain", response.content_type
     assert_match(/ActionController::ParameterMissing/, body)
   end
 
@@ -242,4 +274,77 @@ 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 on template missing errors' do
+    @app = DevelopmentApp
+
+    get "/missing_template", nil, {}
+
+    assert_select "header h1", /Template is missing/
+
+    assert_select "#container h2", /^Missing template/
+
+    assert_select '#Application-Trace'
+    assert_select '#Framework-Trace'
+    assert_select '#Full-Trace'
+
+    assert_select 'h2', /Request/
+  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
+
+  test 'debug exceptions app shows user code that caused the error in source view' do
+    @app = DevelopmentApp
+    Rails.stubs(:root).returns(Pathname.new('.'))
+    cleaner = ActiveSupport::BacktraceCleaner.new.tap do |bc|
+      bc.add_silencer { |line| line =~ /method_that_raises/ }
+      bc.add_silencer { |line| line !~ %r{test/dispatch/debug_exceptions_test.rb} }
+    end
+
+    get '/framework_raises', {}, {'action_dispatch.backtrace_cleaner' => cleaner}
+
+    # Assert correct error
+    assert_response 500
+    assert_select 'h2', /error in framework/
+
+    # assert source view line is the call to method_that_raises
+    assert_select 'div.source:not(.hidden)' do
+      assert_select 'pre .line.active', /method_that_raises/
+    end
+
+    # assert first source view (hidden) that throws the error
+    assert_select 'div.source:first' do
+      assert_select 'pre .line.active', /raise StandardError\.new/
+    end
+
+    # assert application trace refers to line that calls method_that_raises is first
+    assert_select '#Application-Trace' do
+      assert_select 'pre code a:first', %r{test/dispatch/debug_exceptions_test\.rb:\d+:in `call}
+    end
+
+    # assert framework trace that that threw the error is first
+    assert_select '#Framework-Trace' do
+      assert_select 'pre code a:first', /method_that_raises/
+    end
+  end
 end