Fix tests

Author: janbaykara

groundwork/geo/templates/groundwork/geo/components/map.html

@@ -5,10 +5,11 @@
   {% for key, val in values %}
     {% if val %}data-map-{{key}}-value="{{val}}"{% endif %}
   {% endfor %}
-  data-controller="map"
->
+  data-controller="map">
   {{slots}}
-  {% if in_place != True %}
-    {% include "groundwork/geo/components/map_canvas.html" %}
+  {% if in_place is False %}
+    {% comment %}It's up to the developer to place the map canvas{% endcomment %}
+  {% else %}
+    {% include "groundwork/geo/components/map_canvas.html" only %}
   {% endif %}
 </{{element}}>

groundwork/geo/templates/groundwork/geo/components/map_canvas.html

@@ -1,6 +1,7 @@
-<{{element}}
+<{% firstof element "div" %}
   {% for key, val in attrs %}
     {% if val %}{{key}}="{{val}}"{% endif %}
   {% endfor %}
-  data-map-target="canvas">
-</{{element}}>
+  data-map-target="canvas"
+>
+</{% firstof element "div" %}>

groundwork/geo/templatetags/groundwork_geo.py

@@ -24,6 +24,7 @@ def map(
     api_key: Optional[str] = None,
     center: Any = None,
     zoom: Optional[int] = None,
+    in_place: Optional[bool] = True,
     children: Optional[template.NodeList] = None,
     **attrs: Dict[str, str],
 ) -> template.Node:
@@ -36,6 +37,7 @@ def map(
     return MAP_TEMPLATE.render(
         {
             "element": element,
+            "in_place": in_place,
             "values": (
                 ("api-key", api_key),
                 ("center", center),

test/geo/test_tags.py

@@ -18,6 +18,34 @@ def test_renders_map(self):
             html,
         )
 
+    def test_renders_map_in_place_false_without_canvas(self):
+        html = render_template(
+            "{% load groundwork_geo %}"
+            '{% map in_place=False class="w-100" zoom=9 %}'
+            "{% endmap %}"
+        )
+
+        self.assertInHTML(
+            '<div class="w-100" data-controller="map" data-map-zoom-value="9" data-map-api-key-value="dummy">'
+            "</div>",
+            html,
+        )
+
+    def test_renders_map_in_place_false_with_canvas(self):
+        html = render_template(
+            "{% load groundwork_geo %}"
+            '{% map in_place=False class="w-100" zoom=9 %}'
+            '{% map_canvas class="w-50" %}'
+            "{% endmap %}"
+        )
+
+        self.assertInHTML(
+            '<div class="w-100" data-controller="map" data-map-zoom-value="9" data-map-api-key-value="dummy">'
+            '<div class="w-50" data-map-target="canvas"></div>'
+            "</div>",
+            html,
+        )
+
 
 def render_template(content: str) -> Any:
     context = Context()