1 files changed, 16 insertions, 5 deletions
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 5eff1eb09d..13ab19ed8f 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -2,12 +2,24 @@ require 'abstract_unit'
 
 module ShowExceptions
   class ShowExceptionsController < ActionController::Base
-    use ActionDispatch::ShowExceptions
+    use ActionDispatch::ShowExceptions, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
     use ActionDispatch::DebugExceptions
 
+    before_filter :only => :another_boom do
+      request.env["action_dispatch.show_detailed_exceptions"] = true
+    end
+
     def boom
       raise 'boom!'
     end
+
+    def another_boom
+      raise 'boom!'
+    end
+
+    def show_detailed_exceptions?
+      request.local?
+    end
   end
 
   class ShowExceptionsTest < ActionDispatch::IntegrationTest
@@ -18,7 +30,7 @@ module ShowExceptions
       assert_equal "500 error fixture\n", body
     end
 
-    test 'show diagnostics from a local ip' do
+    test 'show diagnostics from a local ip if show_detailed_exceptions? is set to request.local?' do
       @app = ShowExceptionsController.action(:boom)
       ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
         self.remote_addr = ip_address
@@ -27,9 +39,8 @@ module ShowExceptions
       end
     end
 
-    test 'show diagnostics from a remote ip when consider_all_requests_local is true' do
-      ShowExceptionsController.any_instance.stubs(:consider_all_requests_local).returns(true)
-      @app = ShowExceptionsController.action(:boom)
+    test 'show diagnostics from a remote ip when env is already set' do
+      @app = ShowExceptionsController.action(:another_boom)
       self.remote_addr = '208.77.188.166'
       get '/'
       assert_match(/boom/, body)