p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up urlpatterns_reverse tests.

This commit is contained in:
Bas Peschier 2015-03-12 17:22:52 +01:00 committed by Tim Graham
parent c9f1a12925
commit a23ea398e8
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/urlpatterns_reverse/tests.py
View File

@ -173,11 +173,13 @@ class NoURLPatternsTests(TestCase):
""" """
resolver = RegexURLResolver(r'^$', settings.ROOT_URLCONF) resolver = RegexURLResolver(r'^$', settings.ROOT_URLCONF)
self.assertRaisesMessage(ImproperlyConfigured, self.assertRaisesMessage(
ImproperlyConfigured,
"The included urlconf 'urlpatterns_reverse.no_urls' does not " "The included urlconf 'urlpatterns_reverse.no_urls' does not "
"appear to have any patterns in it. If you see valid patterns in " "appear to have any patterns in it. If you see valid patterns in "
"the file then the issue is probably caused by a circular import.", "the file then the issue is probably caused by a circular import.",
getattr, resolver, 'url_patterns') getattr, resolver, 'url_patterns'
)
@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls') @override_settings(ROOT_URLCONF='urlpatterns_reverse.urls')
@ -198,8 +200,10 @@ class URLPatternReverse(TestCase):
self.assertRaises(NoReverseMatch, reverse, None) self.assertRaises(NoReverseMatch, reverse, None)
def test_prefix_braces(self): def test_prefix_braces(self):
self.assertEqual('/%7B%7Binvalid%7D%7D/includes/non_path_include/', self.assertEqual(
reverse('non_path_include', prefix='/{{invalid}}/')) '/%7B%7Binvalid%7D%7D/includes/non_path_include/',
reverse('non_path_include', prefix='/{{invalid}}/')
)
def test_prefix_parenthesis(self): def test_prefix_parenthesis(self):
# Parentheses are allowed and should not cause errors or be escaped # Parentheses are allowed and should not cause errors or be escaped
@ -213,8 +217,10 @@ class URLPatternReverse(TestCase):
) )
def test_prefix_format_char(self): def test_prefix_format_char(self):
self.assertEqual('/bump%2520map/includes/non_path_include/', self.assertEqual(
reverse('non_path_include', prefix='/bump%20map/')) '/bump%2520map/includes/non_path_include/',
reverse('non_path_include', prefix='/bump%20map/')
)
def test_non_urlsafe_prefix_with_args(self): def test_non_urlsafe_prefix_with_args(self):
# Regression for #20022, adjusted for #24013 because ~ is an unreserved # Regression for #20022, adjusted for #24013 because ~ is an unreserved
@ -550,8 +556,7 @@ class RequestURLconfTests(TestCase):
def test_urlconf(self): def test_urlconf(self):
response = self.client.get('/test/me/') response = self.client.get('/test/me/')
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertEqual(response.content, b'outer:/test/me/,' self.assertEqual(response.content, b'outer:/test/me/,inner:/inner_urlconf/second_test/')
b'inner:/inner_urlconf/second_test/')
response = self.client.get('/inner_urlconf/second_test/') response = self.client.get('/inner_urlconf/second_test/')
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
response = self.client.get('/second_test/') response = self.client.get('/second_test/')
@ -741,8 +746,7 @@ class ErroneousViewTests(TestCase):
def test_erroneous_reverse(self): def test_erroneous_reverse(self):
""" """
Ensure that a useful exception is raised when a regex is invalid in the Ensure that a useful exception is raised when a regex is invalid in the
URLConf. URLConf (#6170).
Refs #6170.
""" """
# The regex error will be hit before NoReverseMatch can be raised # The regex error will be hit before NoReverseMatch can be raised
self.assertRaises(ImproperlyConfigured, reverse, 'whatever blah blah') self.assertRaises(ImproperlyConfigured, reverse, 'whatever blah blah')
@ -750,8 +754,7 @@ class ErroneousViewTests(TestCase):
class ViewLoadingTests(TestCase): class ViewLoadingTests(TestCase):
def test_view_loading(self): def test_view_loading(self):
self.assertEqual(get_callable('urlpatterns_reverse.views.empty_view'), self.assertEqual(get_callable('urlpatterns_reverse.views.empty_view'), empty_view)
empty_view)
# passing a callable should return the callable # passing a callable should return the callable
self.assertEqual(get_callable(empty_view), empty_view) self.assertEqual(get_callable(empty_view), empty_view)
@ -759,14 +762,12 @@ class ViewLoadingTests(TestCase):
def test_exceptions(self): def test_exceptions(self):
# A missing view (identified by an AttributeError) should raise # A missing view (identified by an AttributeError) should raise
# ViewDoesNotExist, ... # ViewDoesNotExist, ...
six.assertRaisesRegex(self, ViewDoesNotExist, with six.assertRaisesRegex(self, ViewDoesNotExist, ".*View does not exist in.*"):
".*View does not exist in.*", get_callable('urlpatterns_reverse.views.i_should_not_exist')
get_callable,
'urlpatterns_reverse.views.i_should_not_exist')
# ... but if the AttributeError is caused by something else don't # ... but if the AttributeError is caused by something else don't
# swallow it. # swallow it.
self.assertRaises(AttributeError, get_callable, with self.assertRaises(AttributeError):
'urlpatterns_reverse.views_broken.i_am_broken') get_callable('urlpatterns_reverse.views_broken.i_am_broken')
class IncludeTests(SimpleTestCase): class IncludeTests(SimpleTestCase):