Merge pull request #393 from gandalfar/geoip_fix2

Tests for GeoIP Fix

Author: goranche

web/templates/pages/index.html

@@ -45,7 +45,7 @@
 					{% if country.country_code %}
 						<a class="btn btn-primary btn-lg"
 							href="{% url 'web.search_events' %}?country_code={{ country.country_code }}&amp;past={{ past }}">
-						   <i class="fa fa-list"></i> List all events <span id="country"> {{ country.country_name }}</span>
+						   <i class="fa fa-list"></i> List all events in <span id="country"> {{ country.country_name }}</span>
 						</a>
 					{% else %}
 						<a class="btn btn-primary btn-lg" href="{% url 'web.search_events' %}">

web/tests/test_event_views.py

@@ -235,6 +235,19 @@ def test_nonexistent_event(db, client):
 
 	assert response.status_code == 404
 
+@pytest.mark.django_db
+def test_geoip_slovenian_ip(db, client):
+	response = client.get('/', REMOTE_ADDR='93.103.53.1')
+
+	assert 'List all events in <span id="country"> Slovenia' in response.content
+
+@pytest.mark.django_db
+def test_geoip_invalid_ip(db, client):
+	response = client.get('/', REMOTE_ADDR='127.0.0.1')
+
+	assert 'List all events' in response.content
+	assert 'List all events <span' not in response.content
+
 @pytest.mark.django_db
 def test_list_events_for_country_code(db, client):
 	response = client.get(reverse('web.view_event_by_country', args=['SI']))