Ticket #4901: django_ticket4901.patch

django/test/testcases.py

@@ -73 +73 @@
             "Couldn't retrieve redirection page '%s': response code was %d (expected %d)" %
                 (path, redirect_response.status_code, target_status_code))
 
-    def assertContains(self, response, text, count=1, status_code=200):
+    def assertContains(self, response, text, count=None, status_code=200):
         """Assert that a response indicates that a page was retreived successfully,
-        (i.e., the HTTP status code was as expected), and that ``text`` occurs ``count``
-        times in the content of the response.
-
+        (i.e., the HTTP status code was as expected), and that ``text`` occurs in the
+       content of the response. If ``count`` is given, ``text`` must occur exactly ``count``
+       times.
         """
         self.assertEqual(response.status_code, status_code,
             "Couldn't retrieve page: Response code was %d (expected %d)'" %
                 (response.status_code, status_code))
         real_count = response.content.count(text)
-        self.assertEqual(real_count, count,
+       if count is None:
+               self.assertNotEqual(real_count, 0,
+            "Found no instances of '%s' in response (expected at least one)" % (text))
+       else:
+               self.assertEqual(real_count, count,
             "Found %d instances of '%s' in response (expected %d)" % (real_count, text, count))
-
+
     def assertFormError(self, response, form, field, errors):
         "Assert that a form used to render the response has a specific field error"
         if not response.context:

docs/testing.txt

@@ -472 +472 @@
 ``django.TestCase`` adds to these, providing some assertions
 that can be useful in testing the behavior of web sites.
 
-``assertContains(response, text, count=1, status_code=200)``
+``assertContains(response, text, count=None, status_code=200)``
     Assert that a response indicates that a page could be retrieved and
-    produced the nominated status code, and that ``text`` occurs ``count``
-    times in the content of the response.
+    produced the nominated status code, and that ``text`` in the content of the
+    response. If ``count`` is given, ``text`` must occur exactly ``count`` times.
 
 ``assertFormError(response, form, field, errors)``
     Assert that a field on a form raised the provided list of errors when