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

Tests: populate settings from _umap_options when data is passed

Browse source
This commit is contained in:
Yohan Boniface 2023-10-09 16:55:53 +02:00
parent 35758a1e13
commit 3b304e5249
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
umap/tests/base.py
View file

@ -107,12 +107,17 @@ class DataLayerFactory(factory.django.DjangoModelFactory):
@classmethod @classmethod
def _adjust_kwargs(cls, **kwargs): def _adjust_kwargs(cls, **kwargs):
data = kwargs.pop("data", copy.deepcopy(DATALAYER_DATA)) if "data" in kwargs:
kwargs["settings"]["name"] = kwargs["name"] data = copy.deepcopy(kwargs.pop("data"))
if "settings" not in kwargs:
kwargs["settings"] = data.get("_umap_options", {})
else:
data = DATALAYER_DATA.copy()
data["_umap_options"] = { data["_umap_options"] = {
**DataLayerFactory.settings._defaults, **DataLayerFactory.settings._defaults,
**kwargs["settings"], **kwargs["settings"],
} }
data["_umap_options"]["name"] = kwargs["name"]
kwargs["geojson"] = ContentFile(json.dumps(data), "foo.json") kwargs["geojson"] = ContentFile(json.dumps(data), "foo.json")
return kwargs return kwargs