diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 15:05:09 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 15:05:09 +0200 |
| commit | 8801ab7b7e655d8b831e535381eeea8adc091989 (patch) | |
| tree | fd1cfe512c94affdfae65e7ec3078648eabffbd7 /archaeological_warehouse/tests.py | |
| parent | c42486f81b042d18b9cf825da9f35a83e00bc051 (diff) | |
| parent | 005f3962ab8d0eef66de6dd335f619702107116a (diff) | |
| download | Ishtar-8801ab7b7e655d8b831e535381eeea8adc091989.tar.bz2 Ishtar-8801ab7b7e655d8b831e535381eeea8adc091989.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_warehouse/tests.py')
| -rw-r--r-- | archaeological_warehouse/tests.py | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py index 10b2318b2..cf3c1febc 100644 --- a/archaeological_warehouse/tests.py +++ b/archaeological_warehouse/tests.py @@ -23,26 +23,13 @@ from archaeological_finds.tests import FindInit from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \ TestCase +from archaeological_finds.tests import WAREHOUSE_FIXTURES from archaeological_warehouse import models, views, forms -warehouse_fixtures = [settings.ROOT_PATH + - '../fixtures/initial_data.json', - settings.ROOT_PATH + - '../ishtar_common/fixtures/initial_data.json', - settings.ROOT_PATH + - '../archaeological_files/fixtures/initial_data.json', - settings.ROOT_PATH + - '../archaeological_operations/fixtures/initial_data-fr.json', - settings.ROOT_PATH + - '../archaeological_finds/fixtures/initial_data-fr.json', - settings.ROOT_PATH + - '../archaeological_warehouse/fixtures/initial_data-fr.json', - ] - class WarehouseWizardCreationTest(WizardTest, FindInit, TestCase): - fixtures = warehouse_fixtures + fixtures = WAREHOUSE_FIXTURES url_name = 'warehouse_creation' wizard_name = 'warehouse_wizard' steps = views.warehouse_creation_steps @@ -103,7 +90,7 @@ class WarehouseWizardCreationTest(WizardTest, FindInit, TestCase): class ContainerWizardCreationTest(WizardTest, FindInit, TestCase): - fixtures = warehouse_fixtures + fixtures = WAREHOUSE_FIXTURES url_name = 'container_creation' wizard_name = 'container_wizard' steps = views.container_creation_steps @@ -185,7 +172,7 @@ class ContainerWizardCreationTest(WizardTest, FindInit, TestCase): class ContainerTest(FindInit, TestCase): - fixtures = warehouse_fixtures + fixtures = WAREHOUSE_FIXTURES def testFormCreation(self): main_warehouse = models.Warehouse.objects.create( |