Merge lp:~ricardokirkner/canonical-identity-provider/904880-fix-broken-template into lp:~canonical-isd-hackers/canonical-identity-provider/stable

[Ricardo Kirkner]

Fix unstyled template on logout-to-confirm view.

The template broke because the view wasn't using a RequestContext object.

Fix unstyled template on logout-to-confirm view.

The template broke because the view wasn't using a RequestContext object.

[David Owen (dsowen)]

Great!

review: Approve

=== modified file 'identityprovider/tests/test_views_ui.py'
--- identityprovider/tests/test_views_ui.py	2011-11-29 18:06:51 +0000
+++ identityprovider/tests/test_views_ui.py	2011-12-15 20:20:31 +0000
@@ -14,6 +14,8 @@
 from django.core import mail
 from django.core.urlresolvers import Resolver404
 from django.http import QueryDict, HttpResponse
+from django.shortcuts import render_to_response
+from django.template import RequestContext
 from django.test.client import Client
 from django.utils.http import urlquote
 
@@ -324,6 +326,16 @@
         r = self.client.get('/+logout-to-confirm')
         self.assertEquals(r.status_code, 200)
 
+    @patch('identityprovider.views.ui.render_to_response')
+    def test_logout_to_confirm_use_request_context(self,
+            mock_render_to_response):
+        mock_render_to_response.side_effect = render_to_response
+
+        self.client.get('/+logout-to-confirm')
+        context = mock_render_to_response.call_args[0][1]
+        self.assertTrue(isinstance(context, RequestContext))
+
+
     def test_confirm_account_while_logged_in(self):
         token = self.create_token(at.LoginTokenType.NEWPERSONLESSACCOUNT,
                                   email='[e-mail]')

=== modified file 'identityprovider/views/ui.py'
--- identityprovider/views/ui.py	2011-11-29 15:51:53 +0000
+++ identityprovider/views/ui.py	2011-12-15 20:20:31 +0000
@@ -641,7 +641,8 @@
 
 
 def logout_to_confirm(request):
-    return render_to_response('registration/logout_to_confirm.html')
+    return render_to_response('registration/logout_to_confirm.html',
+        RequestContext(request))
 
 
 def deactivated(request):