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 /ishtar_common/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 'ishtar_common/tests.py')
| -rw-r--r-- | ishtar_common/tests.py | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 536d6d4a8..b862b4ea7 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -69,6 +69,21 @@ class OOOGenerationTest(TestCase): """ +COMMON_FIXTURES = [ + settings.ROOT_PATH + '../fixtures/initial_data-auth-fr.json', + settings.ROOT_PATH + '../ishtar_common/fixtures/initial_data-fr.json', + settings.ROOT_PATH + + '../ishtar_common/fixtures/initial_spatialrefsystem-fr.json', + settings.ROOT_PATH + + '../ishtar_common/fixtures/initial_importtypes-fr.json', + ] + +OPERATION_FIXTURES = COMMON_FIXTURES + [ + settings.ROOT_PATH + + '../archaeological_operations/fixtures/initial_data-fr.json' +] + + def create_superuser(): username = 'username4277' password = 'dcbqj756456!@%' @@ -337,16 +352,7 @@ class AccessControlTest(TestCase): class AdminGenTypeTest(TestCase): - fixtures = [settings.ROOT_PATH + - '../fixtures/initial_data-auth-fr.json', - settings.ROOT_PATH + - '../ishtar_common/fixtures/initial_data-fr.json', - settings.ROOT_PATH + - '../ishtar_common/fixtures/initial_spatialrefsystem-fr.json', - settings.ROOT_PATH + - '../ishtar_common/fixtures/initial_importtypes-fr.json', - settings.ROOT_PATH + - '../archaeological_operations/fixtures/initial_data-fr.json'] + fixtures = OPERATION_FIXTURES gen_models = [ models.OrganizationType, models.PersonType, models.TitleType, models.AuthorType, models.SourceType, models.OperationType, |