Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

1 files changed, 4 insertions, 2 deletions

diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 9b8d4f000..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()
 
@@ -108,6 +108,8 @@ class ContextRecordInit(OperationInitTest):
         return self.context_records
 
     def get_default_context_record(self, force=False):
+        if force:
+            return self.create_context_record(force=force)[-1]
         return self.create_context_record(force=force)[0]
 
     def tearDown(self):
@@ -155,7 +157,7 @@ class ContextRecordTest(ContextRecordInit, TestCase):
                          {'label': 'cr 1',
                           'relation_types_0': self.cr_rel_type.pk})
         self.assertEqual(json.loads(response.content)['total'], 2)
-        # test search between operation relations
+        # test search between related operations
         first_ope = self.operations[0]
         first_ope.year = 2010
         first_ope.save()