Changeset 9188

Timestamp:

10/07/08 04:23:40 (3 months ago)

Author:

mtredinnick

Message:

Fixed #5888 -- Added methods to the test client to support HEAD, PUT, DELETE
and OPTIONS support. Thanks Scott Barr and Leah Culver.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/test/client.py (modified) (1 diff)
• django/trunk/docs/topics/testing.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/urls.py (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/views.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -48 +48 @@
-    Morten Bagai <m@bagai.com>
-    Mikaël Barbero <mikael.barbero nospam at nospam free.fr>
+    Scott Barr <scott@divisionbyzero.com.au>
-    Jiri Barton
-    Ned Batchelder <http://www.nedbatchelder.com/>

django/trunk/django/test/client.py

@@ -285 +285 @@
-        return self.request(**r)
-
+    def head(self, path, data={}, **extra):
+        """
+        Request a response from the server using HEAD.
+        """
+        r = {
+            'CONTENT_LENGTH':  None,
+            'CONTENT_TYPE':    'text/html; charset=utf-8',
+            'PATH_INFO':       urllib.unquote(path),
+            'QUERY_STRING':    urlencode(data, doseq=True),
+            'REQUEST_METHOD': 'HEAD',
+        }
+        r.update(extra)
+
+        return self.request(**r)
+
+    def options(self, path, data={}, **extra):
+        """
+        Request a response from the server using OPTIONS.
+        """
+        r = {
+            'CONTENT_LENGTH':  None,
+            'CONTENT_TYPE':    None,
+            'PATH_INFO':       urllib.unquote(path),
+            'QUERY_STRING':    urlencode(data, doseq=True),
+            'REQUEST_METHOD': 'OPTIONS',
+        }
+        r.update(extra)
+
+        return self.request(**r)
+
+    def put(self, path, data={}, content_type=MULTIPART_CONTENT, **extra):
+        """
+        Send a resource to the server using PUT.
+        """
+        if content_type is MULTIPART_CONTENT:
+            post_data = encode_multipart(BOUNDARY, data)
+        else:
+            post_data = data
+        r = {
+            'CONTENT_LENGTH': len(post_data),
+            'CONTENT_TYPE':   content_type,
+            'PATH_INFO':      urllib.unquote(path),
+            'REQUEST_METHOD': 'PUT',
+            'wsgi.input':     FakePayload(post_data),
+        }
+        r.update(extra)
+
+        return self.request(**r)
+
+    def delete(self, path, data={}, **extra):
+        """
+        Send a DELETE request to the server.
+        """
+        r = {
+            'CONTENT_LENGTH':  None,
+            'CONTENT_TYPE':    None,
+            'PATH_INFO':       urllib.unquote(path),
+            'REQUEST_METHOD': 'DELETE',
+            }
+        r.update(extra)
+
+        return self.request(**r)
+
-    def login(self, **credentials):
-        """

django/trunk/docs/topics/testing.txt

@@ -545 +545 @@
-        to ``post()``.
-
+    .. method:: Client.head(path, data={})
+
+        .. versionadded:: development
+
+        Makes a HEAD request on the provided ``path`` and returns a ``Response``
+        object. Useful for testing RESTful interfaces. Acts just like
+        :meth:`Client.get` except it does not return a message body.
+
+    .. method:: Client.options(path, data={})
+
+        .. versionadded:: development
+
+        Makes an OPTIONS request on the provided ``path`` and returns a
+        ``Response`` object. Useful for testing RESTful interfaces.
+
+    .. method:: Client.put(path, data={}, content_type=MULTIPART_CONTENT)
+
+        .. versionadded:: development
+
+        Makes an PUT request on the provided ``path`` and returns a
+        ``Response`` object. Useful for testing RESTful interfaces. Acts just
+        like :meth:`Client.put` except with the PUT request method.
+
+    .. method:: Client.delete(path)
+
+        .. versionadded:: development
+
+        Makes an DELETE request on the provided ``path`` and returns a
+        ``Response`` object. Useful for testing RESTful interfaces.
+
-    .. method:: Client.login(**credentials)
-

django/trunk/tests/regressiontests/test_client_regress/models.py

@@ -383 +383 @@
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, 'YES')
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/trunk/tests/regressiontests/test_client_regress/urls.py

@@ -10 +10 @@
-    (r'^set_session/$', views.set_session_view),
-    (r'^check_session/$', views.check_session_view),
+    (r'^request_methods/$', views.request_methods_view),
-)

django/trunk/tests/regressiontests/test_client_regress/views.py

@@ -44 +44 @@
-    "A view that reads a session variable"
-    return HttpResponse(request.session.get('session_var', 'NO'))
+
+def request_methods_view(request):
+    "A view that responds with the request method"
+    return HttpResponse('request method: %s' % request.method)