summaryrefslogtreecommitdiff
path: root/archaeological_operations/tests.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-08 18:41:30 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-08 18:41:30 +0200
commitccc3cbc4792147787528b7df04936c4692cad211 (patch)
treee4f706413a6414d420f3e0a231af530059250a9a /archaeological_operations/tests.py
parent5927f36b12d66def45d49d63cfb8721f607997b6 (diff)
parentb15954752029dd66485a85d1b2b7aaf89ca4fec6 (diff)
downloadIshtar-ccc3cbc4792147787528b7df04936c4692cad211.tar.bz2
Ishtar-ccc3cbc4792147787528b7df04936c4692cad211.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_operations/tests.py')
-rw-r--r--archaeological_operations/tests.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 578382ccd..c22cf4b37 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -441,9 +441,10 @@ def create_orga(user):
return orga
-def create_operation(user, orga=None):
+def create_operation(user, orga=None, values={}):
dct = {'year': 2010, 'operation_type_id': 1,
'history_modifier': user}
+ dct.update(values)
if orga:
dct['operator'] = orga
operation = models.Operation.objects.create(**dct)
@@ -578,6 +579,16 @@ class OperationTest(TestCase, OperationInitTest):
{'operator': self.orgas[0].pk})
self.assertTrue(json.loads(response.content)['total'] == 1)
+ def testIndex(self):
+ ope = create_operation(self.user, values={'year': 2042})
+ self.assertEqual(ope.operation_code, 1)
+ ope2 = create_operation(self.user, values={'year': 2042})
+ self.assertEqual(ope2.operation_code, 2)
+ ope = create_operation(self.user, values={'year': 0})
+ self.assertEqual(ope.operation_code, 1)
+ ope2 = create_operation(self.user, values={'year': 0})
+ self.assertEqual(ope2.operation_code, 2)
+
def create_administrativact(user, operation):
act_type, created = models.ActType.objects.get_or_create(