summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-01-26 11:06:29 +0100
committerClaude Paroz <claude@2xlibre.net>2016-01-28 08:52:28 +0100
commitca6ab72bb76fefac0188b95e60320466cc8d7610 (patch)
tree8dba548c7533c5c960fb3370cc25ace315fde179 /tests
parente47f0c12471b6688b2ace9a0732bf79125ee9086 (diff)
[1.9.x] Fixed #26138 -- Ensured geometry_field's geometry is always serialized
Thanks Bernd Schlapsi for the report. Backport of 54236a2c1c from master.
Diffstat (limited to 'tests')
-rw-r--r--tests/gis_tests/geoapp/test_serializers.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/gis_tests/geoapp/test_serializers.py b/tests/gis_tests/geoapp/test_serializers.py
index 1bf3ec0acf..de104b5cda 100644
--- a/tests/gis_tests/geoapp/test_serializers.py
+++ b/tests/gis_tests/geoapp/test_serializers.py
@@ -47,8 +47,21 @@ class GeoJSONSerializerTests(TestCase):
geodata = json.loads(geojson)
self.assertEqual(geodata['features'][0]['geometry']['type'], 'Point')
- geojson = serializers.serialize('geojson', MultiFields.objects.all(),
- geometry_field='poly')
+ geojson = serializers.serialize(
+ 'geojson',
+ MultiFields.objects.all(),
+ geometry_field='poly'
+ )
+ geodata = json.loads(geojson)
+ self.assertEqual(geodata['features'][0]['geometry']['type'], 'Polygon')
+
+ # geometry_field is considered even if not in fields (#26138).
+ geojson = serializers.serialize(
+ 'geojson',
+ MultiFields.objects.all(),
+ geometry_field='poly',
+ fields=('city',)
+ )
geodata = json.loads(geojson)
self.assertEqual(geodata['features'][0]['geometry']['type'], 'Polygon')