umap-project 3.4.0b1__py3-none-any.whl → 3.4.2__py3-none-any.whl

umap/tests/integration/test_map.py

@@ -147,14 +147,14 @@ def test_default_view_latest_with_polygon(map, live_server, page):
     expect(layers).to_have_count(1)
 
 
-def test_default_view_locate(browser, live_server, map):
+def test_default_view_locate(browser, live_server, map, new_page):
     context = browser.new_context(
         geolocation={"longitude": 8.52967, "latitude": 39.16267},
         permissions=["geolocation"],
     )
     map.settings["properties"]["defaultView"] = "locate"
     map.save()
-    page = context.new_page()
+    page = new_page(custom_context=context)
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page).to_have_url(re.compile(r".*#18/39\.16267/8\.52967"))
 

umap/tests/integration/test_map_preview.py

@@ -58,7 +58,7 @@ def test_map_preview_can_load_remote_geojson(page, live_server, tilelayer):
     expect(markers).to_have_count(1)
 
 
-def test_map_preview_can_load_mutiple_remote_geojson(page, live_server, tilelayer):
+def test_map_preview_can_load_multiple_remote_geojson(page, live_server, tilelayer):
     def handle(route):
         if "2" in route.request.url:
             route.fulfill(json=GEOJSON2)

umap/tests/integration/test_owned_map.py

@@ -183,7 +183,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_title("Add a layer").click()
+    page.get_by_role("button", name="Add a layer").click()
     page.locator("input[name=name]").fill("Layer 1")
     expect(
         page.get_by_role("button", name="Visibility: Draft (private)")
@@ -217,7 +217,7 @@ def test_can_change_owner(map, live_server, login, user):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
     edit_permissions = page.get_by_title("Update permissions and editors")
     edit_permissions.click()
-    close = page.locator(".umap-field-owner .close")
+    close = page.locator(".umap-field-owner .icon-close")
     close.click()
     input = page.locator("input.edit-owner")
     with page.expect_response(re.compile(r".*/agnocomplete/.*")):

umap/tests/integration/test_picto.py

@@ -136,7 +136,7 @@ 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 shuold open on Recent tab
+    # 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)

umap/tests/integration/test_popup.py

@@ -42,3 +42,34 @@ def test_openstreetmap_popup(live_server, map, page):
         "src",
         "https://api.panoramax.xyz/api/pictures/d811b398-d930-4cf8-95a2-0c29c34d9fca/sd.jpg",
     )
+
+
+def test_table_popup(live_server, map, page):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "geometry": {"type": "Point", "coordinates": [2.49, 48.79]},
+                "properties": {
+                    "url": "https://restaurant.org",
+                    "formatted": "with **bold**",
+                },
+                "id": "AzMjk",
+            },
+        ],
+        "_umap_options": {
+            "popupTemplate": "Table",
+            "fields": [
+                {"key": "url", "type": "String"},
+                {"key": "formatted", "type": "Text"},
+            ],
+        },
+    }
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#18/48.79/2.49")
+    page.locator(".leaflet-marker-icon").click()
+    expect(page.get_by_role("link", name="https://restaurant.org")).to_be_visible()
+    expect(page.get_by_role("cell", name="with bold").locator("strong")).to_have_text(
+        "bold"
+    )

umap/tests/integration/test_remote_data.py

