Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: ask playwright to way for ajax before checking the page state #1564

Closed
wants to merge 1 commit into from
Closed

tests: ask playwright to way for ajax before checking the page state #1564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions umap/tests/integration/test_collaborative_editing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import re

from playwright.sync_api import expect

from umap.models import DataLayer
Expand Down Expand Up @@ -31,11 +33,14 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
map_el_p1.click(position={"x": 200, "y": 200})
expect(marker_pane_p1).to_have_count(1)

save_p1.click()
with page_one.expect_response(re.compile(r".*/datalayer/update/.*")):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: quitte à compiler la regexp, autant le faire qu'une seule fois et la réutiliser pour les autres tests ?

save_p1.click()
assert DataLayer.objects.get(pk=datalayer.pk).settings == {
"browsable": True,
"displayOnLoad": True,
"name": "test datalayer",
"editMode": "advanced",
"inCaption": True,
}

# Now navigate to this map from another tab
Expand All @@ -60,7 +65,8 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
map_el_p2.click(position={"x": 220, "y": 220})
expect(marker_pane_p2).to_have_count(2)

save_p2.click()
with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
save_p2.click()
# No change after the save
expect(marker_pane_p2).to_have_count(2)
assert DataLayer.objects.get(pk=datalayer.pk).settings == {
Expand All @@ -75,7 +81,8 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
create_marker_p1.click()
map_el_p1.click(position={"x": 150, "y": 150})
expect(marker_pane_p1).to_have_count(2)
save_p1.click()
with page_one.expect_response(re.compile(r".*/datalayer/update/.*")):
save_p1.click()
# Should now get the other marker too
expect(marker_pane_p1).to_have_count(3)
assert DataLayer.objects.get(pk=datalayer.pk).settings == {
Expand All @@ -92,7 +99,8 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
create_marker_p1.click()
map_el_p1.click(position={"x": 180, "y": 150})
expect(marker_pane_p1).to_have_count(4)
save_p1.click()
with page_one.expect_response(re.compile(r".*/datalayer/update/.*")):
save_p1.click()
# Should now get the other marker too
assert DataLayer.objects.get(pk=datalayer.pk).settings == {
"browsable": True,
Expand All @@ -110,7 +118,8 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
create_marker_p2.click()
map_el_p2.click(position={"x": 250, "y": 150})
expect(marker_pane_p2).to_have_count(3)
save_p2.click()
with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
save_p2.click()
# Should now get the other markers too
assert DataLayer.objects.get(pk=datalayer.pk).settings == {
"browsable": True,
Expand Down
Loading