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

chore: fix tests

Browse source
This commit is contained in:
Alexis Métaireau 2024-02-22 14:07:20 +01:00
parent c5fd72fe2b
commit 1415f96c6f
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
umap/migrations/0018_datalayer_uuid.py
View file

@ -25,10 +25,11 @@ class Migration(migrations.Migration):
field=models.UUIDField(default=uuid.uuid4, editable=False, null=True), field=models.UUIDField(default=uuid.uuid4, editable=False, null=True),
), ),
migrations.RunPython(gen_uuid, reverse_code=migrations.RunPython.noop), migrations.RunPython(gen_uuid, reverse_code=migrations.RunPython.noop),
migrations.AlterField("datalayer", name="id", field=models.CharField(max_length=100)), migrations.AlterField("datalayer", name="id", field=models.CharField(max_length=100, null=True)),
migrations.AlterField( migrations.AlterField(
model_name="datalayer", model_name="datalayer",
name="uuid", name="uuid",
field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True), field=models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True),
), ),
# migrations.RemoveConstraint("datalayer", "")
] ]

3
umap/templatetags/umap_tags.py
View file

@ -3,6 +3,7 @@ from copy import copy
from django import template from django import template
from django.conf import settings from django.conf import settings
from django.core.serializers.json import DjangoJSONEncoder
register = template.Library() register = template.Library()
@ -25,7 +26,7 @@ def map_fragment(map_instance, **kwargs):
page = kwargs.pop("page", None) or "" page = kwargs.pop("page", None) or ""
unique_id = prefix + str(page) + "_" + str(map_instance.pk) unique_id = prefix + str(page) + "_" + str(map_instance.pk)
return { return {
"map_settings": json.dumps(map_settings), "map_settings": json.dumps(map_settings, cls=DjangoJSONEncoder),
"map": map_instance, "map": map_instance,
"unique_id": unique_id, "unique_id": unique_id,
} }

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

@ -98,7 +98,7 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
"name": "test datalayer", "name": "test datalayer",
"inCaption": True, "inCaption": True,
"editMode": "advanced", "editMode": "advanced",
"id": datalayer.pk, "id": str(datalayer.pk),
"permissions": {"edit_status": 1}, "permissions": {"edit_status": 1},
} }
@ -116,7 +116,7 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
"name": "test datalayer", "name": "test datalayer",
"inCaption": True, "inCaption": True,
"editMode": "advanced", "editMode": "advanced",
"id": datalayer.pk, "id": str(datalayer.pk),
"permissions": {"edit_status": 1}, "permissions": {"edit_status": 1},
} }
expect(marker_pane_p1).to_have_count(4) expect(marker_pane_p1).to_have_count(4)
@ -136,7 +136,7 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
"name": "test datalayer", "name": "test datalayer",
"inCaption": True, "inCaption": True,
"editMode": "advanced", "editMode": "advanced",
"id": datalayer.pk, "id": str(datalayer.pk),
"permissions": {"edit_status": 1}, "permissions": {"edit_status": 1},
} }
expect(marker_pane_p2).to_have_count(5) expect(marker_pane_p2).to_have_count(5)