Merge branch 'master' into wip_abstract_controller

Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb

1 files changed, 103 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
new file mode 100644
index 0000000000..f8f562e7c1
--- /dev/null
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -0,0 +1,103 @@
+require 'abstract_unit'
+
+module ActionDispatch
+  class ShowExceptions
+    private
+      def public_path
+        "#{FIXTURE_LOAD_PATH}/public"
+      end
+  end
+end
+
+class ShowExceptionsTest < ActionController::IntegrationTest
+  Boomer = lambda do |env|
+    req = ActionDispatch::Request.new(env)
+    case req.path
+    when "/not_found"
+      raise ActionController::UnknownAction
+    when "/method_not_allowed"
+      raise ActionController::MethodNotAllowed
+    when "/not_implemented"
+      raise ActionController::NotImplemented
+    when "/unprocessable_entity"
+      raise ActionController::InvalidAuthenticityToken
+    else
+      raise "puke!"
+    end
+  end
+
+  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer, false)
+  DevelopmentApp = ActionDispatch::ShowExceptions.new(Boomer, true)
+
+  test "rescue in public from a remote ip" do
+    @integration_session = open_session(ProductionApp)
+    self.remote_addr = '208.77.188.166'
+
+    get "/"
+    assert_response 500
+    assert_equal "500 error fixture\n", body
+
+    get "/not_found"
+    assert_response 404
+    assert_equal "404 error fixture\n", body
+
+    get "/method_not_allowed"
+    assert_response 405
+    assert_equal "", body
+  end
+
+  test "rescue locally from a local request" do
+    @integration_session = open_session(ProductionApp)
+    self.remote_addr = '127.0.0.1'
+
+    get "/"
+    assert_response 500
+    assert_match /puke/, body
+
+    get "/not_found"
+    assert_response 404
+    assert_match /ActionController::UnknownAction/, body
+
+    get "/method_not_allowed"
+    assert_response 405
+    assert_match /ActionController::MethodNotAllowed/, body
+  end
+
+  test "localize public rescue message" do
+    # Change locale
+    old_locale = I18n.locale
+    I18n.locale = :da
+
+    begin
+      @integration_session = open_session(ProductionApp)
+      self.remote_addr = '208.77.188.166'
+
+      get "/"
+      assert_response 500
+      assert_equal "500 localized error fixture\n", body
+
+      get "/not_found"
+      assert_response 404
+      assert_equal "404 error fixture\n", body
+    ensure
+      I18n.locale = old_locale
+    end
+  end
+
+  test "always rescue locally in development mode" do
+    @integration_session = open_session(DevelopmentApp)
+    self.remote_addr = '208.77.188.166'
+
+    get "/"
+    assert_response 500
+    assert_match /puke/, body
+
+    get "/not_found"
+    assert_response 404
+    assert_match /ActionController::UnknownAction/, body
+
+    get "/method_not_allowed"
+    assert_response 405
+    assert_match /ActionController::MethodNotAllowed/, body
+  end
+end