umap-project 3.3.2__py3-none-any.whl → 3.4.0__py3-none-any.whl

umap/tests/integration/test_anonymous_owned_map.py

@@ -18,25 +18,24 @@ def owner_session(anonymap, context, live_server):
     key, value = anonymap.signed_cookie_elements
     signed = get_cookie_signer(salt=key).sign(value)
     context.add_cookies([{"name": key, "value": signed, "url": live_server.url}])
-    return context.new_page()
 
 
-def test_map_load_with_owner(anonymap, live_server, owner_session):
-    owner_session.goto(f"{live_server.url}{anonymap.get_absolute_url()}")
-    map_el = owner_session.locator("#map")
+def test_map_load_with_owner(anonymap, live_server, owner_session, page):
+    page.goto(f"{live_server.url}{anonymap.get_absolute_url()}")
+    map_el = page.locator("#map")
     expect(map_el).to_be_visible()
-    enable = owner_session.get_by_role("button", name="Edit")
+    enable = page.get_by_role("button", name="Edit")
     expect(enable).to_be_visible()
     enable.click()
-    disable = owner_session.get_by_role("button", name="View")
+    disable = page.get_by_role("button", name="View")
     expect(disable).to_be_visible()
-    save = owner_session.get_by_role("button", name="Save")
+    save = page.get_by_role("button", name="Save")
     expect(save).to_be_visible()
-    add_marker = owner_session.get_by_title("Draw a marker")
+    add_marker = page.get_by_title("Draw a marker")
     expect(add_marker).to_be_visible()
