update tests

Author: ocefpaf

folium/__init__.py

@@ -9,8 +9,8 @@
 from folium._version import get_versions
 
 from folium.features import (
-    Circle, CircleMarker, ClickForMarker, CustomIcon, DivIcon, GeoJson, LatLngPopup,
-    MarkerCluster, PolyLine, RegularPolygonMarker, TopoJson, Vega, VegaLite,
+    Circle, CircleMarker, ClickForMarker, CustomIcon, DivIcon, GeoJson,
+    LatLngPopup, PolyLine, RegularPolygonMarker, TopoJson, Vega, VegaLite,
     WmsTileLayer,
 )
 

tests/plugins/test_fast_marker_cluster.py

@@ -32,13 +32,9 @@ def test_fast_marker_cluster():
     out = m._parent.render()
 
     # We verify that imports
-    assert ('<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.'
-            'markercluster/1.0.0/leaflet.markercluster.js"></script>') in out
-    assert ('<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/'
-            'libs/leaflet.markercluster/1.0.0/MarkerCluster.css" />') in out
-    assert ('<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/'
-            'libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css" />'
-            ) in out
+    assert '<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.1.0/leaflet.markercluster.js"></script>' in out  # noqa
+    assert '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.1.0/MarkerCluster.css" />' in out  # noqa
+    assert '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.1.0/MarkerCluster.Default.css" />' in out  # noqa
 
     # Verify the script part is okay.
     tmpl = Template("""

tests/plugins/test_marker_cluster.py

@@ -32,17 +32,17 @@ def test_marker_cluster():
     out = m._parent.render()
 
     # We verify that imports
-    assert ('<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.'
-            'markercluster/1.0.0/leaflet.markercluster.js"></script>') in out
-    assert ('<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/'
-            'libs/leaflet.markercluster/1.0.0/MarkerCluster.css" />') in out
-    assert ('<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/'
-            'libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css" />'
-            ) in out
+    assert '<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.1.0/leaflet.markercluster.js"></script>' in out  # noqa
+    assert '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.1.0/MarkerCluster.css" />' in out  # noqa
+    assert '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.1.0/MarkerCluster.Default.css" />' in out  # noqa
 
     # Verify the script part is okay.
     tmpl = Template("""
-        var {{this.get_name()}} = L.markerClusterGroup();
+        var {{this.get_name()}} = L.markerClusterGroup({
+                {% if this._icon_create_function %}
+                   iconCreateFunction: {{this._icon_create_function}}
+                {% endif %}
+            });
         {{this._parent.get_name()}}.addLayer({{this.get_name()}});
 
         {% for marker in this._children.values() %}