diff options
Diffstat (limited to 'rest_framework/tests')
| -rw-r--r-- | rest_framework/tests/decorators.py | 16 | ||||
| -rw-r--r-- | rest_framework/tests/generics.py | 16 | ||||
| -rw-r--r-- | rest_framework/tests/utils.py | 27 | ||||
| -rw-r--r-- | rest_framework/tests/views.py | 4 | 
4 files changed, 61 insertions, 2 deletions
| diff --git a/rest_framework/tests/decorators.py b/rest_framework/tests/decorators.py index 8079c8cb..bc44a45b 100644 --- a/rest_framework/tests/decorators.py +++ b/rest_framework/tests/decorators.py @@ -17,6 +17,8 @@ from rest_framework.decorators import (      permission_classes,  ) +from rest_framework.tests.utils import RequestFactory +  class DecoratorTestCase(TestCase): @@ -63,6 +65,20 @@ class DecoratorTestCase(TestCase):          response = view(request)          self.assertEqual(response.status_code, 405) +    def test_calling_patch_method(self): + +        @api_view(['GET', 'PATCH']) +        def view(request): +            return Response({}) + +        request = self.factory.patch('/') +        response = view(request) +        self.assertEqual(response.status_code, 200) + +        request = self.factory.post('/') +        response = view(request) +        self.assertEqual(response.status_code, 405) +      def test_renderer_classes(self):          @api_view(['GET']) diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py index 7c24d84e..843017eb 100644 --- a/rest_framework/tests/generics.py +++ b/rest_framework/tests/generics.py @@ -1,8 +1,8 @@  from django.db import models  from django.test import TestCase -from django.test.client import RequestFactory  from django.utils import simplejson as json  from rest_framework import generics, serializers, status +from rest_framework.tests.utils import RequestFactory  from rest_framework.tests.models import BasicModel, Comment, SlugBasedModel @@ -181,6 +181,20 @@ class TestInstanceView(TestCase):          updated = self.objects.get(id=1)          self.assertEquals(updated.text, 'foobar') +    def test_patch_instance_view(self): +        """ +        PATCH requests to RetrieveUpdateDestroyAPIView should update an object. +        """ +        content = {'text': 'foobar'} +        request = factory.patch('/1', json.dumps(content), +                              content_type='application/json') + +        response = self.view(request, pk=1).render() +        self.assertEquals(response.status_code, status.HTTP_200_OK) +        self.assertEquals(response.data, {'id': 1, 'text': 'foobar'}) +        updated = self.objects.get(id=1) +        self.assertEquals(updated.text, 'foobar') +      def test_delete_instance_view(self):          """          DELETE requests to RetrieveUpdateDestroyAPIView should delete an object. diff --git a/rest_framework/tests/utils.py b/rest_framework/tests/utils.py new file mode 100644 index 00000000..3906adb9 --- /dev/null +++ b/rest_framework/tests/utils.py @@ -0,0 +1,27 @@ +from django.test.client import RequestFactory, FakePayload +from django.test.client import MULTIPART_CONTENT +from urlparse import urlparse + + +class RequestFactory(RequestFactory): + +    def __init__(self, **defaults): +        super(RequestFactory, self).__init__(**defaults) + +    def patch(self, path, data={}, content_type=MULTIPART_CONTENT, +            **extra): +        "Construct a PATCH request." + +        patch_data = self._encode_data(data, content_type) + +        parsed = urlparse(path) +        r = { +            'CONTENT_LENGTH': len(patch_data), +            'CONTENT_TYPE':   content_type, +            'PATH_INFO':      self._get_path(parsed), +            'QUERY_STRING':   parsed[4], +            'REQUEST_METHOD': 'PATCH', +            'wsgi.input':     FakePayload(patch_data), +        } +        r.update(extra) +        return self.request(**r) diff --git a/rest_framework/tests/views.py b/rest_framework/tests/views.py index 43365e07..7cd82656 100644 --- a/rest_framework/tests/views.py +++ b/rest_framework/tests/views.py @@ -18,7 +18,7 @@ class BasicView(APIView):          return Response({'method': 'POST', 'data': request.DATA}) -@api_view(['GET', 'POST', 'PUT']) +@api_view(['GET', 'POST', 'PUT', 'PATCH'])  def basic_view(request):      if request.method == 'GET':          return {'method': 'GET'} @@ -26,6 +26,8 @@ def basic_view(request):          return {'method': 'POST', 'data': request.DATA}      elif request.method == 'PUT':          return {'method': 'PUT', 'data': request.DATA} +    elif request.method == 'PATCH': +        return {'method': 'PATCH', 'data': request.DATA}  def sanitise_json_error(error_dict): | 
