summaryrefslogtreecommitdiff
path: root/tests/shortcuts
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-02-11 05:49:04 -0500
committerGitHub <noreply@github.com>2017-02-11 05:49:04 -0500
commit7b6e42089c9d5ff2dcbfee4005f72cd42728222e (patch)
treeca0aec79f200f8abd7a1c2610b2e5b700627c582 /tests/shortcuts
parent0166dd2f8c54b62a65735c395825b66eeb39788c (diff)
Fixed #25978 -- Deprecated shorcuts.render_to_response().
Diffstat (limited to 'tests/shortcuts')
-rw-r--r--tests/shortcuts/test_render_to_response.py39
-rw-r--r--tests/shortcuts/tests.py37
2 files changed, 41 insertions, 35 deletions
diff --git a/tests/shortcuts/test_render_to_response.py b/tests/shortcuts/test_render_to_response.py
new file mode 100644
index 0000000000..7bf7ac9ad6
--- /dev/null
+++ b/tests/shortcuts/test_render_to_response.py
@@ -0,0 +1,39 @@
+from django.test import SimpleTestCase, ignore_warnings, override_settings
+from django.test.utils import require_jinja2
+from django.utils.deprecation import RemovedInDjango30Warning
+
+
+@ignore_warnings(category=RemovedInDjango30Warning)
+@override_settings(ROOT_URLCONF='shortcuts.urls')
+class RenderToResponseTests(SimpleTestCase):
+
+ def test_render_to_response(self):
+ response = self.client.get('/render_to_response/')
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.content, b'FOO.BAR..\n')
+ self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
+
+ def test_render_to_response_with_multiple_templates(self):
+ response = self.client.get('/render_to_response/multiple_templates/')
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.content, b'FOO.BAR..\n')
+
+ def test_render_to_response_with_content_type(self):
+ response = self.client.get('/render_to_response/content_type/')
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.content, b'FOO.BAR..\n')
+ self.assertEqual(response['Content-Type'], 'application/x-rendertest')
+
+ def test_render_to_response_with_status(self):
+ response = self.client.get('/render_to_response/status/')
+ self.assertEqual(response.status_code, 403)
+ self.assertEqual(response.content, b'FOO.BAR..\n')
+
+ @require_jinja2
+ def test_render_to_response_with_using(self):
+ response = self.client.get('/render_to_response/using/')
+ self.assertEqual(response.content, b'DTL\n')
+ response = self.client.get('/render_to_response/using/?using=django')
+ self.assertEqual(response.content, b'DTL\n')
+ response = self.client.get('/render_to_response/using/?using=jinja2')
+ self.assertEqual(response.content, b'Jinja2\n')
diff --git a/tests/shortcuts/tests.py b/tests/shortcuts/tests.py
index ec79226446..fe68d67767 100644
--- a/tests/shortcuts/tests.py
+++ b/tests/shortcuts/tests.py
@@ -2,41 +2,8 @@ from django.test import SimpleTestCase, override_settings
from django.test.utils import require_jinja2
-@override_settings(
- ROOT_URLCONF='shortcuts.urls',
-)
-class ShortcutTests(SimpleTestCase):
-
- def test_render_to_response(self):
- response = self.client.get('/render_to_response/')
- self.assertEqual(response.status_code, 200)
- self.assertEqual(response.content, b'FOO.BAR..\n')
- self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
-
- def test_render_to_response_with_multiple_templates(self):
- response = self.client.get('/render_to_response/multiple_templates/')
- self.assertEqual(response.status_code, 200)
- self.assertEqual(response.content, b'FOO.BAR..\n')
-
- def test_render_to_response_with_content_type(self):
- response = self.client.get('/render_to_response/content_type/')
- self.assertEqual(response.status_code, 200)
- self.assertEqual(response.content, b'FOO.BAR..\n')
- self.assertEqual(response['Content-Type'], 'application/x-rendertest')
-
- def test_render_to_response_with_status(self):
- response = self.client.get('/render_to_response/status/')
- self.assertEqual(response.status_code, 403)
- self.assertEqual(response.content, b'FOO.BAR..\n')
-
- @require_jinja2
- def test_render_to_response_with_using(self):
- response = self.client.get('/render_to_response/using/')
- self.assertEqual(response.content, b'DTL\n')
- response = self.client.get('/render_to_response/using/?using=django')
- self.assertEqual(response.content, b'DTL\n')
- response = self.client.get('/render_to_response/using/?using=jinja2')
- self.assertEqual(response.content, b'Jinja2\n')
+@override_settings(ROOT_URLCONF='shortcuts.urls')
+class RenderTests(SimpleTestCase):
def test_render(self):
response = self.client.get('/render/')