From 44e565948280d45dd42b57bb41b7010e1950afac Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Mon, 1 Dec 2014 22:55:20 +0100
Subject: [PATCH] Update test configuration

---
 cms_helper.py         | 7 ++++++-
 requirements-test.txt | 4 ++--
 tox.ini               | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cms_helper.py b/cms_helper.py
index c4c7a37..e8f561b 100644
--- a/cms_helper.py
+++ b/cms_helper.py
@@ -73,6 +73,11 @@ HELPER_SETTINGS = {
     'MIDDLEWARE_CLASSES': [
         '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_DOMAIN': 'example.com',
     'META_USE_OG_PROPERTIES': True,
@@ -88,4 +93,4 @@ HELPER_SETTINGS = {
     'SITE_ID': 1
 }
 if 'test' in sys.argv:
-    HELPER_SETTINGS['INSTALLED_APPS'].append('django_nose')
\ No newline at end of file
+    HELPER_SETTINGS['INSTALLED_APPS'].append('django_nose')
diff --git a/requirements-test.txt b/requirements-test.txt
index 5b69acc..33852a6 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -5,5 +5,5 @@ mock>=1.0.1
 nose>=1.3.0
 django-nose>=1.2
 flake8
-djangocms-helper>=0.4
-tox>=1.8
\ No newline at end of file
+https://github.com/nephila/djangocms-helper/archive/django_17.zip
+tox>=1.8
diff --git a/tox.ini b/tox.ini
index d80a8d6..3a8ea73 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27}-django{15,16}
+envlist = {py26,py27}-django{15,16},{py27}-django{17}
 
 [testenv]
 basepython =
@@ -8,6 +8,7 @@ basepython =
 deps =
     django15: Django>=1.5,<1.6
     django16: Django>=1.6,<1.7
+    django17: Django>=1.7,<1.8
     py26: unittest2
     -r{toxinidir}/requirements-test.txt
 commands = djangocms-helper djangocms_blog test --cms --nose