-    edit_settings = owner_session.get_by_title("Map advanced properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_visible()
-    edit_permissions = owner_session.get_by_title("Update permissions and editors")
+    edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_visible()
 
 
@@ -71,35 +70,31 @@ def test_map_load_with_anonymous_but_editable_layer(
     expect(edit_permissions).to_be_hidden()
 
 
-def test_owner_permissions_form(map, datalayer, live_server, owner_session):
-    owner_session.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
-    edit_permissions = owner_session.get_by_title("Update permissions and editors")
+def test_owner_permissions_form(map, datalayer, live_server, owner_session, page):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_visible()
     edit_permissions.click()
-    owner_field = owner_session.locator(".umap-field-owner")
+    owner_field = page.locator(".umap-field-owner")
     expect(owner_field).to_be_hidden()
-    editors_field = owner_session.locator(".umap-field-editors input")
+    editors_field = page.locator(".umap-field-editors input")
     expect(editors_field).to_be_hidden()
-    datalayer_label = owner_session.get_by_text('Who can edit "test datalayer"')
+    datalayer_label = page.get_by_text('Who can edit "test datalayer"')
     expect(datalayer_label).to_be_visible()
-    options = owner_session.locator(
-        ".datalayer-permissions select[name='edit_status'] option"
-    )
+    options = page.locator(".datalayer-permissions select[name='edit_status'] option")
     expect(options).to_have_count(3)
-    option = owner_session.locator(
+    option = page.locator(
         ".datalayer-permissions select[name='edit_status'] option:checked"
     )
     expect(option).to_have_text("Inherit")
-    expect(owner_session.locator(".umap-field-share_status select")).to_be_visible()
+    expect(page.locator(".umap-field-share_status select")).to_be_visible()
     options = [
         int(option.get_attribute("value"))
-        for option in owner_session.locator(
-            ".umap-field-share_status select option"
-        ).all()
+        for option in page.locator(".umap-field-share_status select option").all()
     ]
     assert options == [Map.DRAFT, Map.PUBLIC]
     # This field should not be present in anonymous maps
-    expect(owner_session.locator(".umap-field-owner")).to_be_hidden()
+    expect(page.locator(".umap-field-owner")).to_be_hidden()
 
 
 def test_anonymous_can_add_marker_on_editable_layer(
@@ -180,7 +175,7 @@ def test_alert_message_after_create(
     new_map = Map.objects.last()
     expect(alert).to_be_visible()
     expect(
-        alert.get_by_text("Your map has been created with an anonymous account!")
+        alert.get_by_text("Hey, you created a map without an account!")
     ).to_be_visible()
     expect(alert.get_by_role("button", name="Copy")).to_be_visible()
     expect(alert.get_by_role("button", name="Send me the link")).to_be_visible()
@@ -198,7 +193,7 @@ def test_alert_message_after_create(
         )
 
 
-def test_email_sending_error_are_catched(tilelayer, page, live_server):
+def test_email_sending_error_are_caught(tilelayer, page, live_server):
     page.goto(f"{live_server.url}/en/map/new")
     alert_creation = page.locator('umap-alert-creation div[role="dialog"]')
     with page.expect_response(re.compile(r".*/map/create/")):
@@ -224,22 +219,22 @@ def test_alert_message_after_create_show_link_even_without_mail(
     alert = page.locator('umap-alert-creation div[role="dialog"]')
     expect(alert).to_be_visible()
     expect(
-        alert.get_by_text("Your map has been created with an anonymous account!")
+        alert.get_by_text("Hey, you created a map without an account!")
     ).to_be_visible()
     expect(alert.get_by_role("button", name="Copy")).to_be_visible()
     expect(alert.get_by_role("button", name="Send me the link")).to_be_hidden()
 
 
-def test_anonymous_owner_can_delete_the_map(anonymap, live_server, owner_session):
+def test_anonymous_owner_can_delete_the_map(anonymap, live_server, owner_session, page):
     assert Map.objects.count() == 1
-    owner_session.goto(f"{live_server.url}{anonymap.get_absolute_url()}")
-    owner_session.get_by_role("button", name="Edit").click()
-    owner_session.get_by_role("button", name="Map advanced properties").click()
-    owner_session.get_by_text("Advanced actions").click()
-    expect(owner_session.get_by_role("button", name="Delete")).to_be_visible()
-    owner_session.get_by_role("button", name="Delete").click()
-    with owner_session.expect_response(re.compile(r".*/update/delete/.*")):
-        owner_session.get_by_role("button", name="OK").click()
+    page.goto(f"{live_server.url}{anonymap.get_absolute_url()}")
+    page.get_by_role("button", name="Edit").click()
+    page.get_by_role("button", name="Map advanced properties").click()
+    page.get_by_text("Advanced actions").click()
+    expect(page.get_by_role("button", name="Delete")).to_be_visible()
+    page.get_by_role("button", name="Delete").click()
+    with page.expect_response(re.compile(r".*/update/delete/.*")):
+        page.get_by_role("button", name="OK").click()
     assert Map.objects.get(pk=anonymap.pk).share_status == Map.DELETED
 
 
@@ -251,3 +246,61 @@ def test_non_owner_cannot_see_delete_button(anonymap, live_server, page):
     page.get_by_role("button", name="Map advanced properties").click()
     page.get_by_text("Advanced actions").click()
     expect(page.get_by_role("button", name="Delete")).to_be_hidden()
+
+
+def test_logged_in_user_should_have_a_message_to_attach_map(
+    anonymap, live_server, login, user, page, owner_session
+):
+    page.goto(f"{live_server.url}{anonymap.get_absolute_url()}")
+    page.get_by_role("button", name="Edit").click()
+    expect(
+        page.get_by_text(
+            "This map is anonymous, do you want to attach it to your account?"
+        )
+    ).to_be_hidden()
+
+    page = login(user)
+    page.goto(f"{live_server.url}{anonymap.get_absolute_url()}")
+    page.get_by_role("button", name="Edit").click()
+    expect(
+        page.get_by_text(
+            "This map is anonymous, do you want to attach it to your account?"
+        )
+    ).to_be_visible()
+    with page.expect_response(re.compile(r".*/update/owner/.*")):
+        page.get_by_role("button", name="OK").click()
+    saved = Map.objects.get(pk=anonymap.pk)
+    assert saved.owner
+
+
+def test_can_attach_map_after_save(
+    live_server, user, page, tilelayer, context, settings
+):
+    settings.ENABLE_ACCOUNT_LOGIN = True
+    page.goto(f"{live_server.url}/en/map/new")
+    expect(page.get_by_role("button", name="Anonymous")).to_be_visible()
+    expect(page.get_by_role("button", name="Visibility: Draft")).to_have_class(
+        re.compile(r".*anonymous.*")
+    )
+    assert not Map.objects.count()
+    with page.expect_response(re.compile(r".*/map/create/")):
+        page.get_by_role("button", name="Save draft", exact=True).click()
+    assert Map.objects.count() == 1
+    saved = Map.objects.last()
+    assert not saved.owner
+    with context.expect_page() as login_page_info:
+        page.get_by_role("link", name="log in").click()
+    login_page = login_page_info.value
+    expect(login_page).to_have_title("Login - Online map creator")
+    login_page.get_by_placeholder("Username").fill(user.username)
+    login_page.get_by_placeholder("Password").fill("123123")
+    with page.expect_response(re.compile(r".*/update/owner/")):
+        login_page.locator('#login_form input[type="submit"]').click()
+    expect(page.get_by_text("Map has been attached to your account")).to_be_visible()
+    saved = Map.objects.last()
+    assert saved.owner == user
+    expect(page.get_by_role("button", name="Anonymous")).to_be_hidden()
+    expect(page.get_by_role("button", name=user.username)).to_be_visible()
+    expect(page.get_by_role("button", name="Visibility: Draft")).not_to_have_class(
+        re.compile(r".*anonymous.*")
+    )

umap/tests/integration/test_basics.py

@@ -79,7 +79,9 @@ def test_cannot_put_script_tag_in_datalayer_name_or_description(
     expect(page.get_by_text("before after")).to_be_visible()
 
 
-def test_login_from_map_page(live_server, page, tilelayer, settings, user, context):
+def test_login_from_map_page_after_save(
+    live_server, page, tilelayer, settings, user, context
+):
     settings.ENABLE_ACCOUNT_LOGIN = True
     assert Map.objects.count() == 0
     page.goto(f"{live_server.url}/en/map/new/")
@@ -102,3 +104,25 @@ def test_login_from_map_page(live_server, page, tilelayer, settings, user, conte
     assert Map.objects.count() == 1
     # Use name should now appear on the header toolbar
     expect(page.get_by_role("button", name="Joe")).to_be_visible()
+
+
+def test_login_from_unsaved_map_page(
+    live_server, page, tilelayer, settings, user, context
+):
+    settings.ENABLE_ACCOUNT_LOGIN = True
+    assert Map.objects.count() == 0
+    page.goto(f"{live_server.url}/en/map/new/")
+    page.locator('[data-ref="user"]').click()
+    with context.expect_page() as login_page_info:
+        page.get_by_role("button", name="Login").click()
+    login_page = login_page_info.value
+    expect(login_page).to_have_title("Login - Online map creator")
+    login_page.get_by_placeholder("Username").fill(user.username)
+    login_page.get_by_placeholder("Password").fill("123123")
+    login_page.locator('#login_form input[type="submit"]').click()
+    # Login page should be closed
+    page.wait_for_timeout(500)  # Seems needed from time to time…
+    assert len(context.pages) == 1
+    # Save should have proceed
+    # Use name should now appear on the header toolbar
+    expect(page.get_by_role("button", name="Joe")).to_be_visible()

umap/tests/integration/test_browser.py

@@ -353,6 +353,43 @@ def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootst
     expect(buttons).to_have_count(3)
 
 
+def test_should_change_feature_title_and_color_on_edit(
+    live_server, openmap, page, bootstrap
+):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#2/19/-2")
+    expect(page.locator(".umap-browser .feature.marker")).to_contain_text(
+        "one point in france"
+    )
+    page.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
+    page.locator('input[name="name"]').fill("changed name")
+    expect(page.locator(".umap-browser .feature.marker")).to_contain_text(
+        "changed name"
+    )
+
+    # Change color
+    expect(
+        page.get_by_role("listitem").filter(has_text="changed name").locator("i")
+    ).to_have_css("background-color", "rgb(0, 0, 139)")
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator(".umap-field-color").get_by_role("button", name="define").first.click()
+    page.get_by_title("Crimson").click()
+    expect(
+        page.get_by_role("listitem").filter(has_text="changed name").locator("i")
+    ).to_have_css("background-color", "rgb(220, 20, 60)")
+
+    # Undo color
+    page.locator(".edit-undo").click()
+    expect(
+        page.get_by_role("listitem").filter(has_text="changed name").locator("i")
+    ).to_have_css("background-color", "rgb(0, 0, 139)")
+
+    # Undo title change
+    page.locator(".edit-undo").click()
+    expect(page.locator(".umap-browser .feature.marker")).to_contain_text(
+        "one point in france"
+    )
+
+
 def test_should_show_header_for_display_on_load_false(
     live_server, page, bootstrap, map, datalayer
 ):

umap/tests/integration/test_cluster.py

@@ -51,3 +51,113 @@ def test_can_open_feature_on_browser_click(live_server, page, map):
     expect(page.get_by_text("can you see me ?")).to_be_visible()
     page.get_by_text("again one another point").click()
     expect(page.get_by_text("and me ?")).to_be_visible()
+
+
+def test_can_drag_single_marker_in_cluster_layer(live_server, page, tilelayer, openmap):
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#7/46.920/3.340")
+
+    marker = page.locator(".umap-div-icon")
+    map = page.locator("#map")
+
+    expect(page.locator(".edit-undo")).to_be_disabled()
+    # Drag marker
+    old_bbox = marker.bounding_box()
+    marker.first.drag_to(map, target_position={"x": 250, "y": 250})
+    assert marker.bounding_box() != old_bbox
+    expect(page.locator(".edit-undo")).to_be_enabled()
+    # Make sure edit stays panel
+    page.wait_for_timeout(1000)
+    expect(page.locator(".panel.right")).to_be_visible()
+
+
+def test_can_drag_marker_in_cluster(live_server, page, tilelayer, openmap):
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#18/46.92/3.34")
+
+    marker = page.locator(".umap-div-icon")
+    cluster = page.locator(".umap-cluster-icon")
+    map = page.locator("#map")
+    expect(marker).to_have_count(0)
+
+    expect(page.locator(".edit-undo")).to_be_disabled()
+    cluster.click()
+    marker.first.drag_to(map, target_position={"x": 250, "y": 250})
+    expect(page.locator(".edit-undo")).to_be_enabled()
+    # There is no more cluster
+    expect(marker).to_have_count(2)
+
+
+def test_can_change_datalayer_of_marker_in_cluster(
+    live_server, page, datalayer, openmap, tilelayer
+):
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA)
+    datalayer.settings["iconClass"] = "Ball"
+    datalayer.save()
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#7/46.920/3.340")
+
+    expect(page.locator(".umap-ball-icon")).to_have_count(0)
+    page.locator(".umap-div-icon").click(modifiers=["Shift"])
+    page.get_by_role("combobox").select_option(str(datalayer.pk))
+    expect(page.locator(".umap-ball-icon")).to_have_count(1)
+
+
+def test_can_combine_cluster_with_remote_data_and_fromZoom(
+    page, live_server, tilelayer, map
+):
+    settings = {
+        "fromZoom": "7",
+        "type": "Cluster",
+        "showLabel": True,
+        "remoteData": {
+            "url": "https://remote.org/data.json",
+            "format": "geojson",
+            "dynamic": True,
+        },
+    }
+    DataLayerFactory(map=map, settings=settings)
+    data = [
+        {
+            "type": "FeatureCollection",
+            "features": [
+                {
+                    "type": "Feature",
+                    "properties": {"name": "Point 2"},
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [4.3375, 11.2707],
+                    },
+                }
+            ],
+        },
+        {
+            "type": "FeatureCollection",
+            "features": [
+                {
+                    "type": "Feature",
+                    "properties": {"name": "Point 1"},
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [4.3375, 12.2707],
+                    },
+                }
+            ],
+        },
+    ]
+
+    def handle(route):
+        route.fulfill(json=data.pop())
+
+    page.route("https://remote.org/data.json", handle)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#7/12.271/4.338")
+    expect(page.locator(".umap-div-icon")).to_have_count(1)
+    expect(page.get_by_role("tooltip", name="Point 1")).to_be_visible()
+    page.get_by_role("button", name="Zoom out").click()
+
+    # We are above fromZoom
+    expect(page.locator(".umap-div-icon")).to_have_count(0)
+
+    page.get_by_role("button", name="Zoom in").click()
+
+    expect(page.locator(".umap-div-icon")).to_have_count(1)
+    expect(page.get_by_role("tooltip", name="Point 2")).to_be_visible()