p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Made usage of assertTemplateUsed in admin_views tests 

Thanks Baptiste Mispelon for the suggestion.
This commit is contained in:
Claude Paroz 2013-04-10 10:16:15 +02:00
parent 18255779e9
commit 118faa0893
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/admin_views/tests.py
View File

@ -647,7 +647,7 @@ class AdminViewFormUrlTest(TestCase):
os.path.join(os.path.dirname(upath(__file__)), 'templates'),) os.path.join(os.path.dirname(upath(__file__)), 'templates'),)
with self.settings(TEMPLATE_DIRS=template_dirs): with self.settings(TEMPLATE_DIRS=template_dirs):
response = self.client.get("/test_admin/admin/admin_views/color2/") response = self.client.get("/test_admin/admin/admin_views/color2/")
self.assertTrue('custom_filter_template.html' in [t.name for t in response.templates]) self.assertTemplateUsed(response, 'custom_filter_template.html')
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
@ -3982,7 +3982,7 @@ class AdminViewLogoutTest(TestCase):
def test_client_logout_url_can_be_used_to_login(self): def test_client_logout_url_can_be_used_to_login(self):
response = self.client.get('/test_admin/admin/logout/') response = self.client.get('/test_admin/admin/logout/')
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertEqual(response.template_name, 'registration/logged_out.html') self.assertTemplateUsed(response, 'registration/logged_out.html')
self.assertEqual(response.request['PATH_INFO'], '/test_admin/admin/logout/') self.assertEqual(response.request['PATH_INFO'], '/test_admin/admin/logout/')
# we are now logged out # we are now logged out
@ -3992,7 +3992,7 @@ class AdminViewLogoutTest(TestCase):
# follow the redirect and test results. # follow the redirect and test results.
response = self.client.get('/test_admin/admin/logout/', follow=True) response = self.client.get('/test_admin/admin/logout/', follow=True)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertEqual(response.template_name, 'admin/login.html') self.assertTemplateUsed(response, 'admin/login.html')
self.assertEqual(response.request['PATH_INFO'], '/test_admin/admin/') self.assertEqual(response.request['PATH_INFO'], '/test_admin/admin/')
self.assertContains(response, '<input type="hidden" name="next" value="/test_admin/admin/" />') self.assertContains(response, '<input type="hidden" name="next" value="/test_admin/admin/" />')