diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 14:39:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 14:39:13 +0200 |
| commit | 943a35dacc9fdd0e86cf4713c441124d99fafa14 (patch) | |
| tree | 8b9cef16c3dc1077b81465029b102391fa6106fa /ishtar_common/tests.py | |
| parent | 9a7c3c036e1ae743c7ccc00cdc4c9e8499b8578e (diff) | |
| parent | 32d85d8604fbdf67644a406e265372e3bb4c8657 (diff) | |
| download | Ishtar-943a35dacc9fdd0e86cf4713c441124d99fafa14.tar.bz2 Ishtar-943a35dacc9fdd0e86cf4713c441124d99fafa14.zip | |
Merge branch 'master' into develop
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 464960b3a..ad623980d 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -39,6 +39,21 @@ from ishtar_common import views from ishtar_common.utils import post_save_point +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!@%' @@ -318,16 +333,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, |