From c38a7b4f856cbc1e5ffd09624e6b7be104a7f8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Bla=C5=BEi=C4=8D?= Date: Wed, 1 Oct 2014 22:00:33 +0200 Subject: [PATCH] Added tests for country redirecting, added a regex char so slashes after country code is handled --- web/tests/test_site.py | 14 ++++++++++++++ web/urls.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/web/tests/test_site.py b/web/tests/test_site.py index e590e22c..80d4a287 100644 --- a/web/tests/test_site.py +++ b/web/tests/test_site.py @@ -6,3 +6,17 @@ def test_unknown_URL(db, client): response = client.get('/bar-foo/') assert response.status_code == 404 + +@pytest.mark.django_db +def test_country_redirect(db, client): + # Test without a slash in the end + response = client.get('/AB') + + assert response.status_code == 301 + assert response['Location'][-4:] == '/#AB' + + # and with one + response = client.get('/AB/') + + assert response.status_code == 301 + assert response['Location'][-4:] == '/#AB' diff --git a/web/urls.py b/web/urls.py index aced7260..5e2936e1 100644 --- a/web/urls.py +++ b/web/urls.py @@ -24,5 +24,5 @@ url(r'^scoreboard/$', 'events.scoreboard', name='web.scoreboard'), url(r'^change_status/(?P\d+)/$', 'events.change_status', name='web.change_status'), url(r'^reject_status/(?P\d+)/$', 'events.reject_status', name='web.reject_status'), - url(r'^(?P[A-Z][A-Z])$', RedirectView.as_view(url = '/#%(country_code)s')), + url(r'^(?P[A-Z][A-Z])/?$', RedirectView.as_view(url = '/#%(country_code)s')), )