diff options
author | Tim Graham <timograham@gmail.com> | 2015-09-05 10:25:43 -0400 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2015-09-23 19:31:11 -0400 |
commit | 9114fe8adabe626619665c9853ba952798da5530 (patch) | |
tree | 0c25d35384703efc8c76f1f035a26ed9461a7a6c /tests | |
parent | 4811f09fa39d5293944dfebfbfaf6849828d2dcd (diff) | |
download | django-9114fe8adabe626619665c9853ba952798da5530.tar.gz |
Removed support for passing a context to a generic Template.render().
Per deprecation timeline; refs a3e783fe11dd25bbf84bfb6201186566ed473506.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/shortcuts/tests.py | 13 | ||||
-rw-r--r-- | tests/template_backends/test_django.py | 21 | ||||
-rw-r--r-- | tests/template_tests/test_response.py | 6 |
3 files changed, 2 insertions, 38 deletions
diff --git a/tests/shortcuts/tests.py b/tests/shortcuts/tests.py index 9712858c70..ec79226446 100644 --- a/tests/shortcuts/tests.py +++ b/tests/shortcuts/tests.py @@ -1,6 +1,5 @@ -from django.test import SimpleTestCase, ignore_warnings, override_settings +from django.test import SimpleTestCase, override_settings from django.test.utils import require_jinja2 -from django.utils.deprecation import RemovedInDjango110Warning @override_settings( @@ -39,16 +38,6 @@ class ShortcutTests(SimpleTestCase): response = self.client.get('/render_to_response/using/?using=jinja2') self.assertEqual(response.content, b'Jinja2\n') - @ignore_warnings(category=RemovedInDjango110Warning) - def test_render_to_response_with_context_instance_misuse(self): - """ - For backwards-compatibility, ensure that it's possible to pass a - RequestContext instance in the dictionary argument instead of the - context_instance argument. - """ - response = self.client.get('/render_to_response/context_instance_misuse/') - self.assertContains(response, 'context processor output') - def test_render(self): response = self.client.get('/render/') self.assertEqual(response.status_code, 200) diff --git a/tests/template_backends/test_django.py b/tests/template_backends/test_django.py index 332eeaee25..8d13aaee08 100644 --- a/tests/template_backends/test_django.py +++ b/tests/template_backends/test_django.py @@ -1,10 +1,8 @@ from template_tests.test_response import test_processor_name -from django.template import RequestContext from django.template.backends.django import DjangoTemplates from django.template.library import InvalidTemplateLibrary -from django.test import RequestFactory, ignore_warnings, override_settings -from django.utils.deprecation import RemovedInDjango110Warning +from django.test import RequestFactory, override_settings from .test_dummy import TemplateStringsTests @@ -36,23 +34,6 @@ class DjangoTemplatesTests(TemplateStringsTests): content = template.render({'processors': 'no'}, request) self.assertEqual(content, 'no') - @ignore_warnings(category=RemovedInDjango110Warning) - def test_request_context_conflicts_with_request(self): - template = self.engine.from_string('hello') - - request = RequestFactory().get('/') - request_context = RequestContext(request) - # This doesn't raise an exception. - template.render(request_context, request) - - other_request = RequestFactory().get('/') - msg = ("render() was called with a RequestContext and a request " - "argument which refer to different requests. Make sure " - "that the context argument is a dict or at least that " - "the two arguments refer to the same request.") - with self.assertRaisesMessage(ValueError, msg): - template.render(request_context, other_request) - @override_settings(INSTALLED_APPS=['template_backends.apps.good']) def test_templatetag_discovery(self): engine = DjangoTemplates({ diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py index 8fea389f53..debc01dfe2 100644 --- a/tests/template_tests/test_response.py +++ b/tests/template_tests/test_response.py @@ -248,12 +248,6 @@ class TemplateResponseTest(SimpleTestCase): {'foo': 'bar'}).render() self.assertEqual(response.content, b'baryes') - @ignore_warnings(category=RemovedInDjango110Warning) - def test_render_with_context(self): - response = self._response('{{ foo }}{{ processors }}', - Context({'foo': 'bar'})).render() - self.assertEqual(response.content, b'bar') - def test_context_processor_priority(self): # context processors should be overridden by passed-in context response = self._response('{{ foo }}{{ processors }}', |