Merge pull request #364 from goranche/master

Removed a stale (hopefully) URL, added test for 404

Author: ialja

web/templates/404.html

@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block title %}- Whoa, 500!{% endblock title %}
+{% block title %}- Whoa, 404!{% endblock title %}
 
 {% block content %}
 	<div class="container">

web/tests/test_event_views.py

@@ -229,3 +229,8 @@ def test_edit_event_with_image(admin_user, admin_client, db):
 	response = admin_client.get(event.get_absolute_url())
 	assert 'event_picture/ercchy' not in response.content
 
+@pytest.mark.django_db
+def test_nonexistent_event(db, client):
+	response = client.get(reverse('web.view_event', args=[1234, 'shouldnt-exist']))
+
+	assert response.status_code == 404

web/tests/test_site.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+@pytest.mark.django_db
+def test_unknown_URL(db, client):
+	response = client.get('/bar-foo/')
+
+	assert response.status_code == 404

web/urls.py

@@ -23,6 +23,4 @@
 	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'),
-    # Note: do not place any url after this one of it will not work
-    url(r'^(?P<country_code>\w+)/$', 'events.index', name='web.index'),
 )

web/views/events.py

@@ -38,6 +38,8 @@
 from web.decorators.events import can_moderate_event
 from web.decorators.events import is_ambassador
 
+from django.http import Http404
+from django.core.exceptions import ObjectDoesNotExist
 
 """
 Do not Query the database directly from te view.
@@ -188,7 +190,11 @@ def view_event_by_country(request, country_code):
 
 
 def view_event(request, event_id, slug):
-	event = get_event_by_id(event_id)
+	try:
+		event = get_event_by_id(event_id)
+	except ObjectDoesNotExist as e:
+		raise Http404
+
 	next_event = get_next_or_previous(event, country_code=event.country)
 	nearby = get_nearby_events(event, limit=4)