diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-20 18:28:47 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-20 18:28:47 +0100 |
| commit | 44da8d8dbd14bae9c3e9d9887770698cb9152fa7 (patch) | |
| tree | f585c6732edc5b22637c21d9c6e77b8e16052e0e | |
| parent | d064a7aa0c9bea7b5cdd2767df003716fe789dcd (diff) | |
| download | Ishtar-44da8d8dbd14bae9c3e9d9887770698cb9152fa7.tar.bz2 Ishtar-44da8d8dbd14bae9c3e9d9887770698cb9152fa7.zip | |
Fix default parcel creation
| -rw-r--r-- | archaeological_context_records/tests.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index a242799ef..fe4bb7674 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -98,7 +98,7 @@ class ContextRecordInit(OperationInitTest): if force or not data.get('operation'): data['operation'] = self.get_default_operation(force=force) if not data.get('parcel') or not data['parcel'].pk: - data['parcel'] = self.get_default_parcel() + data['parcel'] = self.get_default_parcel(force=force) if not data.get('history_modifier'): data['history_modifier'] = self.get_default_user() diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 7d11ee002..316e3c897 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -482,7 +482,9 @@ class OperationInitTest(object): self.parcels.append(models.Parcel.objects.create(**default)) return self.parcels - def get_default_parcel(self): + def get_default_parcel(self, force=False): + if force: + return self.create_parcel()[-1] return self.create_parcel()[0] def create_operation(self, user=None, orga=None): |