From d0e2d900f7f6b417613d00f495b2bce34ae7db7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Tue, 14 May 2024 11:35:41 +0200 Subject: [PATCH] chore(tests): Rename "collaboration" tests to "optimistic merge" As "collaboration" can be mistaken between "websocket" and "server-merge". This naming makes it explicit. --- ..._collaborative_editing.py => test_optimistic_merge.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename umap/tests/integration/{test_collaborative_editing.py => test_optimistic_merge.py} (97%) diff --git a/umap/tests/integration/test_collaborative_editing.py b/umap/tests/integration/test_optimistic_merge.py similarity index 97% rename from umap/tests/integration/test_collaborative_editing.py rename to umap/tests/integration/test_optimistic_merge.py index 3f5b0c31..ee7a1e6a 100644 --- a/umap/tests/integration/test_collaborative_editing.py +++ b/umap/tests/integration/test_optimistic_merge.py @@ -12,9 +12,9 @@ from ..base import DataLayerFactory, MapFactory 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 - map = MapFactory(name="collaborative editing") + map = MapFactory(name="server-side merge") datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={}) # 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): # 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={}) # 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): # 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={}) # Open the created map on two pages.