summaryrefslogtreecommitdiff
path: root/archaeological_operations/tests.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-05 15:06:12 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-05 15:06:12 +0100
commit2ea08e20ee52f2d6df08460536cd95224a7ae07d (patch)
treecacfd44d18db9263030377d95868122625ad0ada /archaeological_operations/tests.py
parentcdfdea70ba35aa9b1d02a93896eadcdb733fdabd (diff)
parent7c0b2e7f72308ea543b9fb15e4d25b7d9b4eddb7 (diff)
downloadIshtar-2ea08e20ee52f2d6df08460536cd95224a7ae07d.tar.bz2
Ishtar-2ea08e20ee52f2d6df08460536cd95224a7ae07d.zip
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'archaeological_operations/tests.py')
-rw-r--r--archaeological_operations/tests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index af6199774..21b7da2a0 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -1178,7 +1178,7 @@ class CustomFormTest(TestCase, OperationInitTest):
key_in_charge, response.content,
msg="filter all - 'in charge' field not found on the modification "
"wizard")
- f = CustomForm.objects.create(name="Test", form="operation-general",
+ f = CustomForm.objects.create(name="Test", form="operation-010-general",
available=True, apply_to_all=True)
ExcludedField.objects.create(custom_form=f, field="in_charge")
@@ -1190,7 +1190,7 @@ class CustomFormTest(TestCase, OperationInitTest):
# user type form prevail on "all"
f_scientist = CustomForm.objects.create(
- name="Test", form="operation-general", available=True)
+ name="Test", form="operation-010-general", available=True)
tpe = PersonType.objects.get(txt_idx='head_scientist')
key_address = "address"
f_scientist.user_types.add(tpe)
@@ -1208,7 +1208,7 @@ class CustomFormTest(TestCase, OperationInitTest):
# user prevail on "all" and "user_types"
f_user = CustomForm.objects.create(
- name="Test", form="operation-general", available=True)
+ name="Test", form="operation-010-general", available=True)
f_user.users.add(self.user.ishtaruser)
self.user.ishtaruser.person.person_types.add(tpe)
response = c.post(url, data)
@@ -1239,7 +1239,7 @@ class CustomFormTest(TestCase, OperationInitTest):
response = c.post(url, data)
self.assertNotEqual(response.status_code, 404)
CustomForm.objects.create(
- name="Test2", form="operation-collaborators", available=True,
+ name="Test2", form="operation-020-collaborators", available=True,
apply_to_all=True, enabled=False)
response = c.post(url, data)
self.assertEqual(response.status_code, 404)