@@ -16,7 +16,7 @@ def intercept_remote_data(page):
             "features": [
                 {
                     "type": "Feature",
-                    "properties": {"name": "Point 2"},
+                    "properties": {"name": "Point 2", "foobar": "bla"},
                     "geometry": {
                         "type": "Point",
                         "coordinates": [4.3375, 11.2707],
@@ -29,7 +29,7 @@ def intercept_remote_data(page):
             "features": [
                 {
                     "type": "Feature",
-                    "properties": {"name": "Point 1"},
+                    "properties": {"name": "Point 1", "foobar": "baz"},
                     "geometry": {
                         "type": "Point",
                         "coordinates": [4.3375, 12.2707],
@@ -117,8 +117,8 @@ def test_create_remote_data_layer(page, live_server, tilelayer, settings):
                     "type": "String",
                 },
                 {
-                    "key": "description",
-                    "type": "Text",
+                    "key": "foobar",
+                    "type": "String",
                 },
             ],
             "id": str(datalayer.pk),

umap/tests/integration/test_save.py

@@ -1,7 +1,7 @@
 import re
 
 
-def test_reseting_map_would_remove_from_save_queue(
+def test_resetting_map_would_remove_from_save_queue(
     live_server, openmap, page, datalayer
 ):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")

umap/tests/integration/test_search.py

@@ -0,0 +1,41 @@
+from playwright.sync_api import expect
+
+
+def test_reverse_search(live_server, page, tilelayer):
+    photon_response = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {
+                    "osm_type": "N",
+                    "osm_id": 5055853416,
+                    "osm_key": "place",
+                    "osm_value": "locality",
+                    "type": "locality",
+                    "postcode": "10200",
+                    "countrycode": "FR",
+                    "name": "Le Haut Sentier",
+                    "country": "France",
+                    "city": "Thors",
+                    "state": "Grand Est",
+                    "county": "Aube",
+                },
+                "geometry": {"type": "Point", "coordinates": [4.7995256, 48.2985251]},
+            }
+        ],
+    }
+    page.goto(f"{live_server.url}/en/map/new")
+
+    def handle_search(route):
+        route.fulfill(json=photon_response)
+
+    # Intercept the route
+    page.route(
+        "https://photon.komoot.io/reverse/?limit=1&lat=48.3&lon=4.8",
+        handle_search,
+    )
+    page.get_by_role("button", name="Search location").click()
+    page.get_by_role("searchbox", name="Type a place name or").fill("48.3 4.8")
+    expect(page.get_by_text("48.3 4.8")).to_be_visible()
+    expect(page.get_by_text("Le Haut Sentier")).to_be_visible()

umap/tests/integration/test_share.py

@@ -8,7 +8,7 @@ pytestmark = pytest.mark.django_db
 
 def test_iframe_code_can_contain_datalayers(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
-    textarea = page.locator(".umap-share-iframe")
+    textarea = page.get_by_label("Iframe")
     expect(textarea).to_be_visible()
     expect(textarea).to_have_text(re.compile('src="'))
     expect(textarea).to_have_text(re.compile('href="'))
@@ -28,7 +28,7 @@ def test_iframe_code_can_contain_datalayers(map, live_server, datalayer, page):
 def test_iframe_code_can_contain_feature(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
     page.locator(".icon-container").click()
-    textarea = page.locator(".umap-share-iframe")
+    textarea = page.get_by_label("Iframe")
     expect(textarea).to_be_visible()
     expect(textarea).not_to_have_text(re.compile("feature=Here"))
     # Open options

umap/tests/integration/test_team.py

@@ -39,7 +39,7 @@ def test_can_remove_user_from_team(live_server, map, user, user2, team, login):
         page.get_by_role("link", name="My teams").click()
     with page.expect_navigation():
         page.get_by_role("link", name="Edit").click()
-    page.locator("li").filter(has_text="Averell").locator(".close").click()
+    page.locator("li").filter(has_text="Averell").locator(".icon-close").click()
     page.get_by_role("button", name="Save").click()
     assert Team.objects.count() == 1
     modified = Team.objects.first()

umap/tests/integration/test_websocket_sync.py

@@ -25,7 +25,9 @@ def setup_function():
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilelayer):
+def test_websocket_connection_can_sync_markers(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -34,8 +36,10 @@ def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilel
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     a_marker_pane = peerA.locator(".leaflet-marker-pane > div")
     b_marker_pane = peerB.locator(".leaflet-marker-pane > div")
@@ -49,6 +53,7 @@ def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilel
 
     a_map_el = peerA.locator("#map")
     a_map_el.click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(a_marker_pane).to_have_count(1)
     expect(b_marker_pane).to_have_count(1)
     # Peer B should not be in state dirty
@@ -91,17 +96,21 @@ def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilel
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilelayer):
+def test_websocket_connection_can_sync_polygons(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
     DataLayerFactory(map=map, data={})
 
     # Create two tabs
-    peerA = context.new_page()
+    peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
-    peerB = context.new_page()
+    wait_for_loaded(peerA)
+    peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     b_map_el = peerB.locator("#map")
 
@@ -171,7 +180,7 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_map_properties(
-    new_page, asgi_live_server, tilelayer
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -181,8 +190,10 @@ def test_websocket_connection_can_sync_map_properties(
     # Create two tabs
     peerA = new_page()
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page()
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Name change is synced
     peerA.get_by_role("button", name="Edit map name and caption").click()
@@ -205,7 +216,7 @@ def test_websocket_connection_can_sync_map_properties(
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_datalayer_properties(
-    new_page, asgi_live_server, tilelayer
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -215,8 +226,10 @@ def test_websocket_connection_can_sync_datalayer_properties(
     # Create two tabs
     peerA = new_page()
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page()
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Layer addition, name and type are synced
     peerA.get_by_role("button", name="Manage layers").click()
@@ -236,7 +249,7 @@ def test_websocket_connection_can_sync_datalayer_properties(
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_cloned_polygons(
-    context, asgi_live_server, tilelayer
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -244,10 +257,12 @@ def test_websocket_connection_can_sync_cloned_polygons(
     DataLayerFactory(map=map, data={})
 
     # Create two tabs
-    peerA = context.new_page()
+    peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
-    peerB = context.new_page()
+    wait_for_loaded(peerA)
+    peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     b_map_el = peerB.locator("#map")
 
@@ -297,7 +312,7 @@ def test_websocket_connection_can_sync_cloned_polygons(
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_late_joining_peer(
-    new_page, asgi_live_server, tilelayer
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -307,6 +322,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
     # Create first peer (A) and have it join immediately
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
 
     # Add a marker from peer A
     a_create_marker = peerA.get_by_title("Draw a marker")
@@ -315,6 +331,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
 
     a_map_el = peerA.locator("#map")
     a_map_el.click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     peerA.locator("body").type("First marker")
     peerA.locator("body").press("Escape")
     peerA.wait_for_timeout(300)
@@ -333,6 +350,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
     # Now create peer B and have it join
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Check if peer B has received all the updates
     b_marker_pane = peerB.locator(".leaflet-marker-pane > div")
@@ -357,7 +375,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
+def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer, wait_for_loaded):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -367,8 +385,10 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Create a new layer from peerA
     peerA.get_by_role("button", name="Manage layers").click()
@@ -398,7 +418,7 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
     peerA.locator("#map").click()
 
     # Make sure this new marker is in Layer 2 for peerB
-    # Show features for this layer in the brower.
+    # Show features for this layer in the browser.
     peerB.locator("summary").filter(has_text="Layer 2").click()
     expect(peerB.locator("li").filter(has_text="Layer 2")).to_be_visible()
     peerB.locator(".panel.left").get_by_role("button", name="Show/hide layer").nth(
@@ -433,7 +453,9 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer):
+def test_should_sync_datalayers_delete(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -473,8 +495,10 @@ def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer):
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     peerA.get_by_role("button", name="Open browser").click()
     expect(peerA.locator(".panel").get_by_text("datalayer 1")).to_be_visible()
@@ -496,10 +520,13 @@ def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer):
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user):
+def test_create_and_sync_map(
+    new_page, asgi_live_server, tilelayer, login, user, wait_for_loaded
+):
     # Create a syncable map with peerA
     peerA = login(user, prefix="Page A")
     peerA.goto(f"{asgi_live_server.url}/en/map/new/")
+    wait_for_loaded(peerA)
     peerA.get_by_role("button", name="Map advanced properties").click()
     expect(peerA.get_by_text("Real-time collaboration", exact=True)).to_be_hidden()
     with peerA.expect_response(re.compile("./map/create/.*")):
@@ -519,6 +546,7 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
     # Open map and go to edit mode with peer B
     peerB = new_page("Page B")
     peerB.goto(peerA.url)
+    wait_for_loaded(peerB)
     peerB.get_by_role("button", name="Edit").click()
 
     # Create a marker from peerA
@@ -529,8 +557,10 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
 
     # Add a marker from peer A
     peerA.get_by_role("button", name="Edit").click()
+    peerA.wait_for_timeout(300)  # Time for the animation to finish
     peerA.get_by_title("Draw a marker").click()
     peerA.locator("#map").click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(markersA).to_have_count(1)
     expect(markersB).to_have_count(1)
 
@@ -556,6 +586,7 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
     # Add a marker from peer B
     peerB.get_by_title("Draw a marker").click()
     peerB.locator("#map").click(position={"x": 200, "y": 200})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(markersB).to_have_count(2)
     expect(markersA).to_have_count(1)
     with peerB.expect_response(re.compile("./datalayer/update/.*")):
@@ -568,7 +599,9 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelayer):
+def test_saved_datalayer_are_not_duplicated(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -576,9 +609,10 @@ def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelaye
     # Create one tab
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     # Create a new datalayer
     peerA.get_by_title("Manage layers").click()
-    peerA.get_by_title("Add a layer").click()
+    peerA.get_by_role("button", name="Add a layer").click()
     peerA.locator("#map").click(position={"x": 220, "y": 220})
     # Save layer to the server, so now the datalayer exist on the server AND
     # is still in the live operations of peer A
@@ -588,6 +622,7 @@ def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelaye
     # Now load the map from another tab
     peerB = new_page("Page B")
     peerB.goto(peerA.url)
+    wait_for_loaded(peerB)
     peerB.get_by_role("button", name="Open browser").click()
     expect(peerB.get_by_text("Layer 1")).to_be_visible()
     peerB.get_by_role("button", name="Edit").click()
@@ -596,7 +631,9 @@ def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelaye
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_sync_saved_status(new_page, asgi_live_server, tilelayer):
+def test_should_sync_saved_status(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -604,8 +641,10 @@ def test_should_sync_saved_status(new_page, asgi_live_server, tilelayer):
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Create a new marker from peerA
     peerA.get_by_title("Draw a marker").click()
@@ -639,7 +678,9 @@ def test_should_sync_saved_status(new_page, asgi_live_server, tilelayer):
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_sync_line_on_escape(new_page, asgi_live_server, tilelayer):
+def test_should_sync_line_on_escape(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -647,8 +688,10 @@ def test_should_sync_line_on_escape(new_page, asgi_live_server, tilelayer):
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Create a new marker from peerA
     peerA.get_by_title("Draw a polyline").click()
@@ -662,7 +705,7 @@ def test_should_sync_line_on_escape(new_page, asgi_live_server, tilelayer):
 
 @pytest.mark.xdist_group(name="websockets")
 def test_should_sync_datalayer_clear(
-    new_page, asgi_live_server, tilelayer, map, datalayer
+    new_page, asgi_live_server, tilelayer, map, datalayer, wait_for_loaded
 ):
     map.settings["properties"]["syncEnabled"] = True
     map.edit_status = Map.ANONYMOUS
@@ -671,8 +714,10 @@ def test_should_sync_datalayer_clear(
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
     expect(peerA.locator(".leaflet-marker-icon")).to_have_count(1)
     expect(peerB.locator(".leaflet-marker-icon")).to_have_count(1)
 
@@ -691,7 +736,9 @@ def test_should_sync_datalayer_clear(
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_save_remote_dirty_datalayers(new_page, asgi_live_server, tilelayer):
+def test_should_save_remote_dirty_datalayers(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -701,8 +748,10 @@ def test_should_save_remote_dirty_datalayers(new_page, asgi_live_server, tilelay
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Create a new layer from peerA
     peerA.get_by_role("button", name="Manage layers").click()

umap/tests/test_dashboard.py

@@ -68,7 +68,7 @@ def test_user_dashboard_display_user_team_maps(client, map, team, user, share_st
 
 def test_user_dashboard_display_user_maps_distinct(client, map):
     # cf https://github.com/umap-project/umap/issues/1325
-    anonymap = MapFactory(name="Map witout owner should not appear")
+    anonymap = MapFactory(name="Map without owner should not appear")
     user1 = UserFactory(username="user1")
     user2 = UserFactory(username="user2")
     map.editors.add(user1)

umap/tests/test_statics.py

@@ -32,9 +32,9 @@ def test_collectstatic_ran_successfully_with_hashes(settings, staticfiles):
     assert "hash" in json_manifest.keys()
     assert "umap/base.css" in json_manifest["paths"]
     # Hash + the dot ("umap/base.<hash>.css").
-    md5_hash_lenght = 12 + 1
+    md5_hash_length = 12 + 1
     # The value of the manifest must contain the hash (length).
     assert (
         len(json_manifest["paths"]["umap/base.css"])
-        == len("umap/base.css") + md5_hash_lenght
+        == len("umap/base.css") + md5_hash_length
     )

umap/tests/test_utils.py

@@ -1,3 +1,4 @@
+import stat
 from pathlib import Path
 
 import pytest
@@ -5,7 +6,8 @@ import pytest
 from umap.utils import gzip_file, normalize_string
 
 
-def test_gzip_file():
+def test_gzip_file(settings):
+    settings.FILE_UPLOAD_PERMISSIONS = 0o666
     # Let's use any old file so we can check that the date of the gzip file is set.
     src = Path(__file__).parent / "settings.py"
     dest = Path("/tmp/test_settings.py.gz")
@@ -14,6 +16,7 @@ def test_gzip_file():
     dest_stat = dest.stat()
     dest.unlink()
     assert src_stat.st_mtime == dest_stat.st_mtime
+    assert stat.filemode(dest_stat.st_mode) == "-rw-rw-rw-"
 
 
 @pytest.mark.parametrize(

umap/tests/test_views.py

@@ -73,7 +73,7 @@ def test_POST_raises():
         validate_url(request)
 
 
-def test_unkown_domain_raises():
+def test_unknown_domain_raises():
     request = get("http://xlkjdkjsdlkjfd.com")
     with pytest.raises(AssertionError):
         validate_url(request)

umap/utils.py

@@ -80,7 +80,7 @@ def get_uri_template(urlname, args=None, prefix="", module=None):
             result, params = possibility[0]
             return _convert(result, params)
         else:
-            # If there are optionnal arguments passed, use them to try to find
+            # If there are optional arguments passed, use them to try to find
             # the correct pattern.
             # First, we need to build a list with all the arguments
             seen_params = []
@@ -150,6 +150,7 @@ def gzip_file(from_path, to_path):
         with gzip.open(to_path, "wb") as f_out:
             f_out.writelines(f_in)
     os.utime(to_path, ns=(stat.st_mtime_ns, stat.st_mtime_ns))
+    os.chmod(to_path, settings.FILE_UPLOAD_PERMISSIONS)
 
 
 def is_ajax(request):
@@ -226,5 +227,5 @@ def collect_pictograms():
 
 
 def normalize_string(s):
-    n = unicodedata.normalize("NFKD", s)
+    n = unicodedata.normalize("NFKD", str(s))
     return "".join([c for c in n if not unicodedata.combining(c)]).lower()