From 92f66a613498172e6300c8a0b57513183e998597 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 22 Jul 2013 09:55:45 +0200 Subject: [1.6.x] Fixed #20773 -- [gis] Fixed regression in GoogleMap output Thanks Martyn Clement for the report and the initial patch. Backport of 27c1a7257 from master. --- django/contrib/gis/maps/google/gmap.py | 3 ++- django/contrib/gis/tests/geoadmin/tests.py | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/django/contrib/gis/maps/google/gmap.py b/django/contrib/gis/maps/google/gmap.py index 75b285ca76..ff6562696d 100644 --- a/django/contrib/gis/maps/google/gmap.py +++ b/django/contrib/gis/maps/google/gmap.py @@ -134,7 +134,8 @@ class GoogleMap(object): @property def scripts(self): "Returns all tags required with Google Maps JavaScript." - return format_html('%s\n ', self.api_script, mark_safe(self.js)) + return format_html('{0}\n ', + self.api_script, mark_safe(self.js)) @property def style(self): diff --git a/django/contrib/gis/tests/geoadmin/tests.py b/django/contrib/gis/tests/geoadmin/tests.py index 15874758be..1bb54f2744 100644 --- a/django/contrib/gis/tests/geoadmin/tests.py +++ b/django/contrib/gis/tests/geoadmin/tests.py @@ -1,8 +1,9 @@ from __future__ import absolute_import -from django.test import TestCase from django.contrib.gis.geos import HAS_GEOS from django.contrib.gis.tests.utils import HAS_SPATIAL_DB +from django.test import TestCase +from django.test.utils import override_settings from django.utils.unittest import skipUnless if HAS_GEOS and HAS_SPATIAL_DB: @@ -11,6 +12,8 @@ if HAS_GEOS and HAS_SPATIAL_DB: from .models import City +GOOGLE_MAPS_API_KEY = 'XXXX' + @skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.") class GeoAdminTest(TestCase): @@ -38,7 +41,9 @@ class GeoAdminTest(TestCase): result) def test_olwidget_has_changed(self): - """ Check that changes are accurately noticed by OpenLayersWidget. """ + """ + Check that changes are accurately noticed by OpenLayersWidget. + """ geoadmin = admin.site._registry[City] form = geoadmin.get_changelist_form(None)() has_changed = form.fields['point']._has_changed @@ -54,3 +59,15 @@ class GeoAdminTest(TestCase): self.assertFalse(has_changed(initial, data_same)) self.assertFalse(has_changed(initial, data_almost_same)) self.assertTrue(has_changed(initial, data_changed)) + + @override_settings(GOOGLE_MAPS_API_KEY=GOOGLE_MAPS_API_KEY) + def test_google_map_scripts(self): + """ + Testing GoogleMap.scripts() output. See #20773. + """ + from django.contrib.gis.maps.google.gmap import GoogleMap + + google_map = GoogleMap() + scripts = google_map.scripts + self.assertIn(GOOGLE_MAPS_API_KEY, scripts) + self.assertIn("new GMap2", scripts) -- cgit v1.3