Skip to content

Setting resolver_match in current request #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sspross wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Setting resolver_match in current request #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a48830
Updating in current request with used match
sspross Apr 1, 2019
ac592b3
adding proper request mock to tests
sspross Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions multiurl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ def func(self):
def multiview(request):
for i, match in enumerate(self.matches):
try:
# Update ResolverMatch in request for later usage
request.resolver_match = match
return match.func(request, *match.args, **match.kwargs)
except self.exceptions:
continue
Expand Down
11 changes: 7 additions & 4 deletions tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from django.conf import settings
from django.conf.urls import url
from django.test.client import RequestFactory

from django.http import HttpResponse

Expand Down Expand Up @@ -41,25 +42,27 @@ def setUp(self):
)
])

self.request = RequestFactory()

def test_resolve_match_first(self):
m = self.patterns_catchall.resolve('/jane/')
response = m.func(request=None, *m.args, **m.kwargs)
response = m.func(request=self.request, *m.args, **m.kwargs)
self.assertEqual(response.content, b"Person: Jane Doe")

def test_resolve_match_middle(self):
m = self.patterns_catchall.resolve('/sf/')
response = m.func(request=None, *m.args, **m.kwargs)
response = m.func(request=self.request, *m.args, **m.kwargs)
self.assertEqual(response.content, b"Place: San Francisco")

def test_resolve_match_last(self):
m = self.patterns_catchall.resolve('/bacon/')
response = m.func(request=None, *m.args, **m.kwargs)
response = m.func(request=self.request, *m.args, **m.kwargs)
self.assertEqual(response.content, b"Thing: Bacon")

def test_resolve_match_faillthrough(self):
m = self.patterns_no_fallthrough.resolve('/bacon/')
with self.assertRaises(urlresolvers.Resolver404):
m.func(request=None, *m.args, **m.kwargs)
m.func(request=self.request, *m.args, **m.kwargs)

def test_no_match(self):
with self.assertRaises(urlresolvers.Resolver404):
Expand Down