umap-project 2.1.3__py3-none-any.whl → 2.2.0__py3-none-any.whl

umap/tests/integration/test_import.py

@@ -1,6 +1,8 @@
 import json
+import platform
 import re
 from pathlib import Path
+from time import sleep
 
 import pytest
 from playwright.sync_api import expect
@@ -10,11 +12,30 @@ from umap.models import DataLayer
 pytestmark = pytest.mark.django_db
 
 
+def test_layers_list_is_updated(live_server, tilelayer, page):
+    page.goto(f"{live_server.url}/map/new/")
+    modifier = "Cmd" if platform.system() == "Darwin" else "Ctrl"
+    page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
+    # Should work
+    page.get_by_label("Choose the layer to import").select_option(
+        label="Import in a new layer"
+    )
+    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Add a layer").click()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill("foobar")
+    page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
+    # Should still work
+    page.get_by_label("Choose the layer to import").select_option(
+        label="Import in a new layer"
+    )
+    # Now layer should be visible in the options
+    page.get_by_label("Choose the layer to import").select_option(label="foobar")
+
+
 def test_umap_import_from_file(live_server, tilelayer, page):
     page.goto(f"{live_server.url}/map/new/")
-    button = page.get_by_title("Import data")
-    expect(button).to_be_visible()
-    button.click()
+    page.get_by_title("Import data").click()
     file_input = page.locator("input[type='file']")
     with page.expect_file_chooser() as fc_info:
         file_input.click()
@@ -24,34 +45,38 @@ def test_umap_import_from_file(live_server, tilelayer, page):
     button = page.get_by_role("button", name="Import", exact=True)
     expect(button).to_be_visible()
     button.click()
-    layers = page.locator(".umap-browse-datalayers li")
-    expect(layers).to_have_count(2)
-    nonloaded = page.locator(".umap-browse-datalayers li.off")
-    expect(nonloaded).to_have_count(1)
     assert file_input.input_value()
     # Close the import panel
     page.keyboard.press("Escape")
+    # Reopen
+    page.get_by_title("Import data").click()
+    sleep(1)  # Wait for CSS transition to happen
     assert not file_input.input_value()
     expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
         "Carte sans nom"
     )
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
+    expect(layers).to_have_count(2)
+    nonloaded = page.locator(".umap-browser .datalayer.off")
+    expect(nonloaded).to_have_count(1)
 
 
 def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/map/new/")
+    page.get_by_role("button", name="See layers").click()
     page.get_by_title("Import data").click()
     textarea = page.locator(".umap-upload textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.umap"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("umap")
     page.get_by_role("button", name="Import", exact=True).click()
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer")
     expect(layers).to_have_count(2)
     expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
         "Imported map"
     )
-    page.get_by_role("button", name="See data layers").click()
     expect(page.get_by_text("Tunnels")).to_be_visible()
     expect(page.get_by_text("Cities")).to_be_visible()
     expect(page.locator(".leaflet-control-minimap")).to_be_visible()
@@ -67,7 +92,8 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
 
 def test_import_geojson_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     expect(markers).to_have_count(0)
@@ -91,7 +117,8 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
 
 def test_import_kml_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     expect(markers).to_have_count(0)
@@ -115,7 +142,8 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
 
 def test_import_gpx_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     expect(markers).to_have_count(0)
@@ -139,7 +167,8 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page):
 
 def test_import_osm_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
@@ -158,7 +187,8 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
 
 def test_import_csv_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
@@ -177,7 +207,8 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
 
 def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
     expect(layers).to_have_count(1)
@@ -195,7 +226,8 @@ def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap)
 
 def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
     expect(layers).to_have_count(1)
@@ -214,7 +246,8 @@ def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
 
 def test_can_import_in_new_datalayer(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
     expect(layers).to_have_count(1)
@@ -317,7 +350,8 @@ def test_import_geometry_collection(live_server, page, tilelayer):
         ],
     }
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     expect(markers).to_have_count(0)
@@ -352,7 +386,8 @@ def test_import_multipolygon(live_server, page, tilelayer):
         },
     }
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     paths = page.locator("path")
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
@@ -383,7 +418,8 @@ def test_import_multipolyline(live_server, page, tilelayer):
         ],
     }
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     paths = page.locator("path")
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
@@ -397,3 +433,19 @@ def test_import_multipolyline(live_server, page, tilelayer):
     # A layer has been created
     expect(layers).to_have_count(1)
     expect(paths).to_have_count(1)
