almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-29 11:52:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore(tests): Rename "collaboration" tests to "optimistic merge"

Browse source 
As "collaboration" can be mistaken between "websocket" and
"server-merge". This naming makes it explicit.
This commit is contained in:
Alexis Métaireau 2024-05-14 11:35:41 +02:00
parent 92676e03ae
commit d0e2d900f7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
umap/tests/integration/test_collaborative_editing.py → umap/tests/integration/test_optimistic_merge.py
View file

@ -12,9 +12,9 @@ from ..base import DataLayerFactory, MapFactory
DATALAYER_UPDATE = re.compile(r".*/datalayer/update/.*") DATALAYER_UPDATE = re.compile(r".*/datalayer/update/.*")
def test_collaborative_editing_create_markers(context, live_server, tilelayer): def test_created_markers_are_merged(context, live_server, tilelayer):
# Let's create a new map with an empty datalayer # Let's create a new map with an empty datalayer
map = MapFactory(name="collaborative editing") map = MapFactory(name="server-side merge")
datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={}) datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
# Now navigate to this map and create marker # Now navigate to this map and create marker
@ -146,7 +146,7 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
def test_empty_datalayers_can_be_merged(context, live_server, tilelayer): def test_empty_datalayers_can_be_merged(context, live_server, tilelayer):
# Let's create a new map with an empty datalayer # Let's create a new map with an empty datalayer
map = MapFactory(name="collaborative editing") map = MapFactory(name="server-side merge")
DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={}) DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
# Open two tabs at the same time, on the same empty map # Open two tabs at the same time, on the same empty map
@ -202,7 +202,7 @@ def test_empty_datalayers_can_be_merged(context, live_server, tilelayer):
def test_same_second_edit_doesnt_conflict(context, live_server, tilelayer): def test_same_second_edit_doesnt_conflict(context, live_server, tilelayer):
# Let's create a new map with an empty datalayer # Let's create a new map with an empty datalayer
map = MapFactory(name="collaborative editing") map = MapFactory(name="server-side merge")
datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={}) datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
# Open the created map on two pages. # Open the created map on two pages.