diff options
| author | Kevin Christopher Henry <k@severian.com> | 2013-10-03 03:20:04 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-04-23 20:12:34 -0400 |
| commit | 91afc00513bd2fa6302ea2be35e1f842cbd5fd38 (patch) | |
| tree | d46dd1b8dd88af40488d6e9290be8a45426f3bb3 /tests/model_permalink | |
| parent | 0aa4c6c3911fd38567ea2d20c425d1e81e859ee1 (diff) | |
Fixed #21157 -- Fixed problems with ResolverMatch
- Fixed bug in get_callable() that caused resolve() to put a string
in ResolverMatch.func.
- Made ResolverMatch.url_name match the actual url name (or None).
- Updated tests that used the string value in ResolverMatch.func, and
added regression tests for this bug.
- Corrected test urls whose dummy view paths caused failures (behavior
that was previously masked by this bug).
Diffstat (limited to 'tests/model_permalink')
| -rw-r--r-- | tests/model_permalink/urls.py | 2 | ||||
| -rwxr-xr-x | tests/model_permalink/views.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/model_permalink/urls.py b/tests/model_permalink/urls.py index cbe50288b8..8ad8a16d05 100644 --- a/tests/model_permalink/urls.py +++ b/tests/model_permalink/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import url urlpatterns = [ - url(r'^guitarists/(\w{1,50})/$', 'unimplemented_view_placeholder', name='guitarist_detail'), + url(r'^guitarists/(\w{1,50})/$', 'model_permalink.views.empty_view', name='guitarist_detail'), ] diff --git a/tests/model_permalink/views.py b/tests/model_permalink/views.py new file mode 100755 index 0000000000..c1ee23e893 --- /dev/null +++ b/tests/model_permalink/views.py @@ -0,0 +1,5 @@ +from django.http import HttpResponse
+
+
+def empty_view(request, *args, **kwargs):
+ return HttpResponse('')
|