+
+
+def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
+    markers = page.locator(".leaflet-marker-icon")
+    page.get_by_title("Import data").click()
+    textarea = page.locator(".umap-upload textarea")
+    textarea.fill("a,b,c\n12.23,48.34,mypoint\n12.23,48.34,mypoint2")
+    page.locator('select[name="format"]').select_option("csv")
+    page.get_by_role("button", name="Import", exact=True).click()
+    # FIXME do not create a layer
+    expect(layers).to_have_count(1)
+    expect(markers).to_have_count(0)
+    expect(page.locator(".umap-alert")).to_be_visible()

umap/tests/integration/test_map.py

@@ -42,10 +42,10 @@ def test_default_view_without_datalayer_should_use_default_center(
 ):
     datalayer.settings["displayOnLoad"] = False
     datalayer.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     # Hash is defined, so map is initialized
     expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+"))
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer h5")
     expect(layers).to_have_count(1)
 
 
@@ -56,10 +56,10 @@ def test_default_view_latest_without_datalayer_should_use_default_center(
     datalayer.save()
     map.settings["properties"]["defaultView"] = "latest"
     map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     # Hash is defined, so map is initialized
     expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+"))
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer h5")
     expect(layers).to_have_count(1)
 
 
@@ -70,21 +70,22 @@ def test_default_view_data_without_datalayer_should_use_default_center(
     datalayer.save()
     map.settings["properties"]["defaultView"] = "data"
     map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     # Hash is defined, so map is initialized
     expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+"))
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer h5")
     expect(layers).to_have_count(1)
 
 
 def test_default_view_latest_with_marker(map, live_server, datalayer, page):
     map.settings["properties"]["defaultView"] = "latest"
     map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     # Hash is defined, so map is initialized
     expect(page).to_have_url(re.compile(r".*#7/48\..+/14\..+"))
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer h5")
     expect(layers).to_have_count(1)
+    expect(page.locator(".leaflet-popup")).to_be_visible()
 
 
 def test_default_view_latest_with_line(map, live_server, page):
@@ -109,9 +110,9 @@ def test_default_view_latest_with_line(map, live_server, page):
     DataLayerFactory(map=map, data=data)
     map.settings["properties"]["defaultView"] = "latest"
     map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     expect(page).to_have_url(re.compile(r".*#8/48\..+/2\..+"))
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer h5")
     expect(layers).to_have_count(1)
 
 
@@ -140,9 +141,9 @@ def test_default_view_latest_with_polygon(map, live_server, page):
     DataLayerFactory(map=map, data=data)
     map.settings["properties"]["defaultView"] = "latest"
     map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     expect(page).to_have_url(re.compile(r".*#8/48\..+/2\..+"))
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer h5")
     expect(layers).to_have_count(1)
 
 
@@ -168,10 +169,10 @@ def test_remote_layer_should_not_be_used_as_datalayer_for_created_features(
     }
     datalayer.save()
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    toggle = page.get_by_role("button", name="See data layers")
+    toggle = page.get_by_role("button", name="See layers")
     expect(toggle).to_be_visible()
     toggle.click()
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer h5")
     expect(layers).to_have_count(1)
     map_el = page.locator("#map")
     add_marker = page.get_by_title("Draw a marker")
@@ -179,10 +180,11 @@ def test_remote_layer_should_not_be_used_as_datalayer_for_created_features(
     marker = page.locator(".leaflet-marker-icon")
     expect(marker).to_have_count(0)
     add_marker.click()
-    map_el.click(position={"x": 100, "y": 100})
+    map_el.click(position={"x": 500, "y": 100})
     expect(marker).to_have_count(1)
     # A new datalayer has been created to host this created feature
     # given the remote one cannot accept new features
+    page.get_by_title("See layers").click()
     expect(layers).to_have_count(2)
 
 
@@ -195,9 +197,9 @@ def test_can_hide_datalayer_from_caption(openmap, live_server, datalayer, page):
     toggle.click()
     layers = page.locator(".umap-caption .datalayer-legend")
     expect(layers).to_have_count(1)
-    found = page.locator("#umap-ui-container").get_by_text(datalayer.name)
+    found = page.locator(".panel.left.on").get_by_text(datalayer.name)
     expect(found).to_be_visible()
-    hidden = page.locator("#umap-ui-container").get_by_text(other.name)
+    hidden = page.locator(".panel.left.on").get_by_text(other.name)
     expect(hidden).to_be_hidden()
 
 

umap/tests/integration/test_map_list.py

@@ -0,0 +1,28 @@
+import pytest
+from playwright.sync_api import expect
+
+pytestmark = pytest.mark.django_db
+
+
+def test_should_not_render_any_control(live_server, tilelayer, page, map):
+    map.settings["properties"]["onLoadPanel"] = "databrowser"
+    map.settings["properties"]["miniMap"] = True
+    map.settings["properties"]["captionBar"] = True
+    map.save()
+    # Make sure those controls are visible in normal view
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.locator(".leaflet-control-minimap")).to_be_visible()
+    expect(page.locator(".umap-browser")).to_be_visible()
+    expect(page.locator(".umap-caption-bar")).to_be_visible()
+    expect(page.locator(".leaflet-control-zoom")).to_be_visible()
+    expect(page.locator(".leaflet-control-attribution")).to_be_visible()
+
+    # Now load home page to have the list view
+    page.goto(live_server.url)
+    map_el = page.locator(".map_fragment")
+    expect(map_el).to_be_visible()
+    expect(map_el.locator(".leaflet-control-minimap")).to_be_hidden()
+    expect(map_el.locator(".umap-browser")).to_be_hidden()
+    expect(map_el.locator(".umap-caption-bar")).to_be_hidden()
+    expect(map_el.locator(".leaflet-control-zoom")).to_be_hidden()
+    expect(map_el.locator(".leaflet-control-attribution")).to_be_hidden()

umap/tests/integration/test_owned_map.py

@@ -22,7 +22,7 @@ def test_map_update_with_owner(map, live_server, login):
     expect(save).to_be_visible()
     add_marker = page.get_by_title("Draw a marker")
     expect(add_marker).to_be_visible()
-    edit_settings = page.get_by_title("Edit map properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_visible()
     edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_visible()
@@ -49,7 +49,7 @@ def test_map_update_with_anonymous_but_editable_datalayer(
     enable.click()
     add_marker = page.get_by_title("Draw a marker")
     expect(add_marker).to_be_visible()
-    edit_settings = page.get_by_title("Edit map properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_hidden()
     edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_hidden()
@@ -97,7 +97,7 @@ def test_map_update_with_editor(map, live_server, login, user):
     expect(save).to_be_visible()
     add_marker = page.get_by_title("Draw a marker")
     expect(add_marker).to_be_visible()
-    edit_settings = page.get_by_title("Edit map properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_visible()
     edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_visible()
@@ -126,7 +126,7 @@ def test_permissions_form_with_editor(map, datalayer, live_server, login, user):
 def test_owner_has_delete_map_button(map, live_server, login):
     page = login(map.owner)
     page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
-    settings = page.get_by_title("Edit map properties")
+    settings = page.get_by_title("Map advanced properties")
     expect(settings).to_be_visible()
     settings.click()
     advanced = page.get_by_text("Advanced actions")
@@ -154,7 +154,7 @@ def test_editor_do_not_have_delete_map_button(map, live_server, login, user):
     map.save()
     page = login(user)
     page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
-    settings = page.get_by_title("Edit map properties")
+    settings = page.get_by_title("Map advanced properties")
     expect(settings).to_be_visible()
     settings.click()
     advanced = page.get_by_text("Advanced actions")
@@ -187,7 +187,7 @@ def test_can_change_perms_after_create(tilelayer, live_server, login, user):
     page.goto(f"{live_server.url}/en/map/new")
     # Create a layer
     page.get_by_title("Manage layers").click()
-    page.get_by_role("button", name="Add a layer").click()
+    page.get_by_title("Add a layer").click()
     page.locator("input[name=name]").fill("Layer 1")
     save = page.get_by_role("button", name="Save")
     expect(save).to_be_visible()
@@ -236,16 +236,16 @@ def test_can_change_owner(map, live_server, login, user):
 def test_can_delete_datalayer(live_server, map, login, datalayer):
     page = login(map.owner)
     page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
     page.get_by_role("link", name="Manage layers").click()
     page.once("dialog", lambda dialog: dialog.accept())
-    page.locator("#umap-ui-container").get_by_title("Delete layer").click()
+    page.locator(".panel.right").get_by_title("Delete layer").click()
     with page.expect_response(re.compile(r".*/datalayer/delete/.*")):
         page.get_by_role("button", name="Save").click()
     expect(markers).to_have_count(0)
     # FIXME does not work, resolve to 1 element, even if this command is empty:
-    # document.querySelectorAll(".umap-browse-datalayers li")
-    # expect(layers).to_have_count(0)
+    expect(layers).to_have_count(0)

umap/tests/integration/test_picto.py

@@ -44,7 +44,7 @@ def test_can_change_picto_at_map_level(openmap, live_server, page, pictos):
     expect(marker).to_have_count(1)
     # Should have default img
     expect(marker).to_have_attribute("src", "/static/umap/img/marker.svg")
-    edit_settings = page.get_by_title("Edit map properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_visible()
     edit_settings.click()
     shape_settings = page.get_by_text("Default shape properties")
@@ -152,7 +152,7 @@ def test_can_use_remote_url_as_picto(openmap, live_server, page, pictos):
     expect(marker).to_have_count(1)
     # Should have default img
     expect(marker).to_have_attribute("src", "/static/umap/img/marker.svg")
-    edit_settings = page.get_by_title("Edit map properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_visible()
     edit_settings.click()
     shape_settings = page.get_by_text("Default shape properties")
@@ -171,7 +171,7 @@ def test_can_use_remote_url_as_picto(openmap, live_server, page, pictos):
     input_el.blur()
     expect(marker).to_have_attribute("src", "https://foo.bar/img.jpg")
     # Now close and reopen the form, it should still be the URL tab
-    close = page.locator("#umap-ui-container .toolbox").get_by_title("Close")
+    close = page.locator(".panel.right.on .toolbox").get_by_title("Close")
     expect(close).to_be_visible()
     close.click()
     edit_settings.click()
@@ -191,7 +191,7 @@ def test_can_use_char_as_picto(openmap, live_server, page, pictos):
     marker = page.locator(".umap-div-icon span")
     # Should have default img, so not a span
     expect(marker).to_have_count(0)
-    edit_settings = page.get_by_title("Edit map properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_visible()
     edit_settings.click()
     shape_settings = page.get_by_text("Default shape properties")
@@ -210,7 +210,7 @@ def test_can_use_char_as_picto(openmap, live_server, page, pictos):
     expect(marker).to_have_count(1)
     expect(marker).to_have_text("♩")
     # Now close and reopen the form, it should still be the URL tab
-    close = page.locator("#umap-ui-container .toolbox").get_by_title("Close")
+    close = page.locator(".panel.right.on .toolbox").get_by_title("Close")
     expect(close).to_be_visible()
     close.click()
     edit_settings.click()

umap/tests/integration/test_querystring.py

@@ -15,30 +15,24 @@ def test_scale_control(map, live_server, datalayer, page):
 
 
 def test_datalayers_control(map, live_server, datalayer, page):
-    control = page.locator(".umap-browse-toggle")
-    box = page.locator(".umap-browse-datalayers")
-    more = page.get_by_title("More controls")
+    control = page.locator(".umap-control-browse")
+    browser = page.locator(".umap-browser")
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(control).to_be_visible()
-    expect(box).to_be_hidden()
+    expect(browser).to_be_hidden()
     page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayersControl=true")
     expect(control).to_be_visible()
-    expect(box).to_be_hidden()
+    expect(browser).to_be_hidden()
     page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayersControl=null")
     expect(control).to_be_hidden()
-    expect(more).to_be_visible()
-    more.click()
-    expect(control).to_be_visible()
-    expect(box).to_be_hidden()
+    expect(browser).to_be_hidden()
     page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayersControl=false")
     expect(control).to_be_hidden()
-    expect(more).to_be_visible()
-    more.click()
-    expect(control).to_be_hidden()
-    expect(box).to_be_hidden()
+    expect(browser).to_be_hidden()
+    # Retrocompat
     page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayersControl=expanded")
-    expect(control).to_be_hidden()
-    expect(box).to_be_visible()
+    expect(control).to_be_visible()
+    expect(browser).to_be_visible()
 
 
 def test_can_deactivate_wheel_from_query_string(map, live_server, page):

umap/tests/integration/test_slideshow.py

@@ -1,11 +1,6 @@
-from pathlib import Path
-
 import pytest
-from django.core.files.base import ContentFile
 from playwright.sync_api import expect
 
-from umap.models import Map, Pictogram
-
 from ..base import DataLayerFactory
 
 pytestmark = pytest.mark.django_db

umap/tests/integration/test_statics.py

@@ -40,7 +40,8 @@ def test_javascript_have_been_loaded(
     expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+"))
     expect(page).to_have_url(re.compile(r".*/fr/"))
     # Should be in French, so hashed locale file has been loaded correctly
-    button = page.get_by_text("Voir les calques")
+    button = page.get_by_role("button", name="Voir les calques")
     expect(button).to_be_visible()
-    layers = page.locator(".umap-browse-datalayers li")
+    button.click()
+    layers = page.locator(".umap-browser .datalayer")
     expect(layers).to_have_count(1)

umap/tests/integration/test_tableeditor.py

@@ -2,17 +2,13 @@ import json
 import re
 from pathlib import Path
 
-from playwright.sync_api import expect
-
 from umap.models import DataLayer
 
 
 def test_table_editor(live_server, openmap, datalayer, page):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     page.get_by_role("link", name="Manage layers").click()
-    page.locator("#umap-ui-container").get_by_title(
-        "Edit properties in a table"
-    ).click()
+    page.locator(".panel").get_by_title("Edit properties in a table").click()
     page.once("dialog", lambda dialog: dialog.accept(prompt_text="newprop"))
     page.get_by_text("Add a new property").click()
     page.locator('input[name="newprop"]').fill("newvalue")

umap/tests/integration/test_tilelayer.py

@@ -112,3 +112,13 @@ def test_map_should_display_custom_tilelayer(map, live_server, tilelayers, page)
     iconTiles = page.locator(".leaflet-iconLayers .leaflet-iconLayers-layer")
     # The second of the list should be the current
     expect(iconTiles.nth(1)).to_have_css("background-image", url_pattern)
+
+
+def test_can_have_smart_text_in_attribution(tilelayer, map, live_server, page):
+    map.settings["properties"]["tilelayer"]["attribution"] = (
+        "© [[http://www.openstreetmap.org/copyright|OpenStreetMap]] contributors"
+    )
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.get_by_text("© OpenStreetMap contributors")).to_be_visible()
+    expect(page.get_by_role("link", name="OpenStreetMap")).to_be_visible()

umap/tests/integration/test_view_marker.py

@@ -0,0 +1,64 @@
+from copy import deepcopy
+
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+DATALAYER_DATA = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "name": "test marker",
+                "description": "Some description",
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [14.6889, 48.5529],
+            },
+        },
+    ],
+}
+
+
+@pytest.fixture
+def bootstrap(map, live_server):
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+
+
+def test_should_open_popup_on_click(live_server, map, page, bootstrap):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.locator(".umap-icon-active")).to_be_hidden()
+    page.locator(".leaflet-marker-icon").click()
+    expect(page.locator(".umap-icon-active")).to_be_visible()
+    expect(page.locator(".leaflet-popup-content-wrapper")).to_be_visible()
+    expect(page.get_by_role("heading", name="test marker")).to_be_visible()
+    expect(page.get_by_text("Some description")).to_be_visible()
+    # Close popup
+    page.locator("#map").click()
+    expect(page.locator(".umap-icon-active")).to_be_hidden()
+
+
+def test_should_handle_locale_var_in_description(live_server, map, page):
+    data = deepcopy(DATALAYER_DATA)
+    data["features"][0]["properties"]["description"] = (
+        "this is a link to [[https://domain.org/?locale={locale}|Wikipedia]]"
+    )
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.locator(".leaflet-marker-icon").click()
+    link = page.get_by_role("link", name="Wikipedia")
+    expect(link).to_be_visible()
+    expect(link).to_have_attribute("href", "https://domain.org/?locale=en")
+
+
+def test_should_display_tooltip_with_variable(live_server, map, page, bootstrap):
+    map.settings["properties"]["showLabel"] = True
+    map.settings["properties"]["labelKey"] = "Foo {name}"
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.get_by_text("Foo test marker")).to_be_visible()