Make sure we don't use DataLayer.settings by reference
This commit is contained in:
parent
d0b01e774c
commit
de6c9f3b84
1 changed files with 7 additions and 3 deletions
|
@ -1,4 +1,5 @@
|
||||||
import json
|
import json
|
||||||
|
import copy
|
||||||
|
|
||||||
import factory
|
import factory
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
|
@ -102,13 +103,16 @@ class DataLayerFactory(factory.django.DjangoModelFactory):
|
||||||
name = "test datalayer"
|
name = "test datalayer"
|
||||||
description = "test description"
|
description = "test description"
|
||||||
display_on_load = True
|
display_on_load = True
|
||||||
settings = {"displayOnLoad": True, "browsable": True, "name": name}
|
settings = factory.Dict({"displayOnLoad": True, "browsable": True, "name": name})
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _adjust_kwargs(cls, **kwargs):
|
def _adjust_kwargs(cls, **kwargs):
|
||||||
data = kwargs.pop("data", DATALAYER_DATA).copy()
|
data = kwargs.pop("data", copy.deepcopy(DATALAYER_DATA))
|
||||||
kwargs["settings"]["name"] = kwargs["name"]
|
kwargs["settings"]["name"] = kwargs["name"]
|
||||||
data["_umap_options"] = kwargs["settings"]
|
data["_umap_options"] = {
|
||||||
|
**DataLayerFactory.settings._defaults,
|
||||||
|
**kwargs["settings"],
|
||||||
|
}
|
||||||
kwargs["geojson"] = ContentFile(json.dumps(data), "foo.json")
|
kwargs["geojson"] = ContentFile(json.dumps(data), "foo.json")
|
||||||
return kwargs
|
return kwargs
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue