From 0fef92f6f0d064cdce4e8722fd9fe27ed451bb9b Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 22 Dec 2010 04:54:10 +0000
Subject: Fixed #14936 -- Tweaked the new render shortcut to reflect non-legacy
 arguments. Thanks to adamv for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/regressiontests/views/tests/shortcuts.py |  9 +++++++--
 tests/regressiontests/views/urls.py            |  3 ++-
 tests/regressiontests/views/views.py           | 10 ++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/regressiontests/views/tests/shortcuts.py b/tests/regressiontests/views/tests/shortcuts.py
index fe1ff5b49e..3f260fee10 100644
--- a/tests/regressiontests/views/tests/shortcuts.py
+++ b/tests/regressiontests/views/tests/shortcuts.py
@@ -45,9 +45,14 @@ class ShortcutTests(TestCase):
         self.assertEquals(response.content, 'FOO.BAR..\n')
         self.assertEquals(response['Content-Type'], 'text/html; charset=utf-8')
 
-    def test_render_with_mimetype(self):
-        response = self.client.get('/views/shortcuts/render/mimetype/')
+    def test_render_with_content_type(self):
+        response = self.client.get('/views/shortcuts/render/content_type/')
         self.assertEquals(response.status_code, 200)
         self.assertEquals(response.content, 'FOO.BAR../path/to/static/media\n')
         self.assertEquals(response['Content-Type'], 'application/x-rendertest')
 
+    def test_render_with_status(self):
+        response = self.client.get('/views/shortcuts/render/status/')
+        self.assertEquals(response.status_code, 403)
+        self.assertEquals(response.content, 'FOO.BAR../path/to/static/media\n')
+
diff --git a/tests/regressiontests/views/urls.py b/tests/regressiontests/views/urls.py
index b1ca432e9f..7cba5f647d 100644
--- a/tests/regressiontests/views/urls.py
+++ b/tests/regressiontests/views/urls.py
@@ -149,7 +149,8 @@ urlpatterns += patterns('regressiontests.views.views',
     (r'^shortcuts/render_to_response/mimetype/$', 'render_to_response_view_with_mimetype'),
     (r'^shortcuts/render/$', 'render_view'),
     (r'^shortcuts/render/base_context/$', 'render_view_with_base_context'),
-    (r'^shortcuts/render/mimetype/$', 'render_view_with_mimetype'),
+    (r'^shortcuts/render/content_type/$', 'render_view_with_content_type'),
+    (r'^shortcuts/render/status/$', 'render_view_with_status'),
 
 )
 
diff --git a/tests/regressiontests/views/views.py b/tests/regressiontests/views/views.py
index 0705bd0188..ec017bd7fd 100644
--- a/tests/regressiontests/views/views.py
+++ b/tests/regressiontests/views/views.py
@@ -90,8 +90,14 @@ def render_view_with_base_context(request):
         'bar': 'BAR',
     }, context_instance=Context())
 
-def render_view_with_mimetype(request):
+def render_view_with_content_type(request):
     return render(request, 'debug/render_test.html', {
         'foo': 'FOO',
         'bar': 'BAR',
-    }, mimetype='application/x-rendertest')
+    }, content_type='application/x-rendertest')
+
+def render_view_with_status(request):
+    return render(request, 'debug/render_test.html', {
+        'foo': 'FOO',
+        'bar': 'BAR',
+    }, status=403)
-- 
cgit v1.3