Ticket #15826: 15826.diff

django/test/testcases.py

@@ -15 +15 @@
     reset_queries)
 from django.http import QueryDict
 from django.test import _doctest as doctest
+from django.template.response import SimpleTemplateResponse
 from django.test.client import Client
 from django.test.utils import get_warnings_state, restore_warnings_state, override_settings
 from django.utils import simplejson, unittest as ut2
@@ -415 +416 @@
         If ``count`` is None, the count doesn't matter - the assertion is true
         if the text occurs at least once in the response.
         """
+
+        if isinstance(response, SimpleTemplateResponse):
+            response.render()
+
         if msg_prefix:
             msg_prefix += ": "
 
@@ -438 +443 @@
         successfully, (i.e., the HTTP status code was as expected), and that
         ``text`` doesn't occurs in the content of the response.
         """
+
+        if isinstance(response, SimpleTemplateResponse):
+            response.render()
+
         if msg_prefix:
             msg_prefix += ": "
 

tests/regressiontests/testcase/tests.py

@@ +1 @@
+from django.test import TestCase
+
+from django.http import HttpResponse
+from django.template.response import SimpleTemplateResponse
+from django.template import Template
+
+class TestCaseTests(TestCase):
+
+    def test_assert_contains_renders_template_response(self):
+        """ Test that we can pass in an unrendered SimpleTemplateReponse 
+            without throwing an error.
+        """
+        response = SimpleTemplateResponse(Template('Hello'), status=200)
+        self.assertContains(response, 'Hello')
+
+    def test_assert_contains_using_non_template_response(self):
+        """ Test that auto-rendering does not affect responses that aren't
+            instances (or subclasses) of SimpleTemplateResponse.
+        """
+        response = HttpResponse('Hello')
+        self.assertContains(response, 'Hello')
+
+    def test_assert_not_contains_renders_template_response(self):
+        """ Test that we can pass in an unrendered SimpleTemplateReponse 
+            without throwing an error.
+        """
+        response = SimpleTemplateResponse(Template('Hello'), status=200)
+        self.assertNotContains(response, 'Bye')
+
+    def test_assert_not_contains_using_non_template_response(self):
+        """ Test that auto-rendering does not affect responses that aren't
+            instances (or subclasses) of SimpleTemplateResponse.
+        """
+        response = HttpResponse('Hello')
+        self.assertNotContains(response, 'Bye')