1 files changed, 49 insertions, 7 deletions
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index 8660deb634..f8851f0152 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)
@@ -55,7 +61,8 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
                                               {})
           raise ActionView::Template::Error.new(template, e)
         end
-
+      when "/framework_raises"
+        method_that_raises
       else
         raise "puke!"
       end
@@ -149,37 +156,37 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     assert_response 500
     assert_no_match(/<header>/, body)
     assert_no_match(/<body>/, body)
-    assert_equal response.content_type, "text/plain"
+    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
 
@@ -278,4 +285,39 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       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