Allow override 405 response error message

Ref mozilla-services/syncto#35

cliquet/tests/test_views_errors.py

@@ -1,7 +1,7 @@
 import mock
 from pyramid import httpexceptions
 
-from cliquet.errors import ERRORS
+from cliquet.errors import ERRORS, http_error
 
 from .support import BaseWebTest, unittest, authorize, FormattedErrorMixin
 
@@ -69,6 +69,19 @@ def test_405_is_valid_formatted_error(self):
             response, 405, ERRORS.METHOD_NOT_ALLOWED, "Method Not Allowed",
             "Method not allowed on this endpoint.")
 
+    def test_405_can_have_custom_message(self):
+        custom_405 = http_error(httpexceptions.HTTPMethodNotAllowed(),
+                                errno=ERRORS.METHOD_NOT_ALLOWED,
+                                message="Disabled from conf.")
+        with mock.patch(
+                'cliquet.tests.testapp.views.Mushroom._extract_filters',
+                side_effect=custom_405):
+            response = self.app.get(self.sample_url,
+                                    headers=self.headers, status=405)
+        self.assertFormattedError(
+            response, 405, ERRORS.METHOD_NOT_ALLOWED, "Method Not Allowed",
+            "Disabled from conf.")
+
     def test_500_is_valid_formatted_error(self):
         with mock.patch(
                 'cliquet.tests.testapp.views.Mushroom._extract_filters',

cliquet/views/errors.py

@@ -68,7 +68,6 @@ def page_not_found(request):
 @view_config(context=httpexceptions.HTTPServiceUnavailable,
              permission=NO_PERMISSION_REQUIRED)
 def service_unavailable(context, request):
-
     error_msg = "Service unavailable due to high load, please retry later."
     response = http_error(httpexceptions.HTTPServiceUnavailable(),
                           errno=ERRORS.BACKEND,
@@ -82,7 +81,10 @@ def service_unavailable(context, request):
 @view_config(context=httpexceptions.HTTPMethodNotAllowed,
              permission=NO_PERMISSION_REQUIRED)
 def method_not_allowed(context, request):
-    response = http_error(httpexceptions.HTTPMethodNotAllowed(),
+    if context.content_type == 'application/json':
+        return context
+
+    response = http_error(context,
                           errno=ERRORS.METHOD_NOT_ALLOWED,
                           message="Method not allowed on this endpoint.")
     return reapply_cors(request, response)