Changeset 7578

Timestamp:

06/06/08 08:50:02 (4 months ago)

Author:

russellm

Message:

Fixed #7165 -- Added an assertNotContains() method to the test client. Thanks for the suggestion and implementation, J. Pablo Fernandez <pupeno@pupeno.com>.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/test/testcases.py (modified) (1 diff)
• django/trunk/docs/testing.txt (modified) (3 diffs)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -143 +143 @@
-    Stefane Fermgier <sf@fermigier.com>
-    Afonso Fernández Nogueira <fonzzo.django@gmail.com>
+        J. Pablo Fernandez <pupeno@pupeno.com>
-    Matthew Flanagan <http://wadofstuff.blogspot.com>
-    Eric Floehr <eric@intellovations.com>

django/trunk/django/test/testcases.py

@@ -128 +128 @@
-            self.failUnless(real_count != 0,
-                            "Couldn't find '%s' in response" % text)
+
+    def assertNotContains(self, response, text, status_code=200):
+        """
+        Asserts that a response indicates that a page was retrieved
+        successfully, (i.e., the HTTP status code was as expected), and that
+        ``text`` doesn't occurs in the content of the response.
+        """
+        self.assertEqual(response.status_code, status_code,
+            "Couldn't retrieve page: Response code was %d (expected %d)'" %
+                (response.status_code, status_code))
+        self.assertEqual(response.content.count(text), 0,
+                         "Response should not contain '%s'" % text)
-
-    def assertFormError(self, response, form, field, errors):

django/trunk/docs/testing.txt

@@ -823 +823 @@
-    provided, ``text`` must occur exactly ``count`` times in the response.
-
+``assertNotContains(response, text, status_code=200)``
+    Asserts that a ``Response`` instance produced the given ``status_code`` and
+    that ``text`` does not appears in the content of the response.
+
-``assertFormError(response, form, field, errors)``
-    Asserts that a field on a form raises the provided list of errors when
@@ -837 +841 @@
-    ``errors`` is an error string, or a list of error strings, that are
-    expected as a result of form validation.
+
+``assertTemplateUsed(response, template_name)``
+    Asserts that the template with the given name was used in rendering the
+    response.
+
+    The name is a string such as ``'admin/index.html'``.
-
-``assertTemplateNotUsed(response, template_name)``
@@ -846 +856 @@
-    it redirected to ``expected_url`` (including any GET data), and the subsequent
-    page was received with ``target_status_code``.
-
-``assertTemplateUsed(response, template_name)``
-    Asserts that the template with the given name was used in rendering the
-    response.
-
-    The name is a string such as ``'admin/index.html'``.
-
-E-mail services

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

@@ -12 +12 @@
-        response = self.client.get('/test_client_regress/no_template_view/')
-
+        self.assertNotContains(response, 'never')
-        self.assertContains(response, 'never', 0)
-        self.assertContains(response, 'once')
@@ -19 +20 @@
-
-        try:
+            self.assertNotContains(response, 'once')
+        except AssertionError, e:
+            self.assertEquals(str(e), "Response should not contain 'once'")
+            
+        try:
-            self.assertContains(response, 'never', 1)
-        except AssertionError, e: