Merge pull request #368 from goranche/master

Added tests for country redirecting, fixed regex for same

Author: jurecuhalev

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'

web/urls.py

@@ -24,5 +24,5 @@
 	url(r'^scoreboard/$', 'events.scoreboard', name='web.scoreboard'),
 	url(r'^change_status/(?P<event_id>\d+)/$', 'events.change_status', name='web.change_status'),
 	url(r'^reject_status/(?P<event_id>\d+)/$', 'events.reject_status', name='web.reject_status'),
-	url(r'^(?P<country_code>[A-Z][A-Z])$', RedirectView.as_view(url = '/#%(country_code)s')),
+	url(r'^(?P<country_code>[A-Z][A-Z])/?$', RedirectView.as_view(url = '/#%(country_code)s')),
 )