holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2025-01-12 08:58:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename initial_data.json to emailtemplate.json

Browse Source
This commit is contained in:
Simon Thépot 2015-01-14 15:49:08 +01:00
parent f68c1b3ae9
commit b53d3ad9bc
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
helpdesk/fixtures/initial_data.json → helpdesk/fixtures/emailtemplate.json
View File

2
helpdesk/migrations/0004_initial_data_import.py
View File

@ -8,7 +8,7 @@ from django.db import models, migrations
from django.core import serializers from django.core import serializers
fixture_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../fixtures')) fixture_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../fixtures'))
fixture_filename = 'initial_data.json' fixture_filename = 'emailtemplate.json'
def deserialize_fixture(): def deserialize_fixture():
fixture_file = os.path.join(fixture_dir, fixture_filename) fixture_file = os.path.join(fixture_dir, fixture_filename)

12
quicktest.py
View File

@ -28,7 +28,13 @@ class QuickDjangoTest(object):
'django.contrib.humanize', 'django.contrib.humanize',
'bootstrapform', 'bootstrapform',
) )
MIDDLEWARE_CLASSES = [] MIDDLEWARE_CLASSES = [
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.apps = args self.apps = args
@ -44,7 +50,7 @@ class QuickDjangoTest(object):
""" """
Figure out which version of Django's test suite we have to play with. Figure out which version of Django's test suite we have to play with.
""" """
if django.VERSION > (1, 2): if django.VERSION >= (1, 2):
return 'new' return 'new'
else: else:
return 'old' return 'old'
@ -85,7 +91,7 @@ class QuickDjangoTest(object):
ROOT_URLCONF = self.apps[0] + '.urls', ROOT_URLCONF = self.apps[0] + '.urls',
) )
if django.VERSION > (1, 7): if django.VERSION >= (1, 7):
django.setup() django.setup()
from django.test.simple import DjangoTestSuiteRunner from django.test.simple import DjangoTestSuiteRunner