jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: fix test_collaborative_editing_draw_markers

Browse source 
We needed to:
- make playwright to wait for ajax requests
- add a sleep to prevent saving two datalayer's version in the same
  second
This commit is contained in:
Yohan Boniface 2024-01-29 13:54:46 +01:00
parent caeb9d5b44
commit 902240fe34
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
umap/tests/integration/test_collaborative_editing.py
View file

@ -1,9 +1,14 @@
import re
from time import sleep
from playwright.sync_api import expect from playwright.sync_api import expect
from umap.models import DataLayer from umap.models import DataLayer
from ..base import DataLayerFactory, MapFactory from ..base import DataLayerFactory, MapFactory
DATALAYER_UPDATE = re.compile(r".*/datalayer/update/.*")
def test_collaborative_editing_create_markers(context, live_server, tilelayer): def test_collaborative_editing_create_markers(context, live_server, tilelayer):
# Let's create a new map with an empty datalayer # Let's create a new map with an empty datalayer
@ -31,11 +36,17 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
map_el_p1.click(position={"x": 200, "y": 200}) map_el_p1.click(position={"x": 200, "y": 200})
expect(marker_pane_p1).to_have_count(1) expect(marker_pane_p1).to_have_count(1)
with page_one.expect_response(DATALAYER_UPDATE):
save_p1.click() save_p1.click()
# Prefent two layers to be saved on the same second, as we compare them based
# on time in case of conflict. FIXME do not use time for comparison.
sleep(1)
assert DataLayer.objects.get(pk=datalayer.pk).settings == { assert DataLayer.objects.get(pk=datalayer.pk).settings == {
"browsable": True, "browsable": True,
"displayOnLoad": True, "displayOnLoad": True,
"name": "test datalayer", "name": "test datalayer",
"editMode": "advanced",
"inCaption": True,
} }
# Now navigate to this map from another tab # Now navigate to this map from another tab
@ -60,7 +71,9 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
map_el_p2.click(position={"x": 220, "y": 220}) map_el_p2.click(position={"x": 220, "y": 220})
expect(marker_pane_p2).to_have_count(2) expect(marker_pane_p2).to_have_count(2)
with page_two.expect_response(DATALAYER_UPDATE):
save_p2.click() save_p2.click()
sleep(1)
# No change after the save # No change after the save
expect(marker_pane_p2).to_have_count(2) expect(marker_pane_p2).to_have_count(2)
assert DataLayer.objects.get(pk=datalayer.pk).settings == { assert DataLayer.objects.get(pk=datalayer.pk).settings == {
@ -75,6 +88,7 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
create_marker_p1.click() create_marker_p1.click()
map_el_p1.click(position={"x": 150, "y": 150}) map_el_p1.click(position={"x": 150, "y": 150})
expect(marker_pane_p1).to_have_count(2) expect(marker_pane_p1).to_have_count(2)
with page_one.expect_response(DATALAYER_UPDATE):
save_p1.click() save_p1.click()
# Should now get the other marker too # Should now get the other marker too
expect(marker_pane_p1).to_have_count(3) expect(marker_pane_p1).to_have_count(3)
@ -92,7 +106,9 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
create_marker_p1.click() create_marker_p1.click()
map_el_p1.click(position={"x": 180, "y": 150}) map_el_p1.click(position={"x": 180, "y": 150})
expect(marker_pane_p1).to_have_count(4) expect(marker_pane_p1).to_have_count(4)
with page_one.expect_response(DATALAYER_UPDATE):
save_p1.click() save_p1.click()
sleep(1)
# Should now get the other marker too # Should now get the other marker too
assert DataLayer.objects.get(pk=datalayer.pk).settings == { assert DataLayer.objects.get(pk=datalayer.pk).settings == {
"browsable": True, "browsable": True,
@ -110,7 +126,9 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
create_marker_p2.click() create_marker_p2.click()
map_el_p2.click(position={"x": 250, "y": 150}) map_el_p2.click(position={"x": 250, "y": 150})
expect(marker_pane_p2).to_have_count(3) expect(marker_pane_p2).to_have_count(3)
with page_two.expect_response(DATALAYER_UPDATE):
save_p2.click() save_p2.click()
sleep(1)
# Should now get the other markers too # Should now get the other markers too
assert DataLayer.objects.get(pk=datalayer.pk).settings == { assert DataLayer.objects.get(pk=datalayer.pk).settings == {
"browsable": True, "browsable": True,