umap-project 2.8.1__py3-none-any.whl → 2.9.0__py3-none-any.whl

umap/tests/integration/test_picto.py

@@ -57,7 +57,7 @@ def test_can_change_picto_at_map_level(openmap, live_server, page, pictos):
     define.click()
     # No picto defined yet, so recent should not be visible
     expect(page.get_by_text("Recent")).to_be_hidden()
-    symbols = page.locator(".umap-pictogram-choice")
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(symbols).to_have_count(2)
     search = page.locator(".umap-pictogram-body input")
     search.type("star")
@@ -90,8 +90,8 @@ def test_can_change_picto_at_datalayer_level(openmap, live_server, page, pictos)
     expect(define).to_be_visible()
     expect(undefine).to_be_hidden()
     define.click()
-    # Map has an icon defined, so it shold open on Recent tab
-    symbols = page.locator(".umap-pictogram-choice")
+    # Map has an icon defined, so it should open on Recent tab
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)
     symbol_tab = page.get_by_role("button", name="Symbol")
@@ -128,8 +128,8 @@ def test_can_change_picto_at_marker_level(openmap, live_server, page, pictos):
     expect(define).to_be_visible()
     expect(undefine).to_be_hidden()
     define.click()
-    # Map has an icon defined, so it shold open on Recent tab
-    symbols = page.locator(".umap-pictogram-choice")
+    # Map has an icon defined, so it shuold open on Recent tab
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)
     symbol_tab = page.get_by_role("button", name="Symbol")
@@ -180,7 +180,7 @@ def test_can_use_remote_url_as_picto(openmap, live_server, page, pictos):
     expect(modify).to_be_visible()
     modify.click()
     # Should be on Recent tab
-    symbols = page.locator(".umap-pictogram-choice")
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)
 
@@ -215,10 +215,10 @@ def test_can_use_char_as_picto(openmap, live_server, page, pictos):
     close.click()
     edit_settings.click()
     shape_settings.click()
-    preview = page.locator(".umap-pictogram-choice")
+    preview = page.locator(".header .umap-pictogram-choice")
     expect(preview).to_be_visible()
     preview.click()
     # Should be on URL tab
-    symbols = page.locator(".umap-pictogram-choice")
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)

umap/tests/integration/test_save.py

@@ -5,7 +5,7 @@ def test_reseting_map_would_remove_from_save_queue(
     live_server, openmap, page, datalayer
 ):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.get_by_role("link", name="Edit map name and caption").click()
+    page.get_by_role("button", name="Edit map name and caption").click()
     requests = []
 
     def register_request(request):
@@ -20,10 +20,11 @@ def test_reseting_map_would_remove_from_save_queue(
     page.get_by_role("button", name="OK").click()
     page.wait_for_timeout(500)
     page.get_by_role("button", name="Edit").click()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Edit", exact=True).click()
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("new datalayer name")
+    page.wait_for_timeout(300)  # Time of the Input debounce
     with page.expect_response(re.compile(".*/datalayer/update/.*")):
         page.get_by_role("button", name="Save").click()
     assert len(requests) == 1

umap/tests/integration/test_star.py

@@ -8,20 +8,24 @@ from umap.models import Star
 pytestmark = pytest.mark.django_db
 
 
-def test_star_control_is_visible_if_logged_in(map, live_server, page, login, user):
+def test_star_button_is_active_if_logged_in(map, live_server, page, login, user):
     login(user)
     assert not Star.objects.count()
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    page.get_by_title("More controls").click()
-    control = page.locator(".leaflet-control-star")
-    expect(control).to_be_visible()
+    page.get_by_title("About").click()
+    button = page.locator(".icon-star")
+    expect(button).to_be_visible()
     with page.expect_response(re.compile(".*/star/")):
-        control.click()
+        button.click()
+    expect(button).to_be_hidden()
+    # Button has changed
+    expect(page.locator(".icon-starred")).to_be_visible()
     assert Star.objects.count() == 1
 
 
-def test_no_star_control_if_not_logged_in(map, live_server, page):
+def test_star_button_inctive_if_not_logged_in(map, live_server, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    page.get_by_title("More controls").click()
-    control = page.locator(".leaflet-control-star")
-    expect(control).to_be_hidden()
+    page.get_by_title("About").click()
+    button = page.locator(".icon-star")
+    button.click()
+    expect(page.get_by_text("You must be logged in")).to_be_visible()

umap/tests/integration/test_tableeditor.py

@@ -67,13 +67,14 @@ DATALAYER_DATA = {
 
 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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     page.get_by_text("Add a new property").click()
     page.locator("dialog").locator("input").fill("newprop")
     page.locator("dialog").get_by_role("button", name="OK").click()
     page.locator("td").nth(2).dblclick()
     page.locator('input[name="newprop"]').fill("newvalue")
+    page.wait_for_timeout(300)  # Time for the input debounce.
     page.keyboard.press("Enter")
     page.locator("thead button[data-property=name]").click()
     page.get_by_role("button", name="Delete this column").click()
@@ -88,7 +89,7 @@ def test_table_editor(live_server, openmap, datalayer, page):
 
 def test_cannot_add_existing_property_name(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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     page.get_by_text("Add a new property").click()
     page.locator("dialog").locator("input").fill("name")
@@ -101,7 +102,7 @@ def test_cannot_add_existing_property_name(live_server, openmap, datalayer, page
 
 def test_cannot_add_property_with_a_dot(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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     page.get_by_text("Add a new property").click()
     page.locator("dialog").locator("input").fill("foo.bar")
@@ -114,7 +115,7 @@ def test_cannot_add_property_with_a_dot(live_server, openmap, datalayer, page):
 
 def test_rename_property(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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(page.locator("table th button[data-property=name]")).to_have_count(1)
     page.locator("thead button[data-property=name]").click()
@@ -128,7 +129,7 @@ def test_rename_property(live_server, openmap, datalayer, page):
 def test_delete_selected_rows(live_server, openmap, page):
     DataLayerFactory(map=openmap, data=DATALAYER_DATA)
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(page.locator("tbody tr")).to_have_count(4)
     expect(page.locator(".leaflet-marker-icon")).to_have_count(4)
@@ -142,7 +143,7 @@ def test_delete_selected_rows(live_server, openmap, page):
 def test_delete_all_rows(live_server, openmap, page):
     DataLayerFactory(map=openmap, data=DATALAYER_DATA)
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(page.locator("tbody tr")).to_have_count(4)
     expect(page.locator(".leaflet-marker-icon")).to_have_count(4)
@@ -158,7 +159,7 @@ def test_filter_and_delete_rows(live_server, openmap, page):
     panel = page.locator(".panel.left.on")
     table = page.locator(".panel.full table")
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(table.locator("tbody tr")).to_have_count(4)
     expect(page.locator(".leaflet-marker-icon")).to_have_count(4)

umap/tests/integration/test_view_marker.py

@@ -181,3 +181,13 @@ def test_only_visible_markers_are_added_to_dom(live_server, map, page):
     )
     expect(markers).to_have_count(1)
     expect(tooltips).to_have_count(1)
+
+
+def test_should_display_tooltip_on_hover(live_server, map, page, bootstrap):
+    map.settings["properties"]["showLabel"] = None
+    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_hidden()
+    page.locator(".leaflet-marker-icon").hover()
+    expect(page.get_by_text("Foo test marker")).to_be_visible()