Merge lp:~ricardokirkner/django-preflight/865623-overview-with-requestcontext into lp:django-preflight

Proposed by Ricardo Kirkner
Status: Merged
Approved by: David Owen
Approved revision: 13
Merged at revision: 12
Proposed branch: lp:~ricardokirkner/django-preflight/865623-overview-with-requestcontext
Merge into: lp:django-preflight
Diff against target: 65 lines (+28/-1)
2 files modified
preflight/tests.py (+25/-0)
preflight/views.py (+3/-1)
To merge this branch: bzr merge lp:~ricardokirkner/django-preflight/865623-overview-with-requestcontext
Reviewer Review Type Date Requested Status
David Owen (community) Approve
Review via email: mp+77993@code.launchpad.net

Commit message

use a RequestContext instance when rendering the overview page

Description of the change

Makes preflight work with templates depending on the STATIC_URL var provided by django's 1.3 static template context processor by using a RequestContext when rendering the response.

To post a comment you must log in.
Revision history for this message
David Owen (dsowen) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'preflight/tests.py'
--- preflight/tests.py 2011-03-18 22:24:43 +0000
+++ preflight/tests.py 2011-10-03 19:19:23 +0000
@@ -3,7 +3,10 @@
3import sys3import sys
44
5from django.core.management import call_command5from django.core.management import call_command
6from django.core.urlresolvers import reverse
7from django.http import HttpResponse
6from django.test import TestCase8from django.test import TestCase
9from django.template import RequestContext, TemplateDoesNotExist
7from mock import patch10from mock import patch
811
9from cStringIO import StringIO12from cStringIO import StringIO
@@ -219,3 +222,25 @@
219 self.assertTrue('checks for applications' in sys.stdout.getvalue())222 self.assertTrue('checks for applications' in sys.stdout.getvalue())
220 finally:223 finally:
221 sys.stdout = sys.__stdout__224 sys.stdout = sys.__stdout__
225
226
227class OverviewView(TestCase):
228 @patch('preflight.views.authenticate')
229 def test_overview_when_not_authenticated(self, mock_authenticate):
230 mock_authenticate.return_value = False
231
232 self.assertRaises(TemplateDoesNotExist, self.client.get,
233 reverse('preflight-overview'))
234
235 @patch('preflight.views.render_to_response')
236 @patch('preflight.views.authenticate')
237 def test_overview(self, mock_authenticate, mock_render_to_response):
238 mock_authenticate.return_value = True
239 mock_render_to_response.return_value = HttpResponse()
240
241 self.client.get(reverse('preflight-overview'))
242
243 mock_render_to_response.assert_called_once()
244 context = mock_render_to_response.call_args[0][1]
245 self.assertTrue(isinstance(context, RequestContext))
246
222247
=== modified file 'preflight/views.py'
--- preflight/views.py 2011-02-07 16:06:51 +0000
+++ preflight/views.py 2011-10-03 19:19:23 +0000
@@ -7,6 +7,7 @@
7from django.http import Http4047from django.http import Http404
8from django.conf import settings8from django.conf import settings
9from django.shortcuts import render_to_response9from django.shortcuts import render_to_response
10from django.template import RequestContext
1011
11from .models import authenticate, gather_checks, gather_versions12from .models import authenticate, gather_checks, gather_versions
1213
@@ -20,10 +21,11 @@
20 "index.1col.html")21 "index.1col.html")
21 table_class = getattr(settings, 'PREFLIGHT_TABLE_CLASS', "listing")22 table_class = getattr(settings, 'PREFLIGHT_TABLE_CLASS', "listing")
2223
23 return render_to_response("preflight/overview.html", {24 context = RequestContext(request, {
24 "applications": gather_checks(),25 "applications": gather_checks(),
25 "versions": gather_versions(),26 "versions": gather_versions(),
26 "now": datetime.now(),27 "now": datetime.now(),
27 "preflight_base_template": base_template,28 "preflight_base_template": base_template,
28 'preflight_table_class': table_class,29 'preflight_table_class': table_class,
29 })30 })
31 return render_to_response("preflight/overview.html", context)

Subscribers

People subscribed via source and target branches