Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-09 07:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use of old style routing will now raise a RuntimeError

Browse source
This commit is contained in:
Karl Hobley 2014-08-18 15:26:00 +01:00
parent a05419bfd1
commit b32ba7fee9
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wagtail/wagtailcore/tests/test_page_model.py
View file

@ -286,19 +286,10 @@ class TestServeView(TestCase):
def test_old_style_routing(self):
"""
Test that route() methods that return an HttpResponse are correctly handled
Old style routing was deprecated in Wagtail 0.4 and removed in 0.6
"""
with warnings.catch_warnings(record=True) as w:
response = self.client.get('/old-style-route/')
# Check that a RemovedInWagtail06Warning has been triggered
self.assertEqual(len(w), 1)
self.assertTrue(issubclass(w[-1].category, RemovedInWagtail06Warning))
self.assertTrue("Page.route should return an instance of wagtailcore.url_routing.RouteResult" in str(w[-1].message))
expected_page = PageWithOldStyleRouteMethod.objects.get(url_path='/home/old-style-route/')
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['self'], expected_page)
self.assertEqual(response.templates[0].name, 'tests/simple_page.html')
self.assertRaises(RuntimeError, self.client.get, '/old-style-route/')
def test_before_serve_hook(self):
response = self.client.get('/events/', HTTP_USER_AGENT='GoogleBot')

6
wagtail/wagtailcore/views.py
View file

@ -21,11 +21,7 @@ def serve(request, path):
path_components = [component for component in path.split('/') if component]
route_result = request.site.root_page.specific.route(request, path_components)
if isinstance(route_result, HttpResponse):
warnings.warn(
"Page.route should return an instance of wagtailcore.url_routing.RouteResult, not an HttpResponse",
RemovedInWagtail06Warning
)
return route_result
raise RuntimeError("Page.route should return an instance of wagtailcore.url_routing.RouteResult, not an HttpResponse")
(page, args, kwargs) = route_result
for fn in hooks.get_hooks('before_serve_page'):