1 files changed, 32 insertions, 75 deletions

diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 90f13a3bb9..45f8fc11b3 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -3,36 +3,31 @@ require 'abstract_unit'
 class ShowExceptionsTest < ActionDispatch::IntegrationTest
 
   class Boomer
-    def initialize(detailed  = false)
-      @detailed = detailed
-    end
-
     def call(env)
-      env['action_dispatch.show_detailed_exceptions'] = @detailed
       req = ActionDispatch::Request.new(env)
       case req.path
       when "/not_found"
-        raise ActionController::UnknownAction
-      when "/runtime_error"
-        raise RuntimeError
+        raise AbstractController::ActionNotFound
       when "/method_not_allowed"
         raise ActionController::MethodNotAllowed
-      when "/not_implemented"
-        raise ActionController::NotImplemented
-      when "/unprocessable_entity"
-        raise ActionController::InvalidAuthenticityToken
       when "/not_found_original_exception"
-        raise ActionView::Template::Error.new('template', {}, AbstractController::ActionNotFound.new)
+        raise ActionView::Template::Error.new('template', AbstractController::ActionNotFound.new)
       else
         raise "puke!"
       end
     end
   end
 
-  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new(false))
-  DevelopmentApp = ActionDispatch::ShowExceptions.new(Boomer.new(true))
+  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public"))
+
+  test "skip exceptions app if not showing exceptions" do
+    @app = ProductionApp
+    assert_raise RuntimeError do
+      get "/", {}, {'action_dispatch.show_exceptions' => false}
+    end
+  end
 
-  test "rescue with error page when show_exceptions is false" do
+  test "rescue with error page" do
     @app = ProductionApp
 
     get "/", {}, {'action_dispatch.show_exceptions' => true}
@@ -48,24 +43,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_equal "", body
   end
 
-  test "rescue with diagnostics message when show_exceptions is true" do
-    @app = DevelopmentApp
-
-    get "/", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 500
-    assert_match(/puke/, body)
-
-    get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 404
-    assert_match(/#{ActionController::UnknownAction.name}/, body)
-
-    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 405
-    assert_match(/ActionController::MethodNotAllowed/, body)
-  end
-
   test "localize rescue error page" do
-    # Change locale
     old_locale, I18n.locale = I18n.locale, :da
 
     begin
@@ -83,16 +61,14 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "does not show filtered parameters" do
-    @app = DevelopmentApp
+  test "sets the HTTP charset parameter" do
+    @app = ProductionApp
 
-    get "/", {"foo"=>"bar"}, {'action_dispatch.show_exceptions' => true,
-      'action_dispatch.parameter_filter' => [:foo]}
-    assert_response 500
-    assert_match("&quot;foo&quot;=&gt;&quot;[FILTERED]&quot;", body)
+    get "/", {}, {'action_dispatch.show_exceptions' => true}
+    assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
   end
 
-  test "show registered original exception for wrapped exceptions when show_exceptions is false" do
+  test "show registered original exception for wrapped exceptions" do
     @app = ProductionApp
 
     get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
@@ -100,46 +76,27 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_match(/404 error/, body)
   end
 
-  test "show registered original exception for wrapped exceptions when show_exceptions is true" do
-    @app = DevelopmentApp
+  test "calls custom exceptions app" do
+    exceptions_app = lambda do |env|
+      assert_kind_of AbstractController::ActionNotFound, env["action_dispatch.exception"]
+      assert_equal "/404", env["PATH_INFO"]
+      [404, { "Content-Type" => "text/plain" }, ["YOU FAILED BRO"]]
+    end
 
+    @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
     get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 404
-    assert_match(/AbstractController::ActionNotFound/, body)
-  end
-
-  test "show the controller name in the diagnostics template when controller name is present" do
-    @app = DevelopmentApp
-    get("/runtime_error", {}, {
-      'action_dispatch.show_exceptions' => true,
-      'action_dispatch.request.parameters' => {
-        'action' => 'show',
-        'id' => 'unknown',
-        'controller' => 'featured_tile'
-      }
-    })
-    assert_response 500
-    assert_match(/RuntimeError\n    in FeaturedTileController/, body)
+    assert_equal "YOU FAILED BRO", body
   end
 
-  test "sets the HTTP charset parameter" do
-    @app = DevelopmentApp
-
-    get "/", {}, {'action_dispatch.show_exceptions' => true}
-    assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
-  end
-
-  test 'uses logger from env' do
-    @app = ProductionApp
-    output = StringIO.new
-    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
-    assert_match(/puke/, output.rewind && output.read)
-  end
+  test "returns an empty response if custom exceptions app returns X-Cascade pass" do
+    exceptions_app = lambda do |env|
+      [404, { "X-Cascade" => "pass" }, []]
+    end
 
-  test 'uses backtrace cleaner from env' do
-    @app = DevelopmentApp
-    cleaner = stub(:clean => ['passed backtrace cleaner'])
-    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner}
-    assert_match(/passed backtrace cleaner/, body)
+    @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
+    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 405
+    assert_equal "", body
   end
 end