diff options
Diffstat (limited to 'archaeological_files/tests.py')
| -rw-r--r-- | archaeological_files/tests.py | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py index a43068e6f..60f447c62 100644 --- a/archaeological_files/tests.py +++ b/archaeological_files/tests.py @@ -25,13 +25,14 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.test.client import Client -from ishtar_common.tests import TestCase +from ishtar_common.tests import TestCase, COMMON_FIXTURES from ishtar_common.models import Town, IshtarSiteProfile from archaeological_files import models from archaeological_operations.models import Parcel, ParcelOwner, ActType, \ AdministrativeAct -from archaeological_operations.tests import OperationInitTest, FileInit +from archaeological_operations.tests import OperationInitTest, FileInit, \ + FILE_TOWNS_FIXTURES def create_administrativact(user, fle): @@ -47,10 +48,7 @@ def create_administrativact(user, fle): class FileTest(TestCase, FileInit): - fixtures = [settings.ROOT_PATH + - '../fixtures/initial_data-auth-fr.json', - settings.ROOT_PATH + - '../ishtar_common/fixtures/initial_data-fr.json'] + fixtures = COMMON_FIXTURES model = models.File def setUp(self): @@ -219,18 +217,7 @@ class FileTest(TestCase, FileInit): class FileOperationTest(TestCase, OperationInitTest, FileInit): model = models.File - 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/test_towns.json', - settings.ROOT_PATH + - '../ishtar_common/fixtures/initial_importtypes-fr.json', - settings.ROOT_PATH + - '../archaeological_files/fixtures/initial_data.json', - settings.ROOT_PATH + - '../archaeological_operations/fixtures/initial_data-fr.json'] + fixtures = FILE_TOWNS_FIXTURES def setUp(self): self.create_file() |