Update test configuration

This commit is contained in:
Iacopo Spalletti 2014-12-01 22:55:20 +01:00
commit 44e5659482
3 changed files with 10 additions and 4 deletions

View file

@ -73,6 +73,11 @@ HELPER_SETTINGS = {
'MIDDLEWARE_CLASSES': [ 'MIDDLEWARE_CLASSES': [
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
], ],
'MIGRATION_MODULES': {
'filer': 'filer.migrations_django',
'cmsplugin_filer_image': 'cmsplugin_filer_image.migrations_django',
'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations_django',
},
'META_SITE_PROTOCOL': 'http', 'META_SITE_PROTOCOL': 'http',
'META_SITE_DOMAIN': 'example.com', 'META_SITE_DOMAIN': 'example.com',
'META_USE_OG_PROPERTIES': True, 'META_USE_OG_PROPERTIES': True,
@ -88,4 +93,4 @@ HELPER_SETTINGS = {
'SITE_ID': 1 'SITE_ID': 1
} }
if 'test' in sys.argv: if 'test' in sys.argv:
HELPER_SETTINGS['INSTALLED_APPS'].append('django_nose') HELPER_SETTINGS['INSTALLED_APPS'].append('django_nose')

View file

@ -5,5 +5,5 @@ mock>=1.0.1
nose>=1.3.0 nose>=1.3.0
django-nose>=1.2 django-nose>=1.2
flake8 flake8
djangocms-helper>=0.4 https://github.com/nephila/djangocms-helper/archive/django_17.zip
tox>=1.8 tox>=1.8

View file

@ -1,5 +1,5 @@
[tox] [tox]
envlist = {py26,py27}-django{15,16} envlist = {py26,py27}-django{15,16},{py27}-django{17}
[testenv] [testenv]
basepython = basepython =
@ -8,6 +8,7 @@ basepython =
deps = deps =
django15: Django>=1.5,<1.6 django15: Django>=1.5,<1.6
django16: Django>=1.6,<1.7 django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8
py26: unittest2 py26: unittest2
-r{toxinidir}/requirements-test.txt -r{toxinidir}/requirements-test.txt
commands = djangocms-helper djangocms_blog test --cms --nose commands = djangocms-helper djangocms_blog test --cms --nose