Merge branch 'v0.9' into wheezy

1 files changed, 20 insertions, 1 deletions

diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py
index 691275876..7eb3017bc 100644
--- a/archaeological_warehouse/tests.py
+++ b/archaeological_warehouse/tests.py
@@ -64,12 +64,31 @@ class WarehouseWizardCreationTest(WizardTest, FindInit, TestCase):
                 ]
             },
         ),
+        FormData(
+            'Warehouse creation with no division',
+            form_datas={
+                'warehouse-warehouse_creation': {
+                    'name': 'warehouse-ref',
+                    'warehouse_type': None,
+                    'location': None,
+                    'responsible': None,
+                },
+                'divisions-warehouse_creation': [
+                    {
+                        'order': 42
+                    }
+                ]
+            },
+        ),
     ]
 
     def pre_wizard(self):
         main_data = self.form_datas[0].form_datas
+        alt_data = self.form_datas[1].form_datas
         main_data['warehouse-warehouse_creation']['warehouse_type'] = \
             models.WarehouseType.objects.all()[0].pk
+        alt_data['warehouse-warehouse_creation']['warehouse_type'] = \
+            models.WarehouseType.objects.all()[0].pk
         main_data['divisions-warehouse_creation'][0]['division'] = \
             models.WarehouseDivision.create_default_for_test()[0].pk
         self.warehouse_number = models.Warehouse.objects.count()
@@ -78,7 +97,7 @@ class WarehouseWizardCreationTest(WizardTest, FindInit, TestCase):
 
     def post_wizard(self):
         self.assertEqual(models.Warehouse.objects.count(),
-                         self.warehouse_number + 1)
+                         self.warehouse_number + 2)
         self.assertEqual(models.WarehouseDivisionLink.objects.count(),
                          self.warehouse_div_link + 1)