From 953b37a181ece6a651d6ddfff51c15b5d2a47eae Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Thu, 27 Mar 2025 11:59:56 +0100 Subject: [PATCH] fixup: fix tests --- umap/tests/integration/test_edit_datalayer.py | 2 +- umap/tests/integration/test_import.py | 4 ++-- umap/tests/integration/test_websocket_sync.py | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/umap/tests/integration/test_edit_datalayer.py b/umap/tests/integration/test_edit_datalayer.py index 7353d25d..e01c0ace 100644 --- a/umap/tests/integration/test_edit_datalayer.py +++ b/umap/tests/integration/test_edit_datalayer.py @@ -182,7 +182,7 @@ def test_can_restore_version(live_server, openmap, page, datalayer): page.get_by_role("button", name="Manage layers").click() page.locator(".panel.right").get_by_title("Edit", exact=True).click() page.get_by_text("Versions").click() - page.get_by_role("button", name="Restore this version").last.click() + page.get_by_title("Restore this version").last.click() page.get_by_role("button", name="OK").click() expect(marker).to_have_class(re.compile(".*umap-ball-icon.*")) diff --git a/umap/tests/integration/test_import.py b/umap/tests/integration/test_import.py index 095b2da6..9429be55 100644 --- a/umap/tests/integration/test_import.py +++ b/umap/tests/integration/test_import.py @@ -86,8 +86,8 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings): expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text( "Imported map" ) - expect(page.get_by_text("Tunnels")).to_be_visible() - expect(page.get_by_text("Cities")).to_be_visible() + expect(page.locator(".panel.left").get_by_text("Tunnels")).to_be_visible() + expect(page.locator(".panel.left").get_by_text("Cities")).to_be_visible() expect(page.locator(".leaflet-control-minimap")).to_be_visible() expect( page.locator('img[src="https://tile.openstreetmap.fr/hot/6/32/21.png"]') diff --git a/umap/tests/integration/test_websocket_sync.py b/umap/tests/integration/test_websocket_sync.py index 40db583e..7c3c3f34 100644 --- a/umap/tests/integration/test_websocket_sync.py +++ b/umap/tests/integration/test_websocket_sync.py @@ -477,23 +477,23 @@ def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer): peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit") peerA.get_by_role("button", name="Open browser").click() - expect(peerA.get_by_text("datalayer 1")).to_be_visible() - expect(peerA.get_by_text("datalayer 2")).to_be_visible() + expect(peerA.locator(".panel").get_by_text("datalayer 1")).to_be_visible() + expect(peerA.locator(".panel").get_by_text("datalayer 2")).to_be_visible() peerB.get_by_role("button", name="Open browser").click() - expect(peerB.get_by_text("datalayer 1")).to_be_visible() - expect(peerB.get_by_text("datalayer 2")).to_be_visible() + expect(peerB.locator(".panel").get_by_text("datalayer 1")).to_be_visible() + expect(peerB.locator(".panel").get_by_text("datalayer 2")).to_be_visible() # Delete "datalayer 2" in peerA peerA.locator(".datalayer").get_by_role("button", name="Delete layer").first.click() peerA.get_by_role("button", name="OK").click() - expect(peerA.get_by_text("datalayer 2")).to_be_hidden() - expect(peerB.get_by_text("datalayer 2")).to_be_hidden() + expect(peerA.locator(".panel").get_by_text("datalayer 2")).to_be_hidden() + expect(peerB.locator(".panel").get_by_text("datalayer 2")).to_be_hidden() # Save delete to the server with peerA.expect_response(re.compile(".*/datalayer/delete/.*")): peerA.get_by_role("button", name="Save").click() - expect(peerA.get_by_text("datalayer 2")).to_be_hidden() - expect(peerB.get_by_text("datalayer 2")).to_be_hidden() + expect(peerA.locator(".panel").get_by_text("datalayer 2")).to_be_hidden() + expect(peerB.locator(".panel").get_by_text("datalayer 2")).to_be_hidden() @pytest.mark.xdist_group(name="websockets")