mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-08 03:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refs #23919 -- Simplified assertRaisesRegex()'s that accounted for Python 2.

Browse source
This commit is contained in:
Tim Graham 2017-01-19 21:10:33 -05:00 • committed by Aymeric Augustin
parent dc8834cad4
commit 109b33f64c
12 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/test_utils/tests.py
View file

@ -362,22 +362,26 @@ class AssertTemplateUsedContextManagerTests(SimpleTestCase):
pass
def test_error_message(self):
with self.assertRaisesRegex(AssertionError, r'^template_used/base\.html'):
msg = 'template_used/base.html was not rendered. No template was rendered.'
with self.assertRaisesMessage(AssertionError, msg):
with self.assertTemplateUsed('template_used/base.html'):
pass
with self.assertRaisesRegex(AssertionError, r'^template_used/base\.html'):
with self.assertRaisesMessage(AssertionError, msg):
with self.assertTemplateUsed(template_name='template_used/base.html'):
pass
with self.assertRaisesRegex(AssertionError, r'^template_used/base\.html.*template_used/alternative\.html$'):
msg2 = (
'template_used/base.html was not rendered. Following templates '
'were rendered: template_used/alternative.html'
)
with self.assertRaisesMessage(AssertionError, msg2):
with self.assertTemplateUsed('template_used/base.html'):
render_to_string('template_used/alternative.html')
with self.assertRaises(AssertionError) as cm:
with self.assertRaisesMessage(AssertionError, 'No templates used to render the response'):
response = self.client.get('/test_utils/no_template_used/')
self.assertTemplateUsed(response, 'template_used/base.html')
self.assertEqual(cm.exception.args[0], "No templates used to render the response")
def test_failure(self):
with self.assertRaises(TypeError):