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
1=== modified file 'preflight/tests.py'
2--- preflight/tests.py 2011-03-18 22:24:43 +0000
3+++ preflight/tests.py 2011-10-03 19:19:23 +0000
4@@ -3,7 +3,10 @@
5 import sys
6
7 from django.core.management import call_command
8+from django.core.urlresolvers import reverse
9+from django.http import HttpResponse
10 from django.test import TestCase
11+from django.template import RequestContext, TemplateDoesNotExist
12 from mock import patch
13
14 from cStringIO import StringIO
15@@ -219,3 +222,25 @@
16 self.assertTrue('checks for applications' in sys.stdout.getvalue())
17 finally:
18 sys.stdout = sys.__stdout__
19+
20+
21+class OverviewView(TestCase):
22+ @patch('preflight.views.authenticate')
23+ def test_overview_when_not_authenticated(self, mock_authenticate):
24+ mock_authenticate.return_value = False
25+
26+ self.assertRaises(TemplateDoesNotExist, self.client.get,
27+ reverse('preflight-overview'))
28+
29+ @patch('preflight.views.render_to_response')
30+ @patch('preflight.views.authenticate')
31+ def test_overview(self, mock_authenticate, mock_render_to_response):
32+ mock_authenticate.return_value = True
33+ mock_render_to_response.return_value = HttpResponse()
34+
35+ self.client.get(reverse('preflight-overview'))
36+
37+ mock_render_to_response.assert_called_once()
38+ context = mock_render_to_response.call_args[0][1]
39+ self.assertTrue(isinstance(context, RequestContext))
40+
41
42=== modified file 'preflight/views.py'
43--- preflight/views.py 2011-02-07 16:06:51 +0000
44+++ preflight/views.py 2011-10-03 19:19:23 +0000
45@@ -7,6 +7,7 @@
46 from django.http import Http404
47 from django.conf import settings
48 from django.shortcuts import render_to_response
49+from django.template import RequestContext
50
51 from .models import authenticate, gather_checks, gather_versions
52
53@@ -20,10 +21,11 @@
54 "index.1col.html")
55 table_class = getattr(settings, 'PREFLIGHT_TABLE_CLASS', "listing")
56
57- return render_to_response("preflight/overview.html", {
58+ context = RequestContext(request, {
59 "applications": gather_checks(),
60 "versions": gather_versions(),
61 "now": datetime.now(),
62 "preflight_base_template": base_template,
63 'preflight_table_class': table_class,
64 })
65+ return render_to_response("preflight/overview.html", context)

Subscribers

People subscribed via source and target branches