Merge remote-tracking branch 'upstream/master'

Author: ViaCoco

static/js/events.js

@@ -80,7 +80,10 @@ var Codeweek = window.Codeweek || {};
 				document.getElementById("autocomplete").value = results[0].formatted_address;
 				// the last item in the geocoder for latLng results array is the country
 				var country = results.slice(-1)[0].address_components.slice(-1)[0].short_name;
-
+				var frenchColonies = ['MQ', 'GF', 'GP'] // Martinique, French Guiana, Guadeloupe
+				if (frenchColonies.indexOf(country) >= 0) {
+					country = 'FR';
+				}
 				updateCountrySelection(country);
 			}
 		});

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_events_processors.py

@@ -8,6 +8,7 @@
 from py.path import local
 
 from geoposition import Geoposition
+from web.processors.event import list_countries
 
 from api.models.events import Event
 from api.models import UserProfile
@@ -389,11 +390,91 @@ def test_create_event_in_serbia(admin_user, db):
 
 	assert "RS" == test_event.country.code
 
+
+@pytest.mark.django_db
+def test_create_event_in_martinique_for_france(admin_user, db):
+	event_data = {
+		'audience': [3],
+		'theme': [1,2],
+		'contact_person': u'[email protected]',
+		'country': u'FR',
+		'description': u'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\r\ntempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\r\nquis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\r\nconsequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\r\ncillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\r\nproident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+		'event_url': u'',
+		'location': u'1011 Chemin rural No 8 Bis de Clemencin, Le Lamentin, Martinique',
+		'organizer': u'RailsGirls Martinique',
+		"creator": admin_user,
+		'start_date': datetime.datetime.now(),
+		'end_date': datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
+		'tags': [u'css', u'html', u'web'],
+		'title': u'RailsGirls Martinique',
+	}
+
+	test_event = create_or_update_event(event_id=None, **event_data)
+
+	assert "FR" == test_event.country.code
+
+
+@pytest.mark.django_db
+def test_create_event_in_each_listed_country(admin_user, db):
+	all_countries = list_countries()
+
+	for country in all_countries[2:]:
+		country_code = country[1]
+		country_name = country[0]
+
+		event_data = {
+			'audience': [3],
+			'theme': [1,2],
+			'contact_person': u'[email protected]',
+			'country': country_code,
+			'description': u'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\r\ntempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\r\nquis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\r\nconsequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\r\ncillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\r\nproident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+			'event_url': u'',
+			'location': country_name,
+			'organizer': u'RailsGirls ' + country_name,
+			"creator": admin_user,
+			'start_date': datetime.datetime.now(),
+			'end_date': datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
+			'tags': [u'css', u'html', u'web'],
+			'title': u'RailsGirls ' + country_name,
+		}
+
+		test_event = create_or_update_event(event_id=None, **event_data)
+
+		assert country_code == test_event.country.code
+
+		test_event.delete()
+
+
+def test_list_countries():
+	# a function we use a lot to get all countries, so let's check it's returning expected results
+	all_countries = list_countries()
+
+	# Austria should be the first country after two custom entries (All countries)
+	assert "Austria" == all_countries[2][0]
+
+	# checking two random countries - our own and Kosovo, which is a special case
+	assert ('Slovenia', 'SI') in all_countries
+	assert ('Kosovo', 'XK') in all_countries
+
+	# United Kingdom should be last
+	assert "United Kingdom" == all_countries[-1][0]
+
+	# if listing works, results are tuples ('country_name', 'country_code')
+	# country_code should be a string with 2 characters
+	for country in all_countries[2:]:
+		assert len(country[1]) == 2
+
+
 @pytest.mark.django_db
 def test_scoreboard_counter(admin_user, db):
 
 	initial_counter = count_approved_events_for_country()
 
+	# extra check to make sure the number of results matches 
+	# the number of listed countries minus two custom entries
+	all_countries = list_countries()
+	assert len(initial_counter) == len(all_countries[2:])
+
 	counted_events_before = 0
 
 	for country in initial_counter:
@@ -437,16 +518,20 @@ def test_scoreboard_counter(admin_user, db):
 	new_counter = count_approved_events_for_country()
 
 	counted_events_after = 0
+	country_score_after = 0
 
 	for country in new_counter:
 			if country['country_code'] == 'SI':
 				counted_events_after = country['events']
+				country_score_after = country['score']
 
 	# An extra check with a direct DB query
 	counted_events_query = Event.objects.filter(status='APPROVED').filter(country='SI').count()
 
 	assert counted_events_after == counted_events_before + 1
 	assert counted_events_after == counted_events_query
 
+	assert country_score_after > 0 
+	
 	test_approved_event.delete()
 	test_pending_event.delete()

web/tests/test_site.py

@@ -0,0 +1,22 @@
+# -*- 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
+
+@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

@@ -2,6 +2,7 @@
 from django.conf.urls import url
 from django.contrib import admin
 from django.views.generic import TemplateView
+from django.views.generic import RedirectView
 
 admin.autodiscover()
 
@@ -23,6 +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'),
-    # 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'),
+	url(r'^(?P<country_code>[A-Z][A-Z])/?$', RedirectView.as_view(url = '/#%(country_code)s')),
 )

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)